sergiotarxz
/
termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

libandroid-support: place headers directly under include

This commit is contained in:
Tom Yan 2018-11-18 09:06:38 +08:00 committed by Fredrik Fornwall
parent 9eab4103b6
commit 0db05befbc
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build-package.sh
View File

@ -663,9 +663,8 @@ termux_step_setup_toolchain() {
export CXXFLAGS="$CFLAGS"
export CPPFLAGS="-I${TERMUX_PREFIX}/include"
# If libandroid-support is declared as a dependency, link to it explicitly:
if [ "$TERMUX_PKG_DEPENDS" != "${TERMUX_PKG_DEPENDS/libandroid-support/}" ]; then
# If using the android support library, link to it and include its headers as system headers:
CPPFLAGS+=" -isystem $TERMUX_PREFIX/include/libandroid-support"
LDFLAGS+=" -landroid-support"
fi

12
packages/libandroid-support/build.sh
View File

@ -13,15 +13,9 @@ termux_step_make_install () {
-Iinclude \
$_C_FILES \
-shared -fpic \
-o libandroid-support.so
-o $TERMUX_PREFIX/lib/libandroid-support.so
cp libandroid-support.so $TERMUX_PREFIX/lib/
ln -sf libandroid-support.so $TERMUX_PREFIX/lib/libiconv.so
(cd $TERMUX_PREFIX/lib; ln -f -s libandroid-support.so libiconv.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; ln -f -s libandroid-support/iconv.h iconv.h)
cp include/*.h $TERMUX_PREFIX/include/
}