summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author khronosschoty2017-11-08 02:14:34 +0100
committer Willy Sudiarto Raharjo2017-11-11 01:07:27 +0100
commit5cf7f3a4ed400b5fc88539573b2006fa1a547ab0 (patch)
tree71c4c8cd24444b2184ff4300e18cad3f999aa396
parent2b8e7a67beab34c1dec9b0cd5ac15875db7811f6 (diff)
downloadslackbuilds-5cf7f3a4ed400b5fc88539573b2006fa1a547ab0.tar.gz
development/gcclegacy494: Update SlackBuild.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r--development/gcclegacy494/gcclegacy494.SlackBuild27
1 files changed, 10 insertions, 17 deletions
diff --git a/development/gcclegacy494/gcclegacy494.SlackBuild b/development/gcclegacy494/gcclegacy494.SlackBuild
index 5d4fe5ce25..30cf144162 100644
--- a/development/gcclegacy494/gcclegacy494.SlackBuild
+++ b/development/gcclegacy494/gcclegacy494.SlackBuild
@@ -24,7 +24,7 @@
PRGNAM=gcclegacy494
VERSION=${VERSION:-4.9.4}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
INSTLOC=${INSTLOC:-/opt/$PRGNAM}
@@ -95,11 +95,11 @@ cd $TMP/
rm -rf gcc-4.9.4/
tar -xzf $CWD/gcc-4.9.4.tar.gz
cd gcc-4.9.4
-cp --preserve=all $CWD/gmp-4.3.2.tar.bz2 \
- $CWD/mpfr-2.4.2.tar.bz2 \
- $CWD/mpc-0.8.1.tar.gz \
- $CWD/isl-0.12.2.tar.bz2 \
- $CWD/cloog-0.18.1.tar.gz .
+
+# Do not run fixincludes
+cp -v gcc/Makefile.in{,.orig}
+sed 's@\./fixinc\.sh@-c true@' gcc/Makefile.in.orig > gcc/Makefile.in
+
tar xjf $CWD/mpfr-2.4.2.tar.bz2
ln -sf mpfr-2.4.2 mpfr
tar xjf $CWD/gmp-4.3.2.tar.bz2
@@ -124,15 +124,12 @@ rm -rf $PKG
mkdir -p $PKG
CFLAGS="$SLKCFLAGS"
CXXFLAGS="$SLKCFLAGS"
- $PWD/../gcc-4.9.4/configure --prefix=/usr \
+ $PWD/../gcc-4.9.4/configure --prefix=$INSTLOC \
--program-suffix=-4.9.4 \
--enable-languages=c,c++ \
--with-system-zlib \
- --mandir=/usr/man \
- --libdir=/usr/lib$LIBDIRSUFFIX \
- --infodir=/usr/info \
+ --libdir=$INSTLOC/lib$LIBDIRSUFFIX \
--enable-threads=posix \
- --with-python-dir=/lib$LIBDIRSUFFIX/python2.7/site-packages \
--disable-gtktest \
--target=${TARGET} \
--build=${TARGET} \
@@ -146,10 +143,6 @@ CXXFLAGS="$SLKCFLAGS"
make
make DESTDIR=$PKG install-strip
-# Rename / move to /opt so there is no conflicts with Slackware's gcc, libraries etc.
-mkdir -p $PKG$INSTLOC
-mv -f $PKG/usr/* $PKG$INSTLOC
-
# Thank you to 'idlemoor'
mkdir -p $PKG/usr/bin
cd /$PKG/usr/bin
@@ -165,7 +158,7 @@ done
ln -s $ARCH-slackware-linux-gcc-4.9.4 $PKG/usr/bin/gcc-4.9.4
ln -s $ARCH-slackware-linux-g++-4.9.4 $PKG/usr/bin/g++-gcc-4.9.4
-mv -f $PKG$INSTLOC/man $PKG/usr/man
+mv -f $PKG$INSTLOC/share/man $PKG/usr/man
cd $PKG/usr/man/man7
# we do not need these; according to "diff" there is no difference between these files
# and the ones Slackware ships with; except this man page named "gfdl.7"; which shall be
@@ -175,7 +168,7 @@ mv gfdl.7 gfdl494.7
find $PKG/usr/man -type f -exec gzip -9 {} \;
for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-mv -f $PKG$INSTLOC/info $PKG/usr/info
+mv -f $PKG$INSTLOC/share/info $PKG/usr/info
rm -f $PKG/usr/info/dir
cd $PKG/usr/info
#rename the .info files so they do not conflict with Slackware's own .info files.