From b6c76c7a7e7ba3c6ba30e079f06689cd46863dac Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Sun, 27 Jan 2019 12:08:07 +0100 Subject: [PATCH] ndk-sysroot: conflict with libandroid-support-dev --- packages/ndk-sysroot/build.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/ndk-sysroot/build.sh b/packages/ndk-sysroot/build.sh index e8d24be8b..a916584ef 100644 --- a/packages/ndk-sysroot/build.sh +++ b/packages/ndk-sysroot/build.sh @@ -2,12 +2,13 @@ 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_LICENSE="NCSA" TERMUX_PKG_VERSION=$TERMUX_NDK_VERSION -TERMUX_PKG_REVISION=9 +TERMUX_PKG_REVISION=10 TERMUX_PKG_NO_DEVELSPLIT=yes TERMUX_PKG_KEEP_STATIC_LIBRARIES="true" -# This package has taken over from the previous libutil-dev: -TERMUX_PKG_CONFLICTS="libutil-dev, libgcc" -TERMUX_PKG_REPLACES="libutil-dev, libgcc" +# This package has taken over from the previous libutil-dev +# and iconv.h from libandroid-support-dev: +TERMUX_PKG_CONFLICTS="libutil-dev, libgcc, libandroid-support-dev" +TERMUX_PKG_REPLACES="libutil-dev, libgcc, libandroid-support-dev" termux_step_extract_into_massagedir () { mkdir -p $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/lib/pkgconfig \