diff options
author | Wang Mingyu <wangmy@cn.fujitsu.com> | 2020-01-06 05:54:54 -0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2020-01-06 19:22:26 -0800 |
commit | 263bbaf3ba785b4001a9bf9a149ad945dd248bb3 (patch) | |
tree | 2986b38f94f70302974c529b3795c29d40df4276 /meta-networking/recipes-connectivity/lftp | |
parent | 239f697a5b6f246a3c463091c6022432b9513a89 (diff) | |
download | meta-openembedded-263bbaf3ba785b4001a9bf9a149ad945dd248bb3.tar.gz |
lftp: upgrade 4.8.4 -> 4.9.0
fix-gcc-6-conflicts-signbit.patch
Removed since they are included in 4.9.0
Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-networking/recipes-connectivity/lftp')
-rw-r--r-- | meta-networking/recipes-connectivity/lftp/files/fix-gcc-6-conflicts-signbit.patch | 44 | ||||
-rw-r--r-- | meta-networking/recipes-connectivity/lftp/lftp_4.9.0.bb (renamed from meta-networking/recipes-connectivity/lftp/lftp_4.8.4.bb) | 8 |
2 files changed, 3 insertions, 49 deletions
diff --git a/meta-networking/recipes-connectivity/lftp/files/fix-gcc-6-conflicts-signbit.patch b/meta-networking/recipes-connectivity/lftp/files/fix-gcc-6-conflicts-signbit.patch deleted file mode 100644 index 952232b7a..000000000 --- a/meta-networking/recipes-connectivity/lftp/files/fix-gcc-6-conflicts-signbit.patch +++ /dev/null | |||
@@ -1,44 +0,0 @@ | |||
1 | --- lftp-4.6.3a/src/NetAccess.cc.orig 2016-06-18 10:25:51.063358981 -0400 | ||
2 | +++ lftp-4.6.3a/src/NetAccess.cc 2016-06-18 10:26:04.143359209 -0400 | ||
3 | @@ -21,7 +21,7 @@ | ||
4 | |||
5 | #include <errno.h> | ||
6 | #include <assert.h> | ||
7 | -#include <math.h> | ||
8 | +#include <cmath> | ||
9 | #include <sys/types.h> | ||
10 | |||
11 | #include "NetAccess.h" | ||
12 | --- lftp-4.6.3a/src/Speedometer.cc.orig 2016-06-18 10:24:58.895358073 -0400 | ||
13 | +++ lftp-4.6.3a/src/Speedometer.cc 2016-06-18 10:25:10.879358281 -0400 | ||
14 | @@ -18,7 +18,7 @@ | ||
15 | */ | ||
16 | |||
17 | #include <config.h> | ||
18 | -#include <math.h> | ||
19 | +#include <cmath> | ||
20 | #include <stdlib.h> | ||
21 | #include "Speedometer.h" | ||
22 | #include "misc.h" | ||
23 | --- lftp-4.6.3a/src/FileCopy.cc.orig 2016-06-18 10:24:15.939357325 -0400 | ||
24 | +++ lftp-4.6.3a/src/FileCopy.cc 2016-06-18 10:24:24.583357475 -0400 | ||
25 | @@ -36,7 +36,7 @@ | ||
26 | #include <sys/types.h> | ||
27 | #include <sys/stat.h> | ||
28 | #include <fcntl.h> | ||
29 | -#include <math.h> | ||
30 | +#include <cmath> | ||
31 | #include <stddef.h> | ||
32 | #include "FileCopy.h" | ||
33 | #include "url.h" | ||
34 | --- lftp-4.6.3a/src/ResMgr.cc.orig 2016-06-18 10:23:31.387356549 -0400 | ||
35 | +++ lftp-4.6.3a/src/ResMgr.cc 2016-06-18 10:23:41.771356729 -0400 | ||
36 | @@ -23,7 +23,7 @@ | ||
37 | #include <ctype.h> | ||
38 | #include <unistd.h> | ||
39 | #include <stdlib.h> | ||
40 | -#include <math.h> | ||
41 | +#include <cmath> | ||
42 | #include <sys/types.h> | ||
43 | #include <sys/stat.h> | ||
44 | #include <errno.h> | ||
diff --git a/meta-networking/recipes-connectivity/lftp/lftp_4.8.4.bb b/meta-networking/recipes-connectivity/lftp/lftp_4.9.0.bb index bf793d91d..ef047f7a3 100644 --- a/meta-networking/recipes-connectivity/lftp/lftp_4.8.4.bb +++ b/meta-networking/recipes-connectivity/lftp/lftp_4.9.0.bb | |||
@@ -6,11 +6,9 @@ SECTION = "console/network" | |||
6 | LICENSE = "GPLv3" | 6 | LICENSE = "GPLv3" |
7 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" | 7 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" |
8 | 8 | ||
9 | SRC_URI = "http://lftp.yar.ru/ftp/lftp-${PV}.tar.bz2 \ | 9 | SRC_URI = "http://lftp.yar.ru/ftp/lftp-${PV}.tar.bz2" |
10 | file://fix-gcc-6-conflicts-signbit.patch \ | 10 | SRC_URI[md5sum] = "b05817a2c26463618271730d0f677edb" |
11 | " | 11 | SRC_URI[sha256sum] = "309e7e91a7c020625715e85c1726b1e7524da22518683fbe051ac13116dedeac" |
12 | SRC_URI[md5sum] = "a56b5047dbfda052df4c1dfd197aa092" | ||
13 | SRC_URI[sha256sum] = "a853edbd075b008c315679c7882b6dcc6821ed2365d2ed843a412acd3d40da0e" | ||
14 | 12 | ||
15 | inherit autotools gettext pkgconfig | 13 | inherit autotools gettext pkgconfig |
16 | 14 | ||