diff options
| author | Vincent Batts <vbatts@batts.mine.nu> | 2010-05-13 00:33:49 +0200 |
|---|---|---|
| committer | David Somero <xgizzmo@slackbuilds.org> | 2010-05-13 00:33:49 +0200 |
| commit | d44c94ed784928355460e6283bae0cd12ff5f62a (patch) | |
| tree | e278da60cb6e4bf4681a0f2cb874b81a59fe582f /libraries/wxX11 | |
| parent | 1a48d492c13d3495a4032b04b9fe07deabf5c55e (diff) | |
| download | slackbuilds-d44c94ed784928355460e6283bae0cd12ff5f62a.tar.gz | |
libraries/wxX11: Updated for version 2.8.7
Diffstat (limited to 'libraries/wxX11')
| -rw-r--r-- | libraries/wxX11/wxX11.SlackBuild | 14 | ||||
| -rw-r--r-- | libraries/wxX11/wxX11.info | 4 |
2 files changed, 14 insertions, 4 deletions
diff --git a/libraries/wxX11/wxX11.SlackBuild b/libraries/wxX11/wxX11.SlackBuild index d03fc9dd8d..f2a0f5233a 100644 --- a/libraries/wxX11/wxX11.SlackBuild +++ b/libraries/wxX11/wxX11.SlackBuild @@ -15,8 +15,13 @@ OUTPUT=${OUTPUT:-/tmp} if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" fi set -e # Exit on most errors @@ -38,6 +43,7 @@ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ --sysconfdir=/etc \ --localstatedir=/var \ --disable-gui \ @@ -47,8 +53,10 @@ make make install DESTDIR=$PKG ( cd $PKG - find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \ + xargs strip --strip-unneeded 2> /dev/null || true + find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \ + xargs strip --strip-unneeded 2> /dev/null ) mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION @@ -59,4 +67,4 @@ mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/libraries/wxX11/wxX11.info b/libraries/wxX11/wxX11.info index 5ca847d60a..99eb90fd3c 100644 --- a/libraries/wxX11/wxX11.info +++ b/libraries/wxX11/wxX11.info @@ -2,7 +2,9 @@ PRGNAM="wxX11" VERSION="2.8.7" HOMEPAGE="http://www.wxwidgets.org" DOWNLOAD="http://downloads.sourceforge.net/wxwindows/wxX11-2.8.7.tar.gz" +DOWNLOAD_x86_64="" MD5SUM="df82508b4cfbff6c81eb5539ef6a0932" +MD5SUM_x86_64="" MAINTAINER="Vincent Batts" EMAIL="vbatts@batts.mine.nu" -APPROVED="David Somero" +APPROVED="dsomero" |