Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Thomas Orgis (03574b320aa98817657765dde530ae214780b21c)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Thomas Orgis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (03574b320aa98817657765dde530ae214780b21c)
  • Date: Sat, 26 Dec 2015 12:10:16 +0000

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

net/wvdial/BUILD | 7 +++++++
net/wvdial/HISTORY | 5 +++++
net/wvstreams/BUILD | 5 ++++-
net/wvstreams/HISTORY | 6 ++++++
net/wvstreams/PRE_BUILD | 8 +++++---
net/wvstreams/wvstreams-4.6.1-getuid.patch | 10 ++++++++++
6 files changed, 37 insertions(+), 4 deletions(-)

New commits:
commit 03574b320aa98817657765dde530ae214780b21c
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

wvdial: build fix (disable as-needed), sync compiler flags with wvstreams

commit 83714d7765414cbe21d035d205e39259b1b79dcb
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

wvstreams: avoid crash with modern gcc

commit 5679f798055a67dc8b7d03ba7618e5952ab694db
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

wvstreams: fix build again

diff --git a/net/wvdial/BUILD b/net/wvdial/BUILD
new file mode 100755
index 0000000..d327993
--- /dev/null
+++ b/net/wvdial/BUILD
@@ -0,0 +1,7 @@
+# Take same care as for wvstreams with optimization flags,
+# also disable as-needed linking as that breaks the build.
+CPPFLAGS="-D_DEFAULT_SOURCE=1 $CPPFLAGS" \
+CXXFLAGS="$CXXFLAGS -fno-tree-dce -fno-optimize-sibling-calls" \
+CFLAGS="$CFLAGS -fno-tree-dce -fno-optimize-sibling-calls" \
+LDFLAGS=${LDFLAGS/-Wl,--as-needed/} \
+default_build
diff --git a/net/wvdial/HISTORY b/net/wvdial/HISTORY
index 4f84af3..2e35295 100644
--- a/net/wvdial/HISTORY
+++ b/net/wvdial/HISTORY
@@ -1,3 +1,8 @@
+2015-12-26 Thomas Orgis <sobukus AT sourcemage.org>
+ * BUILD: disable optimizations as for wvstreams, to be safe,
+ disable as-needed to fix build (some necromancy, wvdial
+ being still useful)
+
2011-10-25 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.61, SOURCE_URL[0] updated, no asc file
* BUILD: removed
diff --git a/net/wvstreams/BUILD b/net/wvstreams/BUILD
index 752c7f1..ebcb0ad 100755
--- a/net/wvstreams/BUILD
+++ b/net/wvstreams/BUILD
@@ -1 +1,4 @@
-CPPFLAGS="-I/usr/include/qt $CPPFLAGS" default_build
+CPPFLAGS="-I/usr/include/qt -D_DEFAULT_SOURCE=1 $CPPFLAGS" \
+CXXFLAGS="$CXXFLAGS -fno-tree-dce -fno-optimize-sibling-calls" \
+CFLAGS="$CFLAGS -fno-tree-dce -fno-optimize-sibling-calls" \
+default_build
diff --git a/net/wvstreams/HISTORY b/net/wvstreams/HISTORY
index 96bc8a6..77bb771 100644
--- a/net/wvstreams/HISTORY
+++ b/net/wvstreams/HISTORY
@@ -1,3 +1,9 @@
+2015-12-26 Thomas Orgis <sobukus AT sourcemage.org>
+ * PRE_BUILD, *-getuid.patch: include unistd.h for getuid()
+ * BUILD: define _DEFAULT_SOURCE to silence build (a bit)
+ * BUILD: avoid certain gcc optimizations
+ (https://bugzilla.redhat.com/show_bug.cgi?id=812651)
+
2014-08-24 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: fix bad with-SSL usage

diff --git a/net/wvstreams/PRE_BUILD b/net/wvstreams/PRE_BUILD
index 7326d15..3933b6f 100755
--- a/net/wvstreams/PRE_BUILD
+++ b/net/wvstreams/PRE_BUILD
@@ -1,6 +1,8 @@
mk_source_dir $SOURCE_DIRECTORY &&
unpack_file &&

-patch -p1 -d $SOURCE_DIRECTORY <
$SPELL_DIRECTORY/wvstreams-4.6.1-parallel-make.patch &&
-patch -p1 -d $SOURCE_DIRECTORY <
$SPELL_DIRECTORY/wvstreams-4.6.1-openssl-1.0.0.patch &&
-patch -p0 -d $SOURCE_DIRECTORY <
$SPELL_DIRECTORY/wvstreams-4.6.1-glibc212.patch
+cd $SOURCE_DIRECTORY &&
+patch -p1 < $SCRIPT_DIRECTORY/wvstreams-4.6.1-parallel-make.patch &&
+patch -p1 < $SCRIPT_DIRECTORY/wvstreams-4.6.1-openssl-1.0.0.patch &&
+patch -p0 < $SCRIPT_DIRECTORY/wvstreams-4.6.1-glibc212.patch &&
+patch -p0 < $SCRIPT_DIRECTORY/wvstreams-4.6.1-getuid.patch
diff --git a/net/wvstreams/wvstreams-4.6.1-getuid.patch
b/net/wvstreams/wvstreams-4.6.1-getuid.patch
new file mode 100644
index 0000000..359d90d
--- /dev/null
+++ b/net/wvstreams/wvstreams-4.6.1-getuid.patch
@@ -0,0 +1,10 @@
+--- utils/wvuid.cc.orig 2015-12-26 01:02:49.074068854 +0100
++++ utils/wvuid.cc 2015-12-26 01:03:12.700029921 +0100
+@@ -33,6 +33,7 @@
+
+ #else // not WIN32
+
++#include <unistd.h>
+
+ WvString wv_username_from_uid(wvuid_t uid)
+ {



  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (03574b320aa98817657765dde530ae214780b21c), Thomas Orgis, 12/26/2015

Archive powered by MHonArc 2.6.24.

Top of Page