summaryrefslogtreecommitdiffstats
path: root/source/n/sshfs
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2019-09-19 22:48:58 +0000
committer Eric Hameleers <alien@slackware.com>2019-09-20 08:59:47 +0200
commit3fb911844eaa3e98d80a8cc6c946202904fe8693 (patch)
treeb614a5a6e02c370bd4824e86980b7b8c9ab442de /source/n/sshfs
parenta580cc0d3e082bb499f39ba917b24149bdb68ac7 (diff)
downloadcurrent-3fb911844eaa3e98d80a8cc6c946202904fe8693.tar.gz
current-3fb911844eaa3e98d80a8cc6c946202904fe8693.tar.xz
Thu Sep 19 22:48:58 UTC 201920190919224858
Thanks to Robby Workman for helping upgrade the GTK stack! a/kernel-generic-4.19.74-x86_64-1.txz: Upgraded. a/kernel-huge-4.19.74-x86_64-1.txz: Upgraded. a/kernel-modules-4.19.74-x86_64-1.txz: Upgraded. d/kernel-headers-4.19.74-x86-1.txz: Upgraded. d/vala-0.46.1-x86_64-1.txz: Upgraded. k/kernel-source-4.19.74-noarch-1.txz: Upgraded. l/adwaita-icon-theme-3.34.0-noarch-1.txz: Upgraded. l/at-spi2-atk-2.34.0-x86_64-1.txz: Upgraded. l/at-spi2-core-2.34.0-x86_64-1.txz: Upgraded. l/atk-2.34.1-x86_64-1.txz: Upgraded. l/dconf-0.34.0-x86_64-1.txz: Upgraded. l/dconf-editor-3.34.1-x86_64-1.txz: Upgraded. l/fuse3-3.6.2-x86_64-1.txz: Added. This is required by gvfs and sshfs. l/glib-networking-2.62.0-x86_64-1.txz: Upgraded. l/glib2-2.62.0-x86_64-1.txz: Upgraded. l/gnome-themes-extra-3.28-x86_64-1.txz: Added. l/gnome-themes-standard-3.22.3-x86_64-2.txz: Removed. Upstream has renamed this to gnome-themes-extra. l/gobject-introspection-1.62.0-x86_64-1.txz: Upgraded. l/gsettings-desktop-schemas-3.34.0-x86_64-1.txz: Upgraded. l/gvfs-1.42.0-x86_64-1.txz: Upgraded. l/imagemagick-6.9.10_65-x86_64-1.txz: Upgraded. l/librsvg-2.46.0-x86_64-1.txz: Upgraded. l/libsoup-2.68.1-x86_64-1.txz: Upgraded. l/pygobject3-3.34.0-x86_64-1.txz: Upgraded. l/python-packaging-19.2-x86_64-1.txz: Upgraded. l/vte-0.58.0-x86_64-1.txz: Upgraded. n/bind-9.14.6-x86_64-1.txz: Upgraded. n/sshfs-3.5.2-x86_64-1.txz: Upgraded. isolinux/initrd.img: Rebuilt. kernels/*: Upgraded. usb-and-pxe-installers/usbboot.img: Rebuilt.
Diffstat (limited to 'source/n/sshfs')
-rwxr-xr-xsource/n/sshfs/sshfs.SlackBuild34
1 files changed, 20 insertions, 14 deletions
diff --git a/source/n/sshfs/sshfs.SlackBuild b/source/n/sshfs/sshfs.SlackBuild
index 8f4aae010..78a5b9f1d 100755
--- a/source/n/sshfs/sshfs.SlackBuild
+++ b/source/n/sshfs/sshfs.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=sshfs
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
@@ -76,21 +76,27 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
-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 \
- --bindir=/bin \
- --sbindir=/sbin \
- --docdir=/usr/doc/$PKGNAM-$VERSION \
- --build=${ARCH}-slackware-linux \
- || exit 1
-
-make $NUMJOBS || make || exit 1
-
-make install DESTDIR=$PKG || exit 1
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --buildtype=release \
+ .. || exit 1
+ "${NINJA:=ninja}" $NUMJOBS || exit 1
+ DESTDIR=$PKG $NINJA install || exit 1
+cd ..
find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null