summaryrefslogtreecommitdiffstats
path: root/source
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2020-12-25 06:10:08 +0000
committer Eric Hameleers <alien@slackware.com>2020-12-25 17:59:48 +0100
commit6ca133bba768c73be2f69616014a53d1389b2633 (patch)
treeb7c0d11f24feda1a9d87767696a82e3c5ba16a1b /source
parent0cde31b79d54a3553040d395d63f4ef79959892d (diff)
downloadcurrent-6ca133bba768c73be2f69616014a53d1389b2633.tar.gz
current-6ca133bba768c73be2f69616014a53d1389b2633.tar.xz
Fri Dec 25 06:10:08 UTC 202020201225061008
l/harfbuzz-2.7.3-x86_64-2.txz: Rebuilt. Seems the --enable-introspection option didn't work, so rebuild with meson since that's probably what most of the developers do. Fixes blueman. Thanks to marav for the bug report.
Diffstat (limited to 'source')
-rwxr-xr-xsource/l/harfbuzz/harfbuzz.SlackBuild47
1 files changed, 25 insertions, 22 deletions
diff --git a/source/l/harfbuzz/harfbuzz.SlackBuild b/source/l/harfbuzz/harfbuzz.SlackBuild
index 4ba20e714..743555f15 100755
--- a/source/l/harfbuzz/harfbuzz.SlackBuild
+++ b/source/l/harfbuzz/harfbuzz.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=harfbuzz
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -77,30 +77,33 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \+
-if [ ! -r configure ]; then
- NOCONFIGURE=1 ./autogen.sh
-fi
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
+# Configure, build, and install:
+export CFLAGS="$SLKCFLAGS"
+export CXXFLAGS="$SLKCFLAGS"
+mkdir meson-build
+cd meson-build
+meson setup \
--prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
+ --libdir=lib${LIBDIRSUFFIX} \
+ --libexecdir=/usr/libexec \
+ --bindir=/usr/bin \
+ --sbindir=/usr/sbin \
+ --includedir=/usr/include \
+ --datadir=/usr/share \
+ --mandir=/usr/man \
--sysconfdir=/etc \
--localstatedir=/var \
- --mandir=/usr/man \
- --with-glib=yes \
- --with-gobject=yes \
- --with-graphite2=auto \
- --enable-introspection=yes \
- --docdir=/usr/doc/$PKGNAM-$VERSION \
- --build=$ARCH-slackware-linux || exit 1
-
-make $NUMJOBS || make || exit 1
-make install DESTDIR=$PKG || exit 1
-
-# Don't ship .la files:
-rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+ --buildtype=release \
+ -Dglib=enabled \
+ -Dgobject=enabled \
+ -Dgraphite=enabled \
+ -Dintrospection=enabled \
+ -Dtests=disabled \
+ -Dbenchmark=disabled \
+ .. || exit 1
+ "${NINJA:=ninja}" $NUMJOBS || exit 1
+ DESTDIR=$PKG $NINJA install || exit 1
+cd ..
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