X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/42562d13b815e025ffe11ec371e992ef8c3fd778..b611418d62386fd027c547bd4e08a64e79605e74:/packages/ndk-sysroot/build.sh?ds=sidebyside

diff --git a/packages/ndk-sysroot/build.sh b/packages/ndk-sysroot/build.sh
index fb82a18f..f2649650 100644
--- a/packages/ndk-sysroot/build.sh
+++ b/packages/ndk-sysroot/build.sh
@@ -1,26 +1,37 @@
 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_REVISION=9
+TERMUX_PKG_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"
+# This package has taken over <pty.h> from the previous libutil-dev:
+TERMUX_PKG_CONFLICTS="libutil-dev"
+TERMUX_PKG_REPLACES="libutil-dev"
 
 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
+	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/lib64/clang/5.0/include/omp.h \
+		$TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/include
+
 	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
+	cp $TERMUX_STANDALONE_TOOLCHAIN/sysroot/usr/${_LIBDIR}/*.o \
+		$TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/lib
 
-	cp "$PKG_CONFIG_LIBDIR/zlib.pc" $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/lib/pkgconfig/zlib.pc
+	cp "$PKG_CONFIG_LIBDIR/zlib.pc" \
+		$TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/lib/pkgconfig/zlib.pc
 
 	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
+	if [ $TERMUX_ARCH = "arm" ]; then LIBATOMIC_PATH+="/armv7-a"; fi
 	LIBATOMIC_PATH+="/libatomic.a"
 	cp $LIBATOMIC_PATH $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/lib/libatomic.a