From 8ad56b83a029c130bef5fae2a05345dce47c5b55 Mon Sep 17 00:00:00 2001 From: ponce Date: Thu, 9 Aug 2012 21:21:54 +0200 Subject: libraries/wvstreams: Various build fixes Added a patch for parallel builds, two more to fix building on 14.0, and some compiler flags needed for the new gcc-4.7.x. Signed-off-by: Robby Workman --- libraries/wvstreams/wvstreams.SlackBuild | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) (limited to 'libraries/wvstreams/wvstreams.SlackBuild') diff --git a/libraries/wvstreams/wvstreams.SlackBuild b/libraries/wvstreams/wvstreams.SlackBuild index ebe4b85968..8575b8f8c5 100644 --- a/libraries/wvstreams/wvstreams.SlackBuild +++ b/libraries/wvstreams/wvstreams.SlackBuild @@ -6,7 +6,7 @@ PRGNAM=wvstreams VERSION=4.6.1 -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -51,13 +51,21 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# Fix a build error with glibc-2.12.x -patch -p0 < $CWD/wvstreams-4.6.1-glibc212.patch +# patch to allow parallel builds +patch -p1 < $CWD/patches/wvstreams-4.6.1-parallel-make.patch + +# patch for gcc-4.7 +# https://code.google.com/p/wvstreams/issues/detail?id=34 +patch -p1 < $CWD/patches/wvstreams-4.6.1-gcc47.patch +# another patch for gcc and glibc > 2.12.0 from debian +patch -p1 < $CWD/patches/05_gcc.diff # configure doesn't support disabling static libraries # Don't manually remove them either, as wvdial won't build then :) -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ +# Added more flags to avoid aborting when building with gcc-4.7.x +# https://bugs.gentoo.org/show_bug.cgi?id=419971 +CFLAGS="$SLKCFLAGS -fno-tree-dce -fno-optimize-sibling-calls" \ +CXXFLAGS="$SLKCFLAGS -fno-tree-dce -fno-optimize-sibling-calls" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ -- cgit v1.2.3