diff options
| author | Patrick J Volkerding <volkerdi@slackware.com> | 2021-11-23 19:44:27 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2021-11-24 08:59:57 +0100 |
| commit | 8ed399a7a71742513c5052b560a0e74cf0f0af47 (patch) | |
| tree | 4bb753f2ebe3f594f940fc3587a0ff17cbb050b0 /source/x | |
| parent | ef001ab523d0969f0fe72336a66798bae8fed36f (diff) | |
| download | current-8ed399a7a71742513c5052b560a0e74cf0f0af47.tar.gz | |
Tue Nov 23 19:44:27 UTC 202120211123194427
a/btrfs-progs-5.15.1-x86_64-1.txz: Upgraded.
a/kernel-firmware-20211123_b0e898f-noarch-1.txz: Upgraded.
ap/vim-8.2.3656-x86_64-1.txz: Upgraded.
d/mercurial-6.0-x86_64-1.txz: Upgraded.
d/parallel-20211122-noarch-1.txz: Upgraded.
l/fluidsynth-2.2.4-x86_64-1.txz: Upgraded.
n/libnetfilter_log-1.0.2-x86_64-1.txz: Upgraded.
x/wayland-protocols-1.24-noarch-1.txz: Upgraded.
xap/vim-gvim-8.2.3656-x86_64-1.txz: Upgraded.
extra/tigervnc/tigervnc-1.12.0-x86_64-3.txz: Rebuilt.
Removed pam_selinux.so module from /etc/pam.d/tigervnc. Thanks to 0XBF.
Diffstat (limited to 'source/x')
| -rwxr-xr-x | source/x/wayland-protocols/wayland-protocols.SlackBuild | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/source/x/wayland-protocols/wayland-protocols.SlackBuild b/source/x/wayland-protocols/wayland-protocols.SlackBuild index 8410c6a8..2f96227c 100755 --- a/source/x/wayland-protocols/wayland-protocols.SlackBuild +++ b/source/x/wayland-protocols/wayland-protocols.SlackBuild @@ -88,26 +88,26 @@ find . \ -exec chmod 644 {} \+ # Configure, build, and install: -if [ ! -r configure ]; then - if [ -x ./autogen.sh ]; then - NOCONFIGURE=1 ./autogen.sh - else - autoreconf -vif - fi -fi -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ +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 \ - --docdir=/usr/doc/$PKGNAM-$VERSION \ - --mandir=/usr/man \ - --infodir=/usr/info \ - --build=$ARCH-slackware-linux || exit 1 -make $NUMJOBS || make || exit 1 -make install DESTDIR=$PKG || exit 1 + --buildtype=release \ + .. || exit 1 + "${NINJA:=ninja}" $NUMJOBS || exit 1 + DESTDIR=$PKG $NINJA install || exit 1 +cd .. # Don't ship .la files: rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la |