From b1b861e1e2e5048ab28073c276257d5d4afcda41 Mon Sep 17 00:00:00 2001
From: Eugen Wissner <belka@caraus.de>
Date: Sat, 4 Jun 2022 11:01:03 +0200
Subject: [PATCH] gcc-latest: Create versioned path for libraries

---
 private/gcc-latest/gcc-latest.SlackBuild | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/private/gcc-latest/gcc-latest.SlackBuild b/private/gcc-latest/gcc-latest.SlackBuild
index 7f67cf2..c17271e 100755
--- a/private/gcc-latest/gcc-latest.SlackBuild
+++ b/private/gcc-latest/gcc-latest.SlackBuild
@@ -129,7 +129,7 @@ fi
   --enable-threads=posix \
   --enable-checking=release \
   --with-system-zlib \
-  --enable-libstdcxx-dual-abi \
+  --disable-libquadmath-support \
   --with-default-libstdcxx-abi=new \
   --disable-libstdcxx-pch \
   --disable-libunwind-exceptions \
@@ -140,13 +140,12 @@ fi
   --enable-lto \
   --disable-install-libiberty \
   --disable-werror \
-  --with-gnu-ld \
+  --with-gcc-major-version-only \
   --with-isl \
-  --verbose \
+  --program-suffix=-12 \
   --with-arch-directory=$LIB_ARCH \
   --disable-gtktest \
   --enable-clocale=gnu \
-  --program-suffix=-12 \
   $GCC_ARCHOPTS \
   --target=${TARGET} \
   --build=${TARGET} \
@@ -155,22 +154,15 @@ fi
 make
 make install-strip DESTDIR=$PKG
 
-rm $PKG/usr/lib${LIBDIRSUFFIX}/*.{la,o,a,spec} \
-  $PKG/usr/lib${LIBDIRSUFFIX}/libgcc_s.so* \
-  $PKG/usr/lib${LIBDIRSUFFIX}/libatomic.so* \
-  $PKG/usr/lib${LIBDIRSUFFIX}/libcc1.so* \
-  $PKG/usr/lib${LIBDIRSUFFIX}/libgomp.so* \
-  $PKG/usr/lib${LIBDIRSUFFIX}/libitm.so* \
-  $PKG/usr/lib${LIBDIRSUFFIX}/liblsan.so* \
-  $PKG/usr/lib${LIBDIRSUFFIX}/libquadmath.so* \
-  $PKG/usr/lib${LIBDIRSUFFIX}/libubsan.so* \
-  $PKG/usr/lib${LIBDIRSUFFIX}/libstdc++.so \
-  $PKG/usr/lib${LIBDIRSUFFIX}/libstdc++.so.6
+rm $PKG/usr/lib${LIBDIRSUFFIX}/*.la
 
-# Move gdb pretty printers to the correct place
+mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/gcc-12
 mkdir -p $PKG/usr/share/gdb/auto-load/usr/lib$LIBDIRSUFFIX
+
 mv $PKG/usr/lib$LIBDIRSUFFIX/*-gdb.py \
   $PKG/usr/share/gdb/auto-load/usr/lib$LIBDIRSUFFIX/
+mv $PKG/usr/lib${LIBDIRSUFFIX}/*.{a,o,spec,so*} \
+  $PKG/usr/lib${LIBDIRSUFFIX}/gcc-12
 
 cd ../gcc-$VERSION