diff options
| author |   Patrick J Volkerding <volkerdi@slackware.com> | 2019-03-05 00:17:16 +0000 |
|---|---|---|
| committer |   Eric Hameleers <alien@slackware.com> | 2019-03-05 08:59:46 +0100 |
| commit | 490bd1ff02b9d0e37a0aec334c1be80d54ed3ab6 (patch) | |
| tree | 00b9c340c631e12d03a3e1eb19322dc26a164106 /source/l/glib2/glib2.SlackBuild | |
| parent | 3b234388a5f545f071422864e1a274ba45a696a0 (diff) | |
| download | current-490bd1ff02b9d0e37a0aec334c1be80d54ed3ab6.tar.gz current-490bd1ff02b9d0e37a0aec334c1be80d54ed3ab6.tar.xz | |
Tue Mar 5 00:17:16 UTC 201920190305001716
d/gcc-8.3.0-x86_64-2.txz: Rebuilt.
Reverted backported asm inline patches that broke "asm volatile".
Thanks to nobodino.
d/gcc-brig-8.3.0-x86_64-2.txz: Rebuilt.
d/gcc-g++-8.3.0-x86_64-2.txz: Rebuilt.
d/gcc-gfortran-8.3.0-x86_64-2.txz: Rebuilt.
d/gcc-gnat-8.3.0-x86_64-2.txz: Rebuilt.
d/gcc-go-8.3.0-x86_64-2.txz: Rebuilt.
d/gcc-objc-8.3.0-x86_64-2.txz: Rebuilt.
l/at-spi2-atk-2.30.1-x86_64-1.txz: Upgraded.
l/at-spi2-core-2.30.1-x86_64-1.txz: Upgraded.
l/gc-8.0.4-x86_64-1.txz: Upgraded.
l/glib2-2.60.0-x86_64-1.txz: Upgraded.
l/imagemagick-6.9.10_31-x86_64-1.txz: Upgraded.
n/postfix-3.4.0-x86_64-2.txz: Rebuilt.
Prevent the install script from making noise.
x/xinit-1.4.1-x86_64-1.txz: Upgraded.
x/xlogo-1.0.5-x86_64-1.txz: Upgraded.
x/xmore-1.0.3-x86_64-1.txz: Upgraded.
extra/fltk/fltk-1.3.5-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/l/glib2/glib2.SlackBuild')
| -rwxr-xr-x | source/l/glib2/glib2.SlackBuild | 42 |
1 files changed, 28 insertions, 14 deletions
diff --git a/source/l/glib2/glib2.SlackBuild b/source/l/glib2/glib2.SlackBuild index 4998e4152..66c5f11ca 100755 --- a/source/l/glib2/glib2.SlackBuild +++ b/source/l/glib2/glib2.SlackBuild @@ -80,26 +80,40 @@ find . \ # Get the local timezone link from /etc/localtime-copied-from: zcat $CWD/glib2.slackware.localtime.diff.gz | patch -p1 --verbose || exit 1 -if [ ! -r configure ]; then - NOCONFIGURE=1 ./autogen.sh -fi - -CFLAGS="$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} \ - --sysconfdir=/etc \ + --libdir=lib${LIBDIRSUFFIX} \ + --libexecdir=/usr/libexec \ + --bindir=/usr/bin \ + --sbindir=/usr/sbin \ + --includedir=/usr/include \ + --datadir=/usr/share \ --mandir=/usr/man \ - --enable-gtk-doc \ - --disable-libelf \ - --build=$ARCH-slackware-linux || exit 1 - -make $NUMJOBS || make || exit 1 -make install DESTDIR=$PKG || exit 1 + --sysconfdir=/etc \ + --localstatedir=/var \ + --buildtype=release \ + -Dselinux=disabled \ + -Dfam=true \ + -Dman=true \ + -Dgtk_doc=true \ + -Dinstalled_tests=false \ + .. || exit 1 + ninja || exit 1 + DESTDIR=$PKG ninja install || exit 1 +cd .. # Don't ship .la files: rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la +# Since meson isn't listening to options: +rm -rf $PKG/usr/libexec/installed-tests +rmdir $PKG/usr/libexec + # Install profile scripts: mkdir -p $PKG/etc/profile.d/ cp -a $CWD/libglib2.{csh,sh} $PKG/etc/profile.d/ |