X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/59f0d218a6ff34c80cf898f6d7ac62555ba8eb11..d1f129da2c6e23d10d3a93667ab421b21fe5212e:/packages/ndk-sysroot/build.sh

diff --git a/packages/ndk-sysroot/build.sh b/packages/ndk-sysroot/build.sh
index 9b164c70..8a23ad3a 100644
--- a/packages/ndk-sysroot/build.sh
+++ b/packages/ndk-sysroot/build.sh
@@ -1,20 +1,35 @@
 TERMUX_PKG_HOMEPAGE=https://developer.android.com/tools/sdk/ndk/index.html
 TERMUX_PKG_DESCRIPTION="System header and library files from the Android NDK needed for compiling C programs"
 TERMUX_PKG_VERSION=$TERMUX_NDK_VERSION
+TERMUX_PKG_BUILD_REVISION=6
 TERMUX_PKG_NO_DEVELSPLIT=yes
+# Depend on libandroid-support-dev so that iconv.h and libintl.h are available:
+TERMUX_PKG_DEPENDS="libandroid-support-dev"
+TERMUX_PKG_KEEP_STATIC_LIBRARIES="true"
 
 termux_step_extract_into_massagedir () {
 	mkdir -p $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/lib/pkgconfig $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/include
 	cp -Rf $TERMUX_STANDALONE_TOOLCHAIN/sysroot/usr/include/* $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/include
-	cp $TERMUX_STANDALONE_TOOLCHAIN/sysroot/usr/lib/*.o $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/lib
+	local _LIBDIR=lib
+	if [ "$TERMUX_ARCH" = "x86_64" ]; then
+		_LIBDIR=lib64
+	fi
+	cp $TERMUX_STANDALONE_TOOLCHAIN/sysroot/usr/${_LIBDIR}/*.o $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/lib
 
-	cat > $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/lib/pkgconfig/zlib.pc <<HERE
-Name: zlib
-Description: zlib compression library
-Version: 1.2.3
+	cp "$PKG_CONFIG_LIBDIR/zlib.pc" $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/lib/pkgconfig/zlib.pc
 
-Requires:
-Libs: -L$TERMUX_PREFIX/lib -lz
-Cflags: -I$TERMUX_PREFIX/include
-HERE
+	local LIBATOMIC_PATH=$TERMUX_STANDALONE_TOOLCHAIN/$TERMUX_HOST_PLATFORM/lib
+	if [ $TERMUX_ARCH_BITS = 64 ]; then LIBATOMIC_PATH+="64"; fi
+	if [ $TERMUX_ARCH = "arm" ]; then LIBGCC_PATH+="/armv7-a"; fi
+	LIBATOMIC_PATH+="/libatomic.a"
+	cp $LIBATOMIC_PATH $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/lib/libatomic.a
+
+	# librt and libpthread are built into libc on android, so setup them as symlinks
+	# to libc for compatibility with programs that users try to build:
+	local _SYSTEM_LIBDIR=/system/lib64
+	if [ $TERMUX_ARCH_BITS = 32 ]; then _SYSTEM_LIBDIR=/system/lib; fi
+	mkdir -p $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/lib
+	cd $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/lib
+	ln -f -s $_SYSTEM_LIBDIR/libc.so librt.so
+	ln -f -s $_SYSTEM_LIBDIR/libc.so libpthread.so
 }