Skip to contentSkip to conversation

lftp: Remove no longer needed patch

PATCH In review Adrian Bunk 2 participants 2 messages Oct 29, 2019 – Oct 30, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 lftp: Remove no longer needed patch

The root cause has already been fixed in glibc.

---
 .../files/fix-gcc-6-conflicts-signbit.patch   | 44 -------------------
 .../recipes-connectivity/lftp/lftp_4.8.4.bb   |  1 -
 2 files changed, 45 deletions(-)
 delete mode 100644 meta-networking/recipes-connectivity/lftp/files/fix-gcc-6-conflicts-signbit.patch
meta-networking/recipes-connectivity/lftp/files/fix-gcc-6-conflicts-signbit.patch deleted +0 -44
deleted file mode 100644
index 952232b7a..000000000
@@ -1,44 +0,0 @@
---- 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>
meta-networking/recipes-connectivity/lftp/lftp_4.8.4.bb +0 -1
index bf793d91d..ce669eb4f 100644
@@ -7,7 +7,6 @@ LICENSE = "GPLv3"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
 SRC_URI = "http://lftp.yar.ru/ftp/lftp-${PV}.tar.bz2 \
-           file://fix-gcc-6-conflicts-signbit.patch \
           "
 SRC_URI[md5sum] = "a56b5047dbfda052df4c1dfd197aa092"
 SRC_URI[sha256sum] = "a853edbd075b008c315679c7882b6dcc6821ed2365d2ed843a412acd3d40da0e"
Signature · 1 line
2.17.1
#1 lore raw

it still fails on musl with signbin conflicts so we still need that patch or maybe help configure by defining it something like pass gl_cv_func_signbit=yes via EXTRA_OECONF

see error
https://errors.yoctoproject.org/Errors/Details/274949/

Quoted 80 lines · Adrian Bunk

The root cause has already been fixed in glibc.

---
 .../files/fix-gcc-6-conflicts-signbit.patch   | 44 -------------------
 .../recipes-connectivity/lftp/lftp_4.8.4.bb   |  1 -
 2 files changed, 45 deletions(-)
 delete mode 100644 meta-networking/recipes-connectivity/lftp/files/fix-gcc-6-conflicts-signbit.patch
meta-networking/recipes-connectivity/lftp/files/fix-gcc-6-conflicts-signbit.patch deleted +0 -44
deleted file mode 100644
index 952232b7a..000000000
@@ -1,44 +0,0 @@
---- 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>
meta-networking/recipes-connectivity/lftp/lftp_4.8.4.bb +0 -2
index bf793d91d..ce669eb4f 100644
@@ -7,7 +7,6 @@ LICENSE = "GPLv3"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
 SRC_URI = "http://lftp.yar.ru/ftp/lftp-${PV}.tar.bz2 \
-           file://fix-gcc-6-conflicts-signbit.patch \
           "
 SRC_URI[md5sum] = "a56b5047dbfda052df4c1dfd197aa092"
 SRC_URI[sha256sum] = "a853edbd075b008c315679c7882b6dcc6821ed2365d2ed843a412acd3d40da0e"
--

2.17.1

--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel