X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/c5730e4dfba0617ae7a9236440b75bb6bb97b38f..58e38b4778ac5a11953f863e01dc9cf90e94b702:/packages/libandroid-support/build.sh

diff --git a/packages/libandroid-support/build.sh b/packages/libandroid-support/build.sh
index ada9d5fb..3668b2a3 100755
--- a/packages/libandroid-support/build.sh
+++ b/packages/libandroid-support/build.sh
@@ -1,38 +1,27 @@
-TERMUX_PKG_HOMEPAGE=https://developer.android.com/tools/sdk/ndk/index.html
+TERMUX_PKG_HOMEPAGE=https://github.com/termux/libandroid-support
 TERMUX_PKG_DESCRIPTION="Library extending the Android C library (Bionic) for additional multibyte, locale and math support"
-# Increase last digit each time a patch changes.
-TERMUX_PKG_VERSION=${TERMUX_NDK_VERSION}.8
+TERMUX_PKG_VERSION=15
+TERMUX_PKG_SRCURL=https://github.com/termux/libandroid-support/archive/v${TERMUX_PKG_VERSION}.tar.gz
+TERMUX_PKG_SHA256=73f7543c6005d376edcaf915ac22f53a9f0a2d6c87fe7dde5f890d26c8d49ebc
+TERMUX_PKG_FOLDERNAME=libandroid-support-$TERMUX_PKG_VERSION
 TERMUX_PKG_BUILD_IN_SRC=yes
 TERMUX_PKG_ESSENTIAL=yes
 
-termux_step_post_extract_package () {
-        cd $TERMUX_PKG_SRCDIR
-	mkdir -p src/musl-locale/ src/musl-multibyte/ include/ src/musl-ctype/
-	cp $NDK/sources/android/support/src/musl-multibyte/{mblen.c,mbsrtowcs.c,mbsnrtowcs.c,libc.h,internal.h,internal.c} src/musl-multibyte/
-	cp $NDK/sources/android/support/src/musl-locale/{catclose.c,catgets.c,catopen.c} src/musl-locale/
-	cp $NDK/sources/android/support/src/musl-locale/{langinfo.c,intl.c,iconv.c,strfmon.c} src/musl-locale/
-	cp $NDK/sources/android/support/src/musl-ctype/* src/musl-ctype/
-
-	cp $NDK/sources/android/support/include/* include/
-	cp $NDK/sources/android/support/src/musl-locale/{libc.h,codepages.h,legacychars.h,jis0208.h,gb18030.h,big5.h,hkscs.h,ksc.h} include/
-}
-
 termux_step_make_install () {
 	_C_FILES="src/musl-*/*.c"
-	# Link against libm to avoid linkers having to do it
-        $CC $CFLAGS -std=c99 -DNULL=0 $CPPFLAGS $LDFLAGS -lm \
-                -Iinclude -Isrc/locale \
+	$CC $CFLAGS -std=c99 -DNULL=0 $CPPFLAGS $LDFLAGS \
+		-Iinclude -Isrc/locale \
 		$_C_FILES \
-                -shared -fpic \
-                -o libandroid-support.so
+		-shared -fpic \
+		-o libandroid-support.so
 
-        cp libandroid-support.so $TERMUX_PREFIX/lib/
+	cp libandroid-support.so $TERMUX_PREFIX/lib/
 
-        (cd $TERMUX_PREFIX/lib; rm -f libiconv.so libintl.so; ln -s libandroid-support.so libiconv.so; ln -s libandroid-support.so libintl.so)
+	(cd $TERMUX_PREFIX/lib; ln -f -s libandroid-support.so libiconv.so; ln -f -s libandroid-support.so libintl.so)
 
 	rm -Rf $TERMUX_PREFIX/include/libandroid-support
 	mkdir -p $TERMUX_PREFIX/include/libandroid-support
 	cp -Rf include/* $TERMUX_PREFIX/include/libandroid-support/
 
-        (cd $TERMUX_PREFIX/include; rm -f libintl.h iconv.h; ln -s libandroid-support/libintl.h libintl.h; ln -s libandroid-support/iconv.h iconv.h)
+	(cd $TERMUX_PREFIX/include; ln -f -s libandroid-support/libintl.h libintl.h; ln -f -s libandroid-support/iconv.h iconv.h)
 }