aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilly Sudiarto Raharjo <willysr@slackbuilds.org>2016-08-02 08:49:06 +0700
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2016-08-03 07:29:34 +0700
commitf177d9fc1fc473de2b362d5281027a3fcda38819 (patch)
tree4664a6f2c66d394e1b4f7acb2ac7bca5ae2a1134
parent06bf1938b97b5c686b51b32ff251d0468ad23901 (diff)
office/texmacs: Use Guile1.8 correctly.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r--office/texmacs/texmacs.SlackBuild17
1 files changed, 9 insertions, 8 deletions
diff --git a/office/texmacs/texmacs.SlackBuild b/office/texmacs/texmacs.SlackBuild
index f6e937c5ed41..e3f86d5023e0 100644
--- a/office/texmacs/texmacs.SlackBuild
+++ b/office/texmacs/texmacs.SlackBuild
@@ -24,14 +24,14 @@
PRGNAM=texmacs
VERSION=${VERSION:-1.99.2}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
SRCNAM=TeXmacs
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -42,8 +42,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -66,13 +66,14 @@ tar xvf $CWD/$SRCNAM-$VERSION-src.tar.gz
cd $SRCNAM-$VERSION-src
chown -R root:root .
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 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -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 {} \;
# Use guile1.8, guile-2.x in Slackware causes segfaults
sed -i -e "s|guile-config\ |guile-config1.8 |g" -e "s|guile\ |guile1.8 |g" configure
+sed -i -e "s|libguile18.h|libguile.h|g" src/Scheme/Guile/guile_tm.hpp
export GUILE_AUTO_COMPILE=0