diff options
author | Derek Straka <derek@asterius.io> | 2016-06-18 10:41:14 -0400 |
---|---|---|
committer | Joe MacDonald <joe_macdonald@mentor.com> | 2016-07-07 09:51:27 -0400 |
commit | 6b2fc930c4c27400b9f485ca9fde313a776f1f1f (patch) | |
tree | 45069407845c29715f3e6166bdb620e8491e136f /meta-networking/recipes-connectivity/lftp | |
parent | 3647a2ca4ca129708a8e143ed0cf1f712b4a15a0 (diff) | |
download | meta-openembedded-6b2fc930c4c27400b9f485ca9fde313a776f1f1f.tar.gz |
lftp: fix issues with multiple signbit definitions and remove from the blacklist
Signed-off-by: Derek Straka <derek@asterius.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.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.6.3a.bb | 4 |
2 files changed, 45 insertions, 3 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 new file mode 100644 index 0000000000..952232b7a7 --- /dev/null +++ b/meta-networking/recipes-connectivity/lftp/files/fix-gcc-6-conflicts-signbit.patch @@ -0,0 +1,44 @@ +--- lftp-4.6.3a/src/NetAccess.cc.orig 2016-06-18 10:25:51.063358981 -0400 ++++ lftp-4.6.3a/src/NetAccess.cc 2016-06-18 10:26:04.143359209 -0400 +@@ -21,7 +21,7 @@ + + #include <errno.h> + #include <assert.h> +-#include <math.h> ++#include <cmath> + #include <sys/types.h> + + #include "NetAccess.h" +--- lftp-4.6.3a/src/Speedometer.cc.orig 2016-06-18 10:24:58.895358073 -0400 ++++ lftp-4.6.3a/src/Speedometer.cc 2016-06-18 10:25:10.879358281 -0400 +@@ -18,7 +18,7 @@ + */ + + #include <config.h> +-#include <math.h> ++#include <cmath> + #include <stdlib.h> + #include "Speedometer.h" + #include "misc.h" +--- lftp-4.6.3a/src/FileCopy.cc.orig 2016-06-18 10:24:15.939357325 -0400 ++++ lftp-4.6.3a/src/FileCopy.cc 2016-06-18 10:24:24.583357475 -0400 +@@ -36,7 +36,7 @@ + #include <sys/types.h> + #include <sys/stat.h> + #include <fcntl.h> +-#include <math.h> ++#include <cmath> + #include <stddef.h> + #include "FileCopy.h" + #include "url.h" +--- lftp-4.6.3a/src/ResMgr.cc.orig 2016-06-18 10:23:31.387356549 -0400 ++++ lftp-4.6.3a/src/ResMgr.cc 2016-06-18 10:23:41.771356729 -0400 +@@ -23,7 +23,7 @@ + #include <ctype.h> + #include <unistd.h> + #include <stdlib.h> +-#include <math.h> ++#include <cmath> + #include <sys/types.h> + #include <sys/stat.h> + #include <errno.h> diff --git a/meta-networking/recipes-connectivity/lftp/lftp_4.6.3a.bb b/meta-networking/recipes-connectivity/lftp/lftp_4.6.3a.bb index 187ccb523e..b25db8bbc0 100644 --- a/meta-networking/recipes-connectivity/lftp/lftp_4.6.3a.bb +++ b/meta-networking/recipes-connectivity/lftp/lftp_4.6.3a.bb @@ -8,6 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" DEPENDS = "readline" SRC_URI = "http://fossies.org/linux/misc/lftp-${PV}.tar.gz \ + file://fix-gcc-6-conflicts-signbit.patch \ " SRC_URI[md5sum] = "2777dd514d21fe1da764bedd1d0ab36c" SRC_URI[sha256sum] = "a8b53e5ca2c1acbecd181c87f21a8673ca9038dc9f2be6ab8c23790bd91fd446" @@ -24,6 +25,3 @@ PACKAGECONFIG[gnutls] = "--with-gnutls, --without-gnutls, gnutls" FILES_${PN}-dbg += "${libdir}/lftp/${PV}/.debug" RDEPENDS_${PN} = "perl bash readline" - -# http://errors.yoctoproject.org/Errors/Details/68625/ -PNBLACKLIST[lftp] ?= "BROKEN: fails to build with gcc-6" |