From 5734d5963963a9bb65e14ea3d1b815fa2c11c749 Mon Sep 17 00:00:00 2001
From: Giacomo Tesio <giacomo@tesio.it>
Date: Fri, 17 Jan 2020 01:21:40 +0100
Subject: [PATCH] newlib: merge LibPOSIX into libc.a (and libg.a) so that you
 just need to specify -lc

---
 cross/pkgs/newlib/build.sh | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/cross/pkgs/newlib/build.sh b/cross/pkgs/newlib/build.sh
index 88d0c77..01c5bef 100755
--- a/cross/pkgs/newlib/build.sh
+++ b/cross/pkgs/newlib/build.sh
@@ -59,6 +59,17 @@ function failOnError {
 	fi
 }
 
+function mergeLibPOSIX {
+	TARGET_LIB=$1
+	echo "Merging $JEHANNE/arch/$ARCH/lib/libposix.a into $TARGET_LIB." &&
+	x86_64-jehanne-ar -M <<EOF
+open $TARGET_LIB
+addlib $JEHANNE/arch/$ARCH/lib/libposix.a
+save
+end
+EOF
+}
+
 if [ "$NEWLIB_OPTIMIZATION" = "" ]; then
 	NEWLIB_OPTIMIZATION=2
 fi
@@ -75,13 +86,16 @@ export CFLAGS_FOR_TARGET="-g -gdwarf-2 -ggdb -O$NEWLIB_OPTIMIZATION -std=gnu11 -
 	$NEWLIB_SRC/configure --enable-newlib-mb --disable-newlib-fvwrite-in-streamio --prefix=/pkgs/newlib --target=x86_64-jehanne &&
 	make all &&
 	make DESTDIR=$NEWLIB_PREFIX install &&
-	rm -fr $JEHANNE/sys/posix/newlib &&
-	rm -fr $JEHANNE/arch/amd64/lib/newlib &&
+	cd $NEWLIB_PREFIX/pkgs/newlib/x86_64-jehanne/lib &&
+	mergeLibPOSIX libc.a &&
+	( cmp --silent libc.a libg.a || mergeLibPOSIX libg.a ) &&
 	cp -fr $NEWLIB_PREFIX/pkgs/newlib/ $JEHANNE/pkgs/ &&
 	echo "Newlib headers installed at $JEHANNE/pkgs/newlib/"
 ) >> $NEWLIB/newlib.build.log 2>&1
 failOnError $? "building newlib"
 
+
+
 # emultate bind for the cross compiler
 mkdir -p $JEHANNE/posix
 cp -fr $JEHANNE/pkgs/newlib/x86_64-jehanne/* $JEHANNE/posix