Bananymous
/
banan-os
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Bananymous 2025-05-07 18:31:54 +03:00
parent df3d2d57c3
commit 3040940e35
2 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ports/tcc/build.sh
View File

@ -4,11 +4,16 @@ NAME='tcc'
VERSION='0.9.27' VERSION='0.9.27'
DOWNLOAD_URL="https://download.savannah.gnu.org/releases/tinycc/tcc-$VERSION.tar.bz2#de23af78fca90ce32dff2dd45b3432b2334740bb9bb7b05bf60fdbfc396ceb9c" 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() {
./configure \ ./configure \
--prefix=/usr \ --prefix=/usr \
--sysroot=$BANAN_SYSROOT \ --sysroot=$BANAN_SYSROOT \
--cpu=$BANAN_ARCH \ --cpu=$tcc_arch \
--enable-cross \ --enable-cross \
--cross-prefix=$BANAN_TOOLCHAIN_TRIPLE- \ --cross-prefix=$BANAN_TOOLCHAIN_TRIPLE- \
--sysincludepaths=/usr/include:/usr/lib/tcc/include \ --sysincludepaths=/usr/include:/usr/lib/tcc/include \
@ -19,10 +24,10 @@ configure() {
build() { build() {
touch $BANAN_SYSROOT/usr/include/sys/ucontext.h 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() { install() {
make install-unx DESTDIR=$BANAN_SYSROOT || exit 1 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
} }

16
ports/tcc/patches/0001-add-banan_os-target.patch
View File

@ -1,6 +1,6 @@
diff -ruN tcc-0.9.27/configure tcc-0.9.27-banan_os/configure 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/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 @@ @@ -49,8 +49,11 @@
gcc_minor=0 gcc_minor=0
@ -16,7 +16,7 @@ diff -ruN tcc-0.9.27/configure tcc-0.9.27-banan_os/configure
DLLSUF=".dylib" DLLSUF=".dylib"
diff -ruN tcc-0.9.27/Makefile tcc-0.9.27-banan_os/Makefile 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/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 @@ @@ -30,7 +30,9 @@
CFGWIN = -win CFGWIN = -win
NATIVE_TARGET = $(ARCH)-win$(if $(findstring arm,$(ARCH)),ce,32) 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) ifneq ($(CONFIG_ldl),no)
LIBS+=-ldl LIBS+=-ldl
endif 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