gcc-multilib: don't ship .la files in /{,usr/}lib${LIBDIRSUFFIX}

Also, switch to the new libstdcxx ABI by default (breakage ahead)

1 files changed, 15 insertions, 3 deletions

diff --git a/source/current/gcc/gcc-multilib.SlackBuild b/source/current/gcc/gcc-multilib.SlackBuild
index ed7e45a..7d7dde9 100755
--- a/source/current/gcc/gcc-multilib.SlackBuild
+++ b/source/current/gcc/gcc-multilib.SlackBuild
@@ -373,7 +373,7 @@ tar xvf $CWD/gcc-$VERSION.tar.xz || exit 1
      --enable-objc-gc \
      --with-system-zlib \
      --enable-libstdcxx-dual-abi \
-     --with-default-libstdcxx-abi=gcc4-compatible \
+     --with-default-libstdcxx-abi=new \
      --disable-libunwind-exceptions \
      --enable-__cxa_atexit \
      --enable-libssp \
@@ -507,6 +507,12 @@ tar xvf $CWD/gcc-$VERSION.tar.xz || exit 1
   rm $TMP/tmp-la-file
 )
 
+# Don't ship .la files in /{,usr/}lib${LIBDIRSUFFIX}:
+rm -f $PKG1/{,usr/}lib${LIBDIRSUFFIX}/*.la
+if [ "$ARCH" = "x86_64"  ]; then
+  rm -f $PKG1/{,usr/}lib/*.la
+fi
+
 # Strip bloated binaries and libraries:
 ( cd $PKG1
   find . -name "lib*so*" -exec strip --strip-unneeded "{}" \;
@@ -625,7 +631,10 @@ tar xvf $CWD/gcc-$VERSION.tar.xz || exit 1
   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,libgolibbegin.a} usr/lib${LIBDIRSUFFIX} || echo "** Crucial GO libraries were not found **"
+  if [ -r $PKG1/usr/lib${LIBDIRSUFFIX}/libgo.la ]; then
+    mv $PKG1/usr/lib${LIBDIRSUFFIX}/libgo.la usr/lib${LIBDIRSUFFIX}
+  fi
+  mv $PKG1/usr/lib${LIBDIRSUFFIX}/{libgo.so*,libgobegin.a,libgolibbegin.a} usr/lib${LIBDIRSUFFIX} || { echo "** Crucial GO libraries were not found **"; 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.
@@ -634,7 +643,10 @@ tar xvf $CWD/gcc-$VERSION.tar.xz || exit 1
   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,libgolibbegin.a} usr/lib || echo "** Crucial GO libraries were not found **"
+    if [ -r $PKG1/usr/lib/libgo.la ]; then
+      mv $PKG1/usr/lib/libgo.la usr/lib
+    fi
+    mv $PKG1/usr/lib/{libgo.so*,libgobegin.a,libgolibbegin.a} usr/lib || { echo "** Crucial GO libraries were not found **"; exit 1; }
     mv $PKG1/usr/lib/libgo.a usr/lib
   fi
   mkdir -p usr/man/man1