From 3040940e35e45fb26542ada0fda0f64acca88904 Mon Sep 17 00:00:00 2001
From: Bananymous <oskari.alaranta@bananymous.com>
Date: Wed, 7 May 2025 18:31:54 +0300
Subject: [PATCH] ports/tcc: Fix 32 bit build and add version name

tcc was using "Linux" for machine name in version string if it was not
explicitly specified.
---
 ports/tcc/build.sh                               | 11 ++++++++---
 ports/tcc/patches/0001-add-banan_os-target.patch | 16 ++++++++++++++--
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/ports/tcc/build.sh b/ports/tcc/build.sh
index a3c55f53..cfc604ca 100755
--- a/ports/tcc/build.sh
+++ b/ports/tcc/build.sh
@@ -4,11 +4,16 @@ NAME='tcc'
 VERSION='0.9.27'
 DOWNLOAD_URL="https://download.savannah.gnu.org/releases/tinycc/tcc-$VERSION.tar.bz2#de23af78fca90ce32dff2dd45b3432b2334740bb9bb7b05bf60fdbfc396ceb9c"
 
+tcc_arch=$BANAN_ARCH
+if [ $tcc_arch = 'i686' ]; then
+	tcc_arch='i386'
+fi
+
 configure() {
 	./configure \
 		--prefix=/usr \
 		--sysroot=$BANAN_SYSROOT \
-		--cpu=$BANAN_ARCH \
+		--cpu=$tcc_arch \
 		--enable-cross \
 		--cross-prefix=$BANAN_TOOLCHAIN_TRIPLE- \
 		--sysincludepaths=/usr/include:/usr/lib/tcc/include \
@@ -19,10 +24,10 @@ configure() {
 
 build() {
 	touch $BANAN_SYSROOT/usr/include/sys/ucontext.h
-	make -j$(nproc) cross-$BANAN_ARCH $BANAN_ARCH-libtcc1-usegcc=yes || exit 1
+	make -j$(nproc) cross-$tcc_arch $tcc_arch-libtcc1-usegcc=yes || exit 1
 }
 
 install() {
 	make install-unx DESTDIR=$BANAN_SYSROOT || exit 1
-	ln -sf $BANAN_ARCH-tcc $BANAN_SYSROOT/usr/bin/tcc
+	ln -sf $tcc_arch-tcc $BANAN_SYSROOT/usr/bin/tcc
 }
diff --git a/ports/tcc/patches/0001-add-banan_os-target.patch b/ports/tcc/patches/0001-add-banan_os-target.patch
index 33438945..d56b4c58 100644
--- a/ports/tcc/patches/0001-add-banan_os-target.patch
+++ b/ports/tcc/patches/0001-add-banan_os-target.patch
@@ -1,6 +1,6 @@
 diff -ruN tcc-0.9.27/configure tcc-0.9.27-banan_os/configure
 --- tcc-0.9.27/configure	2017-12-17 10:27:05.000000000 +0200
-+++ tcc-0.9.27-banan_os/configure	2024-08-25 18:43:00.329466309 +0300
++++ tcc-0.9.27-banan_os/configure	2025-05-07 18:10:09.779137536 +0300
 @@ -49,8 +49,11 @@
  gcc_minor=0
  
@@ -16,7 +16,7 @@ diff -ruN tcc-0.9.27/configure tcc-0.9.27-banan_os/configure
      DLLSUF=".dylib"
 diff -ruN tcc-0.9.27/Makefile tcc-0.9.27-banan_os/Makefile
 --- tcc-0.9.27/Makefile	2017-12-17 10:27:05.000000000 +0200
-+++ tcc-0.9.27-banan_os/Makefile	2024-08-25 18:43:44.996196450 +0300
++++ tcc-0.9.27-banan_os/Makefile	2025-05-07 18:10:09.779389036 +0300
 @@ -30,7 +30,9 @@
   CFGWIN = -win
   NATIVE_TARGET = $(ARCH)-win$(if $(findstring arm,$(ARCH)),ce,32)
@@ -28,3 +28,15 @@ diff -ruN tcc-0.9.27/Makefile tcc-0.9.27-banan_os/Makefile
   ifneq ($(CONFIG_ldl),no)
    LIBS+=-ldl
   endif
+diff -ruN tcc-0.9.27/tcc.c tcc-0.9.27-banan_os/tcc.c
+--- tcc-0.9.27/tcc.c	2017-12-17 10:27:05.000000000 +0200
++++ tcc-0.9.27-banan_os/tcc.c	2025-05-07 18:09:16.870611889 +0300
+@@ -162,6 +162,8 @@
+         " Darwin"
+ #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+         " FreeBSD"
++#elif defined(__banan_os__)
++        " banan-os"
+ #else
+         " Linux"
+ #endif