diff options
author | Eric Hameleers <alien@slackware.com> | 2015-11-15 00:55:30 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2015-11-15 00:55:30 +0000 |
commit | db8d5269cfd119949674a9d8dced018057febbaa (patch) | |
tree | cafa0136e0d80328a9f46dde39107873f4a3efd9 /current/gcc/gcc-multilib.SlackBuild | |
parent | aea7b8f7114ea560093e0e44f0c446e6c5e4c41e (diff) | |
download | multilib-db8d5269cfd119949674a9d8dced018057febbaa.tar.gz multilib-db8d5269cfd119949674a9d8dced018057febbaa.tar.xz |
Update to gcc 5.2.0 in slackware-current
Diffstat (limited to '')
-rwxr-xr-x | current/gcc/gcc-multilib.SlackBuild | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/current/gcc/gcc-multilib.SlackBuild b/current/gcc/gcc-multilib.SlackBuild index 34ddb45..d62ed11 100755 --- a/current/gcc/gcc-multilib.SlackBuild +++ b/current/gcc/gcc-multilib.SlackBuild @@ -433,6 +433,9 @@ ANTLJAR=$(echo $CWD/antlr-*.jar | tail -1) # Second run: use # LANGS="ada,c,c++,fortran,go,java,objc" + # NOTE: For Slackware 15.0, look into removing --with-default-libstdcxx-abi=gcc4-compatible, + # which will then require rebuilding all C++ libraries. That is, if there's any benefit. + LDFLAGS="$SLKLDFLAGS" \ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ @@ -449,6 +452,8 @@ ANTLJAR=$(echo $CWD/antlr-*.jar | tail -1) --enable-objc-gc \ --with-system-zlib \ --with-python-dir=/lib$LIBDIRSUFFIX/python2.7/site-packages \ + --enable-libstdcxx-dual-abi \ + --with-default-libstdcxx-abi=gcc4-compatible \ --disable-libunwind-exceptions \ --enable-__cxa_atexit \ --enable-libssp \ @@ -807,13 +812,14 @@ mv $PKG1/usr/bin/gnative2ascii $PKG5/usr/bin ( cd $PKG8 mkdir -p usr/bin mv $PKG1/usr/bin/*gccgo* usr/bin + mv $PKG1/usr/bin/go{,fmt} usr/bin mkdir -p usr/libexec/gcc/$TARGET/$VERSION - mv $PKG1/usr/libexec/gcc/$TARGET/$VERSION/go1 usr/libexec/gcc/$TARGET/$VERSION/go1 + mv $PKG1/usr/libexec/gcc/$TARGET/$VERSION/{cgo,go1} usr/libexec/gcc/$TARGET/$VERSION/go1 mkdir -p usr/info mv $PKG1/usr/info/gccgo.info.gz usr/info mkdir -p usr/lib${LIBDIRSUFFIX} mv $PKG1/usr/lib${LIBDIRSUFFIX}/go usr/lib${LIBDIRSUFFIX} - mv $PKG1/usr/lib${LIBDIRSUFFIX}/{libgo.la,libgo.so*,libgobegin.a} usr/lib${LIBDIRSUFFIX} || exit 1 + mv $PKG1/usr/lib${LIBDIRSUFFIX}/{libgo.la,libgo.so*,libgobegin.a,libgolibbegin.a,libnetgo.a} usr/lib${LIBDIRSUFFIX} || exit 1 # Ordinarily Slackware doesn't package static libraries, but in this case # it is useful for deploying compiled binaries on machines that do not yet # have libgo.so.0.0.0. @@ -821,11 +827,13 @@ mv $PKG1/usr/bin/gnative2ascii $PKG5/usr/bin if [ "$ARCH" = "x86_64" ]; then mkdir -p usr/lib mv $PKG1/usr/lib/go usr/lib - mv $PKG1/usr/lib/{libgo.la,libgo.so*,libgobegin.a} usr/lib || exit 1 + mv $PKG1/usr/lib/{libgo.la,libgo.so*,libgobegin.a,libgolibbegin.a,libnetgo.a} usr/lib || exit 1 mv $PKG1/usr/lib/libgo.a usr/lib fi mkdir -p usr/man/man1 mv $PKG1/usr/man/man1/gccgo.1.gz usr/man/man1 + mv $PKG1/usr/man/man1/go.1.gz usr/man/man1 + mv $PKG1/usr/man/man1/gofmt.1.gz usr/man/man1 ) || exit 1 # Filter all .la files (thanks much to Mark Post for the sed script): |