summaryrefslogtreecommitdiffstats
path: root/source/a/udisks2
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2018-11-09 21:46:09 +0000
committer Eric Hameleers <alien@slackware.com>2018-11-10 08:59:45 +0100
commit374248fe50672549bd1e5cd53ddb5bdfdcc66b65 (patch)
treefbac9f1c41679d79634ef08ac614cb4b708c8386 /source/a/udisks2
parent0e6f7049d6a514115df0164db47fbd8763cf5148 (diff)
downloadcurrent-374248fe50672549bd1e5cd53ddb5bdfdcc66b65.tar.gz
current-374248fe50672549bd1e5cd53ddb5bdfdcc66b65.tar.xz
Fri Nov 9 21:46:09 UTC 201820181109214609
a/udisks2-2.6.5-x86_64-3.txz: Rebuilt. Recompiled against net-snmp-5.8. ap/hplip-3.18.10-x86_64-2.txz: Rebuilt. Recompiled against net-snmp-5.8. d/bison-3.2.1-x86_64-1.txz: Upgraded. d/meson-0.48.2-x86_64-1.txz: Upgraded. l/pycairo-1.18.0-x86_64-1.txz: Upgraded. n/bridge-utils-1.6-x86_64-1.txz: Upgraded. n/net-snmp-5.8-x86_64-1.txz: Upgraded. Shared library .so-version bump. n/ntp-4.2.8p12-x86_64-2.txz: Rebuilt. Recompiled against net-snmp-5.8. n/php-7.2.12-x86_64-2.txz: Rebuilt. Recompiled against net-snmp-5.8. xap/blackbox-0.74-x86_64-2.txz: Rebuilt. When building, don't install anything to the system. Thanks to Didier Spaier. xap/sane-1.0.27-x86_64-4.txz: Rebuilt. Recompiled against net-snmp-5.8. extra/aspell-word-lists/aspell-ar-1.2_0-x86_64-1.txz: Added. extra/aspell-word-lists/aspell-ast-0.01-x86_64-1.txz: Added. extra/aspell-word-lists/aspell-ca-2.1.5_1-x86_64-1.txz: Upgraded. extra/aspell-word-lists/aspell-de_alt-2.1_1-x86_64-1.txz: Added. extra/aspell-word-lists/aspell-fy-0.12_0-x86_64-1.txz: Added. extra/aspell-word-lists/aspell-grc-0.02_0-x86_64-1.txz: Added. extra/aspell-word-lists/aspell-hy-0.10.0_0-x86_64-1.txz: Added. extra/aspell-word-lists/aspell-ky-0.01_0-x86_64-1.txz: Added. extra/aspell-word-lists/aspell-ml-0.03_1-x86_64-1.txz: Added. extra/aspell-word-lists/aspell-pt_PT-20070510_0-x86_64-1.txz: Added. extra/aspell-word-lists/aspell-tk-0.01_0-x86_64-1.txz: Added.
Diffstat (limited to 'source/a/udisks2')
-rwxr-xr-xsource/a/udisks2/udisks2.SlackBuild14
1 files changed, 12 insertions, 2 deletions
diff --git a/source/a/udisks2/udisks2.SlackBuild b/source/a/udisks2/udisks2.SlackBuild
index 999cd1ee3..95893e9d0 100755
--- a/source/a/udisks2/udisks2.SlackBuild
+++ b/source/a/udisks2/udisks2.SlackBuild
@@ -29,7 +29,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=udisks2
SRCNAM=udisks
VERSION=${VERSION:-$(echo $SRCNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
@@ -91,6 +91,16 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
+# Temporarily omit LVM2 support since it uses a removed API. We'll upgrade
+# udisks2 soon (and add newly required deps) to handle this, but since it
+# was broken after the LVM2 upgrade recently and nobody noticed yet it's
+# probably OK for it to be like this for a little while.
+if [ "$VERSION" = "2.6.5" ]; then
+ LVM2_SUPPORT="--disable-lvm2"
+else
+ LVM2_SUPPORT="--enable-lvm2"
+fi
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
@@ -101,7 +111,7 @@ CXXFLAGS="$SLKCFLAGS" \
--disable-static \
--mandir=/usr/man \
--docdir=/usr/doc/$PKGNAM-$VERSION \
- --enable-lvm2 \
+ $LVM2_SUPPORT \
--build=$TARGET || exit 1
make $NUMJOBS || make || exit 1