diff options
Diffstat (limited to 'libraries/wvstreams/wvstreams.SlackBuild')
| -rw-r--r-- | libraries/wvstreams/wvstreams.SlackBuild | 39 |
1 files changed, 15 insertions, 24 deletions
diff --git a/libraries/wvstreams/wvstreams.SlackBuild b/libraries/wvstreams/wvstreams.SlackBuild index 562bb05d11..2cbe84c6b1 100644 --- a/libraries/wvstreams/wvstreams.SlackBuild +++ b/libraries/wvstreams/wvstreams.SlackBuild @@ -11,7 +11,7 @@ TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -22,8 +22,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -46,26 +46,17 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION chown -R root:root . find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -# 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 :) -# 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" \ + \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ + -o -perm 511 \) -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + +# Apply debian patches +for i in $CWD/patches/*; do patch -p1 < $i ; done + +./autogen.sh + +CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ @@ -78,7 +69,7 @@ CXXFLAGS="$SLKCFLAGS -fno-tree-dce -fno-optimize-sibling-calls" \ make make install DESTDIR=$PKG -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true # Let's not clobber the config file |