From f5681a2a804aa78fda93bc77c2f61212d66ba725 Mon Sep 17 00:00:00 2001 From: Heinz Wiesinger Date: Wed, 12 May 2010 17:42:16 +0200 Subject: libraries/wxPython: Updated for version 2.8.9.2 --- libraries/wxPython/wxPython.SlackBuild | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) (limited to 'libraries/wxPython/wxPython.SlackBuild') diff --git a/libraries/wxPython/wxPython.SlackBuild b/libraries/wxPython/wxPython.SlackBuild index 15595d06d5..85a138d2c9 100644 --- a/libraries/wxPython/wxPython.SlackBuild +++ b/libraries/wxPython/wxPython.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for wxPython -# Copyright 2007-2008 Heinz Wiesinger +# Copyright 2007-2009 Heinz Wiesinger # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,9 +23,9 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=wxPython -VERSION=2.8.9.1 +VERSION=2.8.9.2 ARCH=${ARCH:-i486} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} CWD=$(pwd) @@ -44,10 +44,13 @@ fi 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 @@ -73,6 +76,7 @@ CXXFLAGS="$SLKCFLAGS" \ --$do_gp-gnomeprint \ --enable-unicode \ --enable-graphics_ctx \ + --libdir=/usr/lib$LIBDIRSUFFIX \ --build=$ARCH-slackware-linux \ --host=$ARCH-slackware-linux @@ -94,7 +98,9 @@ cd wxPython EP_FULL_VER=0 \ NO_SCRIPTS=1 \ WX_CONFIG="$TMP/$PRGNAM-src-$VERSION/wx-config --no_rpath" \ - build_ext --rpath=/usr/lib \ + build_ext --include-dirs=$TMP/$PRGNAM-src-$VERSION/lib/wx/include/gtk2-unicode-release-2.8 \ + --library-dirs=$TMP/$PRGNAM-src-$VERSION/lib \ + --rpath=/usr/lib$LIBDIRSUFFIX \ build python setup.py \ @@ -105,7 +111,9 @@ cd wxPython NO_SCRIPTS=1 \ WX_CONFIG="$TMP/$PRGNAM-src-$VERSION/wx-config --prefix=$PKG/usr/bin/ --no_rpath" \ SYS_WX_CONFIG="wx-config --enable-unicode" \ - build_ext --rpath=/usr/lib \ + build_ext --include-dirs=$TMP/$PRGNAM-src-$VERSION/lib/wx/include/gtk2-unicode-release-2.8 \ + --library-dirs=$TMP/$PRGNAM-src-$VERSION/lib \ + --rpath=/usr/lib$LIBDIRSUFFIX \ install --root=$PKG cd - -- cgit v1.2.3