summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2023-08-10 15:14:55 +0000
committer Eric Hameleers <alien@slackware.com>2023-08-10 15:14:55 +0000
commit6743a7301d522d8d9ba953d9a47d23a1d19d6118 (patch)
tree50f5a1a831f9a69443e846ac1b585f514b7d782f
parent78a0c24d62a69ba2eaf3f0a56bf337f85f6a42ed (diff)
downloadasb-6743a7301d522d8d9ba953d9a47d23a1d19d6118.tar.gz
asb-6743a7301d522d8d9ba953d9a47d23a1d19d6118.tar.xz
flatpak: switched from autotools to meson
-rwxr-xr-xflatpak/build/flatpak.SlackBuild45
1 files changed, 24 insertions, 21 deletions
diff --git a/flatpak/build/flatpak.SlackBuild b/flatpak/build/flatpak.SlackBuild
index ae1f96b4..8ac0d3bc 100755
--- a/flatpak/build/flatpak.SlackBuild
+++ b/flatpak/build/flatpak.SlackBuild
@@ -183,27 +183,30 @@ chown -R root:root .
chmod -R u+w,go+r-w,a+rX-st .
echo Building ...
-LDFLAGS="$SLKLDFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-CFLAGS="$SLKCFLAGS" \
-./configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --mandir=/usr/man \
- --docdir=/usr/doc/$PRGNAM-$VERSION \
- --localstatedir=/var \
- --sysconfdir=/etc \
- --with-privileged-group=wheel \
- --with-system-bubblewrap \
- --with-system-helper-user=flatpak \
- --disable-static \
- --program-prefix= \
- --program-suffix= \
- --build=$TARGET \
- 2>&1 | tee $OUTPUT/configure-${PRGNAM}.log
-
-make $NUMJOBS 2>&1 | tee $OUTPUT/make-${PRGNAM}.log
-make DESTDIR=$PKG install 2>&1 | tee $OUTPUT/install-${PRGNAM}.log
+export LDFLAGS="$SLKLDFLAGS"
+export CXXFLAGS="$SLKCFLAGS"
+export CFLAGS="$SLKCFLAGS"
+mkdir meson-build
+cd meson-build
+ meson setup \
+ --prefix=/usr \
+ --mandir=/usr/man \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
+ --buildtype=release \
+ -Ddbus_config_dir=/usr/share/dbus-1/system.d \
+ -Dprivileged_group=wheel \
+ -Dprofile_dir=/etc/profile.d \
+ -Dsystem_bubblewrap=/usr/bin/bwrap \
+ -Dsystem_dbus_proxy=/usr/bin/xdg-dbus-proxy \
+ -Dsystem_helper_user=flatpak \
+ -Dtests=false \
+ .. \
+ 2>&1 | tee $OUTPUT/configure-${PRGNAM}.log
+ meson compile \
+ 2>&1 | tee $OUTPUT/make-${PRGNAM}.log
+ meson install --destdir $PKG \
+ 2>&1 | tee $OUTPUT/install-${PRGNAM}.log
+cd - 1>/dev/null
# Don't ship .la files:
rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la