Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (921ade79f3aacf90347125f8b52ca953ba01c05f)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (921ade79f3aacf90347125f8b52ca953ba01c05f)
  • Date: Thu, 7 Dec 2017 19:35:49 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

ftp/lftp/0002-fix-gcc-6-conflicts-signbit.patch | 57
++++++++++++++++++++++++
ftp/lftp/DETAILS | 2
ftp/lftp/HISTORY | 5 ++
ftp/lftp/PRE_BUILD | 1
4 files changed, 64 insertions(+), 1 deletion(-)

New commits:
commit 921ade79f3aacf90347125f8b52ca953ba01c05f
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

lftp 4.8.3 + gcc 6.x+ build fix

diff --git a/ftp/lftp/0002-fix-gcc-6-conflicts-signbit.patch
b/ftp/lftp/0002-fix-gcc-6-conflicts-signbit.patch
new file mode 100644
index 0000000..e906c7a
--- /dev/null
+++ b/ftp/lftp/0002-fix-gcc-6-conflicts-signbit.patch
@@ -0,0 +1,57 @@
+Use <cmath> instead of <math.h> to fix gcc 6.x build
+
+This patch fixes the following build issue:
+
+../lib/math.h:2577:1: error: ‘int signbit(float)’ conflicts with a previous
declaration
+
+that occurs with gcc 6.x.
+
+Patch taken from
+https://raw.githubusercontent.com/openembedded/meta-openembedded/master/meta-networking/recipes-connectivity/lftp/files/fix-gcc-6-conflicts-signbit.patch
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni AT free-electrons.com>
+
+--- 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/ftp/lftp/DETAILS b/ftp/lftp/DETAILS
index 3de5503..72c2682 100755
--- a/ftp/lftp/DETAILS
+++ b/ftp/lftp/DETAILS
@@ -1,5 +1,5 @@
SPELL=lftp
- VERSION=4.7.6
+ VERSION=4.8.3
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/ftp/lftp/HISTORY b/ftp/lftp/HISTORY
index 4cfb726..3510d4e 100644
--- a/ftp/lftp/HISTORY
+++ b/ftp/lftp/HISTORY
@@ -1,3 +1,8 @@
+2017-12-07 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 4.8.3
+ * PRE_BUILD, 0002-fix-gcc-6-conflicts-signbit.patch:
+ added GCC 6.x+ build patch
+
2017-02-18 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 4.7.6

diff --git a/ftp/lftp/PRE_BUILD b/ftp/lftp/PRE_BUILD
index 1e710c5..1885f1b 100755
--- a/ftp/lftp/PRE_BUILD
+++ b/ftp/lftp/PRE_BUILD
@@ -1,4 +1,5 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&

+patch -fp1 < "$SPELL_DIRECTORY/0002-fix-gcc-6-conflicts-signbit.patch" &&
patch -p1 < "$SPELL_DIRECTORY/gets.patch"



  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (921ade79f3aacf90347125f8b52ca953ba01c05f), Ismael Luceno, 12/07/2017

Archive powered by MHonArc 2.6.24.

Top of Page