summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2018-04-18 18:58:55 +0000
committer Eric Hameleers <alien@slackware.com>2018-04-18 18:58:55 +0000
commitd653ec74963bc550ef5832b972c6c984b69395b6 (patch)
treef1fcf1162f4a9b66e94a094edbe9f18e1e5c2e0b
parent82009439471b6315d8a533c9a50cac6e89f59c69 (diff)
downloadmultilib-d653ec74963bc550ef5832b972c6c984b69395b6.tar.gz
multilib-d653ec74963bc550ef5832b972c6c984b69395b6.tar.xz
gcc-multilib: this version seems to do the right thing.
-rwxr-xr-xsource/current/gcc/gcc-multilib.SlackBuild19
1 files changed, 16 insertions, 3 deletions
diff --git a/source/current/gcc/gcc-multilib.SlackBuild b/source/current/gcc/gcc-multilib.SlackBuild
index b91246f..2b4dd55 100755
--- a/source/current/gcc/gcc-multilib.SlackBuild
+++ b/source/current/gcc/gcc-multilib.SlackBuild
@@ -408,7 +408,7 @@ tar xf $CWD/gcc-$VERSION.tar.xz || exit 1
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
make gnattools || exit 1
- )
+ ) || echo "** Errors compiling gnatlib/gnattools"
make info || exit 1
# Set GCCCHECK=something to run the tests
@@ -435,10 +435,23 @@ tar xf $CWD/gcc-$VERSION.tar.xz || exit 1
# $PKG1/usr/lib${LIBDIRSUFFIX}/gcc/${TARGET}/${VERSION}/specs
#fi
- # make ada.install-common DESTDIR=$PKG1 || exit 1
- # make install-gnatlib DESTDIR=$PKG1 || exit 1
+ # Install ada related binaries:
+ ( cd gcc
+ make -i ada.install-common DESTDIR=$PKG1 || exit 1
+ # Address Makefile installation error:
+ make -i install-gnatlib DESTDIR=$PKG1 INSTALL="install" INSTALL_DATA="install -c -m644" || exit 1
+ #( cd ../$TARGET/32/libada
+ # make -i install-gnatlib DESTDIR=$PKG1 INSTALL="install" INSTALL_DATA="install -c -m644" || exit 1
+ #)
+ )
make -i install-info DESTDIR=$PKG1 || exit 1
+ # Special sauce for the go libraries:
+ make -C $TARGET/libgo install-exec-am DESTDIR=$PKG1
+ make -C $TARGET/32/libgo install-exec-am DESTDIR=$PKG1
+ make install-gotools DESTDIR=$PKG1
+ make -C gcc go.install-{common,man,info} DESTDIR=$PKG1
+
chmod 755 $PKG1/usr/lib${LIBDIRSUFFIX}/libgcc_s.so.1
# Fix stuff up: