zsh: enable pcre (#2331)

[termux-packages] / packages / ndk-sysroot / build.sh

diff --git a/packages/ndk-sysroot/build.sh b/packages/ndk-sysroot/build.sh
index 84a230c..ee918da 100644 (file)
--- a/packages/ndk-sysroot/build.sh
+++ b/packages/ndk-sysroot/build.sh
@@ -6,23 +6,37 @@ 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, libgcc"
+TERMUX_PKG_REPLACES="libutil-dev, libgcc"
 
 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
+
        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
+       cp $LIBATOMIC_PATH $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/lib/
+
+       local LIBGCC_PATH=$TERMUX_STANDALONE_TOOLCHAIN/lib/gcc/$TERMUX_HOST_PLATFORM/4.9.x
+       if [ $TERMUX_ARCH = "arm" ]; then LIBGCC_PATH+="/armv7-a"; fi
+       LIBGCC_PATH+="/libgcc.a"
+       cp $LIBGCC_PATH $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/lib/
 
        # 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: