diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2020-10-21 21:51:26 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2020-10-22 08:59:46 +0200 |
commit | 02df087c4b8f24d50f217959edd84963958f64ea (patch) | |
tree | 02526c69fca9dcac2d45d3f3b05475357a1c8228 /source | |
parent | f85cda2ade5b0696e113b98333d7ecad5900ebef (diff) | |
download | current-02df087c4b8f24d50f217959edd84963958f64ea.tar.gz |
Wed Oct 21 21:51:26 UTC 202020201021215126
ap/nvme-cli-1.13-x86_64-1.txz: Upgraded.
l/libnice-0.1.18-x86_64-1.txz: Upgraded.
x/fonttosfnt-1.2.0-x86_64-1.txz: Upgraded.
xap/mozilla-thunderbird-78.4.0-x86_64-1.txz: Upgraded.
This is a bugfix release.
For more information, see:
https://www.mozilla.org/en-US/thunderbird/78.4.0/releasenotes/
Diffstat (limited to 'source')
-rw-r--r-- | source/a/aaa_elflibs/symlinks-to-tracked-libs-tmp | 2 | ||||
-rwxr-xr-x | source/ap/nvme-cli/nvme-cli.SlackBuild | 4 | ||||
-rwxr-xr-x | source/l/libnice/libnice.SlackBuild | 31 |
3 files changed, 19 insertions, 18 deletions
diff --git a/source/a/aaa_elflibs/symlinks-to-tracked-libs-tmp b/source/a/aaa_elflibs/symlinks-to-tracked-libs-tmp index cbbe62c5..f67eca7d 100644 --- a/source/a/aaa_elflibs/symlinks-to-tracked-libs-tmp +++ b/source/a/aaa_elflibs/symlinks-to-tracked-libs-tmp @@ -10,8 +10,6 @@ /usr/lib/libmpfr.so.6 /usr/lib/libgmp.so.10 /usr/lib/libgmpxx.so.4 -# We'll keep this one around for just a little bit: -/usr/lib/libffi.so.7 # Need these saved here during the KDE4 -> Plasma 5 transition: /usr/lib/libexiv2.so.26 /usr/lib/libraw.so.16 diff --git a/source/ap/nvme-cli/nvme-cli.SlackBuild b/source/ap/nvme-cli/nvme-cli.SlackBuild index 2d6ebd13..027d7afc 100755 --- a/source/ap/nvme-cli/nvme-cli.SlackBuild +++ b/source/ap/nvme-cli/nvme-cli.SlackBuild @@ -86,8 +86,8 @@ find . \ -exec chmod 644 {} \+ # Build and install: -make CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" PREFIX=/usr SBINDIR=/usr/sbin || exit 1 -make install CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" PREFIX=/usr SBINDIR=/usr/sbin DESTDIR=$PKG || exit 1 +make $NUMJOBS CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" PREFIX=/usr SBINDIR=/usr/sbin || exit 1 +make $NUMJOBS install CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" PREFIX=/usr SBINDIR=/usr/sbin DESTDIR=$PKG || exit 1 # Don't ship build-host specific files: rm -f $PKG/etc/nvme/* diff --git a/source/l/libnice/libnice.SlackBuild b/source/l/libnice/libnice.SlackBuild index 696287bd..253ae979 100755 --- a/source/l/libnice/libnice.SlackBuild +++ b/source/l/libnice/libnice.SlackBuild @@ -86,23 +86,26 @@ find . \ -exec chmod 644 {} \+ # Configure, build, and install: -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 \ - --disable-static \ - --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 \ + .. || exit 1 + "${NINJA:=ninja}" $NUMJOBS || exit 1 + DESTDIR=$PKG $NINJA install || exit 1 +cd .. # Strip binaries: find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null |