extra/gcc13: Fix PKGBUILD patching

1 files changed, 13 insertions, 8 deletions

diff --git a/extra/gcc13/PKGBUILD b/extra/gcc13/PKGBUILD
index ca003988..82823927 100644
--- a/extra/gcc13/PKGBUILD
+++ b/extra/gcc13/PKGBUILD
@@ -17,19 +17,19 @@ eval "$(
       /configure/ s,--with-bugurl=https://bugs\.archlinux\.org/,--with-bugurl=https://bugs.archlinux32.org/,
       /configure/ s/;$/ --build=$CHOST;/
     '
-  declare -f package_gcc-libs | \
+  declare -f package_gcc13-libs | \
     sed '
       s/\$pkgname-multilib//
-      s@libsanitizer/{a,l,ub,t}san@libsanitizer/{a,l,ub}san@
+      s@libtsan.so@@
       /provides=/s/libtsan.so//
       \@/usr/lib32/@ d
     '
-  declare -f package_gcc | \
+  declare -f package_gcc13 | \
     sed '
       s/"lib32-gcc-libs[^"]*"//g
       s@make.*tsan.*install@#\0@
     '
-  declare -f package_gcc-ada | \
+  declare -f package_gcc13-ada | \
     sed '
       \,cd .*/32/libada,{
         N
@@ -57,7 +57,7 @@ makedepends_i686+=('gcc-ada')
 makedepends_pentium4+=('gcc-ada')
 
 if [ "${CARCH}" = "i486" ]; then
-  package_gcc-ada() {
+  package_gcc13-ada() {
     touch "$pkgdir/this-is-a-dummy-package"
   }
 
@@ -69,7 +69,7 @@ if [ "${CARCH}" = "i486" ]; then
   )"
 
   eval "$(
-    declare -f package_gcc | \
+    declare -f package_gcc13 | \
       sed '
         s/,gnat-style,gnat_rm,gnat_ugn//
       '
@@ -82,7 +82,7 @@ if [ "${CARCH}" = "i486" ]; then
   # make: Leaving directory '/build/gcc/src/gcc-build/i486-pc-linux-gnu/libgfortran'
   # => wrong link order: libgfortran requires libquadmath
   eval "$(
-    declare -f package_gcc-libs | \
+    declare -f package_gcc13-libs | \
       sed '
         /for lib in / s/libgfortran/libquadmath libgfortran/
       '
@@ -103,7 +103,7 @@ if [ "${CARCH}" = "i486" ]; then
         s/--enable-lto/--disable-lto/
         s/--with-build-config=bootstrap-lto//
       '
-    declare -f package_gcc | \
+    declare -f package_gcc13 | \
       sed '
         /make.*lto-plugin.*install/d
         /ln.*liblto_plugin.so/d
@@ -123,3 +123,8 @@ eval "$(
       s/--enable-cet=auto/--disable-cet/
     '
 )"
+
+# ???
+eval "$(
+  declare -f package_gcc13-libs | sed '/\/\.\.\/lib/d'
+)"