summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Spencer <baildon.research@googlemail.com>2015-07-27 23:17:21 +0100
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2016-01-17 09:40:16 +0700
commit2ae11686ba23c37e51c79a9c416405523f51e7ca (patch)
tree21e003784f25a1001372f7055c30b05965357834
parent64e19ec387d422be33163afa6c114c14de6b2d9f (diff)
downloadslackbuilds-2ae11686ba23c37e51c79a9c416405523f51e7ca.tar.gz
system/truecrypt: Modified SlackBuild.
Fix underlinking error on -current, and set correct compiler flags. Signed-off-by: David Spencer <baildon.research@googlemail.com>
-rw-r--r--system/truecrypt/truecrypt.SlackBuild17
1 files changed, 7 insertions, 10 deletions
diff --git a/system/truecrypt/truecrypt.SlackBuild b/system/truecrypt/truecrypt.SlackBuild
index d7c95da069..a0d55c176f 100644
--- a/system/truecrypt/truecrypt.SlackBuild
+++ b/system/truecrypt/truecrypt.SlackBuild
@@ -49,13 +49,12 @@ set -e
if [ "$ARCH" = "i486" ]; then
SLKCFLAGS="-O2 -march=i486 -mtune=i686"
- LIBDIRSUFFIX=""
+ SLKLDFLAGS=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
+ SLKLDFLAGS=""
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
SLKLDFLAGS="-L/usr/lib64"
fi
@@ -71,15 +70,13 @@ find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-o -perm 511 \) -exec chmod 755 {} \; -o \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-if [ $ARCH = "x86_64" ]; then
- export LDFLAGS="$SLKLDFLAGS"
-fi
-export CXXFLAGS="$SLKCFLAGS"
-export CFLAGS="$SLKCFLAGS"
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
# Assume wxWidgets is already installed and we're linking dynamically.
+
+TC_EXTRA_CFLAGS="$SLKCFLAGS" \
+TC_EXTRA_CXXFLAGS="$SLKCFLAGS" \
+TC_EXTRA_LFLAGS="$SLKLDFLAGS -ldl" \
make
mkdir -p $PKG/usr/bin