diff options
Diffstat (limited to 'source/xap')
| -rwxr-xr-x | source/xap/blackbox/blackbox.SlackBuild | 13 | ||||
| -rwxr-xr-x | source/xap/sane/sane.SlackBuild | 2 |
2 files changed, 10 insertions, 5 deletions
diff --git a/source/xap/blackbox/blackbox.SlackBuild b/source/xap/blackbox/blackbox.SlackBuild index 570222e9..2246e8cc 100755 --- a/source/xap/blackbox/blackbox.SlackBuild +++ b/source/xap/blackbox/blackbox.SlackBuild @@ -29,7 +29,7 @@ PKGNAM=blackbox SRCNAM=blackbox VERSION=${VERSION:-0.74} BBKEYSVER=${BBKEYSVER:-0.9.1} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -110,9 +110,6 @@ CFLAGS="$SLKCFLAGS" \ # Build: make $NUMJOBS || make || exit 1 -# Install onto filesystem - needed for bbkeys to find libbt: -make install || exit 1 - # Install into package: make install DESTDIR=$PKG || exit 1 mkdir -p $PKG/etc/X11/xinit @@ -154,6 +151,14 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# The blackbox's libbt won't be met. We could make the LIBBT_CFLAGS and +# LIBBT_LIBS environment to point in the temporary root, but we will +# rather try to keep going with pkg-config, in case the requirements are +# updated in the future. +export PKG_CONFIG_PATH="$(pwd)/pkgconfig.$$" +mkdir "$PKG_CONFIG_PATH" +sed "s,=/usr,=$PKG/usr," "$PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/libbt.pc" >"$PKG_CONFIG_PATH/libbt.pc" + # Configure: CFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/source/xap/sane/sane.SlackBuild b/source/xap/sane/sane.SlackBuild index 7e641135..13f61445 100755 --- a/source/xap/sane/sane.SlackBuild +++ b/source/xap/sane/sane.SlackBuild @@ -26,7 +26,7 @@ PKGNAM=sane VERSION=1.0.27 BACKVER=1.0.27 FRONTVER=1.0.14 -BUILD=${BUILD:-3} +BUILD=${BUILD:-4} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then |