aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan_Hicks <alan@lizella.net>2010-05-12 17:46:04 +0200
committerDavid Somero <xgizzmo@slackbuilds.org>2010-05-12 17:46:04 +0200
commita71e5b82ed19ed24dcc63558f416c39fa793de54 (patch)
treec99b5cb75d896d9aed2578664b680286baac0223
parent8aa2cc8818015dfe0bf05a8368f419a4fb9a6353 (diff)
system/sshfs-fuse: Updated for version 2.2
-rw-r--r--system/sshfs-fuse/sshfs-fuse.SlackBuild10
-rw-r--r--system/sshfs-fuse/sshfs-fuse.info3
2 files changed, 9 insertions, 4 deletions
diff --git a/system/sshfs-fuse/sshfs-fuse.SlackBuild b/system/sshfs-fuse/sshfs-fuse.SlackBuild
index a4396cca3c178..4c39e0bdd104a 100644
--- a/system/sshfs-fuse/sshfs-fuse.SlackBuild
+++ b/system/sshfs-fuse/sshfs-fuse.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright 2006, Alan Hicks, Lizella, GA
+# Copyright 2006-2009 Alan Hicks, Lizella, GA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -33,8 +33,13 @@ OUTPUT=${OUTPUT:-/tmp}
if [ "$ARCH" = "i486" ]; then
SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+ LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+ SLKCFLAGS="-O2 -fPIC"
+ LIBDIRSUFFIX="64"
fi
# Exit on most errors
@@ -57,6 +62,7 @@ CFLAG="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
--sysconfdir=/etc \
--localstatedir=/var \
--mandir=/usr/man \
@@ -66,7 +72,7 @@ make
make install DESTDIR=$PKG
find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
( cd $PKG/usr/man
find . -type f -exec gzip -9 {} \;
diff --git a/system/sshfs-fuse/sshfs-fuse.info b/system/sshfs-fuse/sshfs-fuse.info
index d4320c18bd15f..979f01baf3829 100644
--- a/system/sshfs-fuse/sshfs-fuse.info
+++ b/system/sshfs-fuse/sshfs-fuse.info
@@ -5,5 +5,4 @@ DOWNLOAD="http://downloads.sourceforge.net/fuse/sshfs-fuse-2.2.tar.gz"
MD5SUM="26e9206eb5169e87e6f95f54bc005a4f"
MAINTAINER="Alan_Hicks"
EMAIL="alan@lizella.net"
-APPROVED="dsomero"
-
+APPROVED="dsomero,rworkman"