From 8164ef0b1e77cf98eecb47c36daa86059be2200e Mon Sep 17 00:00:00 2001
From: Ivan Max <mixython@gmail.com>
Date: Thu, 12 Oct 2023 05:22:41 +0000
Subject: [PATCH] gpkg-dev/cgt: setting up dynamic program search (#123)

---
 gpkg-dev/cgt/PKGBUILD     | 27 ++++++++++++++++-----------
 gpkg-dev/cgt/gcc.cc.patch | 19 ++++++++++++++-----
 2 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/gpkg-dev/cgt/PKGBUILD b/gpkg-dev/cgt/PKGBUILD
index 49ca5b42a..b14453819 100644
--- a/gpkg-dev/cgt/PKGBUILD
+++ b/gpkg-dev/cgt/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=cgt
 pkgver=13.2.0
-pkgrel=2
+pkgrel=3
 pkgdesc='Cross GCCs for Termux (only for Linux)'
 arch=(x86_64)
 url='https://gcc.gnu.org/'
@@ -13,7 +13,7 @@ source=(https://ftp.gnu.org/gnu/gcc/gcc-$pkgver/gcc-$pkgver.tar.xz
         set_glibc_dynamic_linker.patch)
 sha256sums=('e275e76442a6067341a27f04c5c6b83d8613144004c0413528863dc6b5c743da'
             '8d9f0c6cd1c57e623ba9b054f69185e4fb4717cc3af61c19d191948270042d6c'
-            'dee7ec7308e934edce9dc34bb481b4a53009e9aa96d9d926df368ad949650d56'
+            'e61dc2469a70392923aeac3f9e80c0b0c7ebd372488bc99e6dd0e18c1e3e3360'
             '1115c633d6fd0d4f6d6eeca50e4d52fd15f0bf52b4158ecb0ea6bedcb85ceb35'
             '346843fbce4bddca236ca4331ae43c5356ed177689c7760d841d2db2d2643d13'
             'cd383a4a1916f4b3102f21c640d6116f697e0ef7cde5f705d83035849c200ec6')
@@ -50,12 +50,12 @@ build() {
 		done
 
 		FLAGS_FOR_TARGET="-I$GLIBC_PREFIX/include -L$GLIBC_PREFIX/lib -Wl,-rpath=$GLIBC_PREFIX/lib"
-		CONFIGFLAG="--with-as=${CGCT_PREFIX}/bin/as --with-ld=${CGCT_PREFIX}/bin/ld AR_FOR_TARGET=${CGCT_PREFIX}/bin/ar RANLIB_FOR_TARGET=${CGCT_PREFIX}/bin/ranlib NM_FOR_TARGET=${CGCT_PREFIX}/bin/nm"
+		CONFIGFLAG=""
 		case "$arch_build" in
-			"aarch64") CONFIGFLAG+=" --with-arch=armv8-a --enable-fix-cortex-a53-835769 --enable-fix-cortex-a53-843419";;
-			"arm") CONFIGFLAG+=" --with-arch=armv7-a --with-float=hard --with-fpu=neon";;
-			"x86_64") CONFIGFLAG+=" --with-arch=x86-64";;
-			"i686") CONFIGFLAG+=" --with-arch=i686";;
+			"aarch64") CONFIGFLAG="--with-arch=armv8-a --enable-fix-cortex-a53-835769 --enable-fix-cortex-a53-843419";;
+			"arm") CONFIGFLAG="--with-arch=armv7-a --with-float=hard --with-fpu=neon";;
+			"x86_64") CONFIGFLAG="--with-arch=x86-64";;
+			"i686") CONFIGFLAG="--with-arch=i686";;
 		esac
 
 		"$srcdir"/gcc-${pkgver}/configure \
@@ -92,7 +92,12 @@ build() {
 			--disable-libstdcxx-pch \
 			--disable-libunwind-exceptions \
 			CFLAGS_FOR_TARGET="$FLAGS_FOR_TARGET $CFLAGS" \
-			CXXFLAGS_FOR_TARGET="$FLAGS_FOR_TARGET $CXXFLAGS"
+			CXXFLAGS_FOR_TARGET="$FLAGS_FOR_TARGET $CXXFLAGS" \
+			LD_FOR_TARGET=${CGCT_PREFIX}/bin/ld \
+			AS_FOR_TARGET=${CGCT_PREFIX}/bin/as \
+			AR_FOR_TARGET=${CGCT_PREFIX}/bin/ar \
+			RANLIB_FOR_TARGET=${CGCT_PREFIX}/bin/ranlib \
+			NM_FOR_TARGET=${CGCT_PREFIX}/bin/nm
 		make
 
 		cd ..
@@ -122,9 +127,9 @@ package() {
 			mkdir $pkgdir/${CGCT_PREFIX}/include/c++
 			mv $pkgdir/${CGCT_PREFIX}/include/$pkgver $pkgdir/${CGCT_PREFIX}/include/c++
 		fi
-  		for i in gcc g++; do
-    			ln -s ${target}-${i} $pkgdir/${CGCT_PREFIX}/bin/${i}
-    		done
+		for i in gcc g++; do
+			ln -s ${target}-${i} $pkgdir/${CGCT_PREFIX}/bin/${i}
+		done
 		rm -fr $pkgdir/${CGCT_PREFIX}/share
 		rm -fr $pkgdir/${CGCT_PREFIX}/$target
 		rm -fr $pkgdir/${DIR_TERMUX}/files
diff --git a/gpkg-dev/cgt/gcc.cc.patch b/gpkg-dev/cgt/gcc.cc.patch
index 8c6bdb3d9..9899cbc2a 100644
--- a/gpkg-dev/cgt/gcc.cc.patch
+++ b/gpkg-dev/cgt/gcc.cc.patch
@@ -1,5 +1,5 @@
---- src/gcc-13.2.0/gcc/gcc.cc	2023-04-26 10:09:40.000000000 +0300
-+++ src/gcc-13.2.0/gcc/gcc.cc.patch	2023-07-14 19:53:28.743169982 +0300
+--- src/gcc-13.2.0/gcc/gcc.cc	2023-07-27 11:13:04.000000000 +0300
++++ src/gcc-13.2.0/gcc/gcc.cc.patch	2023-10-11 09:20:43.668062309 +0300
 @@ -1585,10 +1585,7 @@
  /* Default prefixes to attach to command names.  */
  
@@ -24,7 +24,16 @@
  
  /* A relative path to be used in finding the location of tools
     relative to the driver.  */
-@@ -8409,7 +8403,7 @@
+@@ -4762,6 +4756,8 @@
+      that are lists of directory names with colons.  */
+ 
+   temp = env.get ("COMPILER_PATH");
++  if (!temp)
++    temp = STANDARD_BINDIR_PREFIX;
+   if (temp)
+     {
+       const char *startp, *endp;
+@@ -8409,7 +8405,7 @@
      }
    /* We should eventually get rid of all these and stick to
       startfile_prefix_spec exclusively.  */
@@ -33,7 +42,7 @@
      {
        if (*md_startfile_prefix)
  	add_sysrooted_prefix (&startfile_prefixes, md_startfile_prefix,
-@@ -8430,7 +8424,7 @@
+@@ -8430,7 +8426,7 @@
  	add_sysrooted_prefix (&startfile_prefixes,
  			      standard_startfile_prefix, "BINUTILS",
  			      PREFIX_PRIORITY_LAST, 0, 1);
@@ -42,7 +51,7 @@
  	{
  	  add_prefix (&startfile_prefixes,
  		      concat (gcc_exec_prefix
-@@ -8446,10 +8440,6 @@
+@@ -8446,10 +8442,6 @@
   	add_sysrooted_prefix (&startfile_prefixes,
  			      standard_startfile_prefix_1, "BINUTILS",
  			      PREFIX_PRIORITY_LAST, 0, 1);