Revert update of ndk-packages
This WIP was not suppose to be pushed to master.
This commit is contained in:
Henrik Grimler
parent
a39d494413
commit
fc6900d9fa
|
|
@ -2,15 +2,11 @@ TERMUX_PKG_HOMEPAGE=https://libcxx.llvm.org/
|
|||
TERMUX_PKG_DESCRIPTION="C++ Standard Library"
|
||||
TERMUX_PKG_LICENSE="NCSA"
|
||||
TERMUX_PKG_MAINTAINER="@termux"
|
||||
# Version should be equal to TERMUX_NDK_{VERSION_NUM,REVISION} in
|
||||
# scripts/properties.sh
|
||||
TERMUX_PKG_VERSION=25b
|
||||
TERMUX_PKG_SRCURL=https://dl.google.com/android/repository/android-ndk-r${TERMUX_PKG_VERSION}-linux.zip
|
||||
TERMUX_PKG_SHA256=403ac3e3020dd0db63a848dcaba6ceb2603bf64de90949d5c4361f848e44b005
|
||||
TERMUX_PKG_VERSION=$TERMUX_NDK_VERSION
|
||||
TERMUX_PKG_SKIP_SRC_EXTRACT=true
|
||||
TERMUX_PKG_ESSENTIAL=true
|
||||
TERMUX_PKG_BUILD_IN_SRC=true
|
||||
TERMUX_PKG_ON_DEVICE_BUILD_NOT_SUPPORTED=true
|
||||
|
||||
termux_step_post_make_install() {
|
||||
install -m700 -t $TERMUX_PREFIX/lib \
|
||||
"sysroot/usr/lib/${TERMUX_HOST_PLATFORM}/libc++_shared.so"
|
||||
cp "$TERMUX_STANDALONE_TOOLCHAIN/sysroot/usr/lib/${TERMUX_HOST_PLATFORM}/libc++_shared.so" $TERMUX_PREFIX/lib
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,14 +2,11 @@ TERMUX_PKG_HOMEPAGE=https://developer.android.com/tools/sdk/ndk/index.html
|
|||
TERMUX_PKG_DESCRIPTION="Multilib binaries for cross-compilation"
|
||||
TERMUX_PKG_LICENSE="NCSA"
|
||||
TERMUX_PKG_MAINTAINER="@termux"
|
||||
# Version should be equal to TERMUX_NDK_{VERSION_NUM,REVISION} in
|
||||
# scripts/properties.sh
|
||||
TERMUX_PKG_VERSION=25b
|
||||
TERMUX_PKG_SRCURL=https://dl.google.com/android/repository/android-ndk-r${TERMUX_PKG_VERSION}-linux.zip
|
||||
TERMUX_PKG_SHA256=403ac3e3020dd0db63a848dcaba6ceb2603bf64de90949d5c4361f848e44b005
|
||||
TERMUX_PKG_VERSION=$TERMUX_NDK_VERSION
|
||||
TERMUX_PKG_SKIP_SRC_EXTRACT=true
|
||||
TERMUX_PKG_PLATFORM_INDEPENDENT=true
|
||||
TERMUX_PKG_NO_STATICSPLIT=true
|
||||
TERMUX_PKG_BUILD_IN_SRC=true
|
||||
TERMUX_PKG_ON_DEVICE_BUILD_NOT_SUPPORTED=true
|
||||
|
||||
prepare_libs() {
|
||||
local ARCH="$1"
|
||||
|
|
@ -21,7 +18,7 @@ prepare_libs() {
|
|||
fi
|
||||
|
||||
mkdir -p $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/$SUFFIX/lib
|
||||
local BASEDIR=toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/$SUFFIX/${TERMUX_PKG_API_LEVEL}
|
||||
local BASEDIR=$NDK/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/$SUFFIX/${TERMUX_PKG_API_LEVEL}
|
||||
cp $BASEDIR/*.o $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/$SUFFIX/lib
|
||||
cp $BASEDIR/lib{c,dl,log,m}.so $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/$SUFFIX/lib
|
||||
cp $TERMUX_STANDALONE_TOOLCHAIN/sysroot/usr/lib/${SUFFIX}/libc++_shared.so \
|
||||
|
|
@ -31,11 +28,11 @@ prepare_libs() {
|
|||
echo 'INPUT(-lc++_static -lc++abi)' > $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/$SUFFIX/lib/libc++_shared.a
|
||||
|
||||
if [ $ARCH == "x86" ]; then
|
||||
LIBATOMIC=toolchains/llvm/prebuilt/linux-x86_64/lib64/clang/*/lib/linux/i386
|
||||
LIBATOMIC=$NDK/toolchains/llvm/prebuilt/linux-x86_64/lib64/clang/*/lib/linux/i386
|
||||
elif [ $ARCH == "arm64" ]; then
|
||||
LIBATOMIC=toolchains/llvm/prebuilt/linux-x86_64/lib64/clang/*/lib/linux/aarch64
|
||||
LIBATOMIC=$NDK/toolchains/llvm/prebuilt/linux-x86_64/lib64/clang/*/lib/linux/aarch64
|
||||
else
|
||||
LIBATOMIC=toolchains/llvm/prebuilt/linux-x86_64/lib64/clang/*/lib/linux/$ARCH
|
||||
LIBATOMIC=$NDK/toolchains/llvm/prebuilt/linux-x86_64/lib64/clang/*/lib/linux/$ARCH
|
||||
fi
|
||||
|
||||
cp $LIBATOMIC/libatomic.a $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/$SUFFIX/lib/
|
||||
|
|
@ -44,7 +41,7 @@ prepare_libs() {
|
|||
}
|
||||
|
||||
add_cross_compiler_rt() {
|
||||
RT_PREFIX=toolchains/llvm/prebuilt/linux-x86_64/lib64/clang/*/lib/linux
|
||||
RT_PREFIX=$NDK/toolchains/llvm/prebuilt/linux-x86_64/lib64/clang/*/lib/linux
|
||||
RT_OPT_DIR=$TERMUX_PREFIX/opt/ndk-multilib/cross-compiler-rt
|
||||
mkdir -p $TERMUX_PKG_MASSAGEDIR/$RT_OPT_DIR
|
||||
cp $RT_PREFIX/* $TERMUX_PKG_MASSAGEDIR/$RT_OPT_DIR || true
|
||||
|
|
|
|||
|
|
@ -2,37 +2,21 @@ 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_MAINTAINER="@termux"
|
||||
# Version should be equal to TERMUX_NDK_{VERSION_NUM,REVISION} in
|
||||
# scripts/properties.sh
|
||||
TERMUX_PKG_VERSION=25b
|
||||
TERMUX_PKG_VERSION=$TERMUX_NDK_VERSION
|
||||
TERMUX_PKG_REVISION=3
|
||||
TERMUX_PKG_SRCURL=https://dl.google.com/android/repository/android-ndk-r${TERMUX_PKG_VERSION}-linux.zip
|
||||
TERMUX_PKG_SHA256=403ac3e3020dd0db63a848dcaba6ceb2603bf64de90949d5c4361f848e44b005
|
||||
TERMUX_PKG_SKIP_SRC_EXTRACT=true
|
||||
# This package has taken over <pty.h> 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, ndk-stl"
|
||||
TERMUX_PKG_NO_STATICSPLIT=true
|
||||
TERMUX_PKG_BUILD_IN_SRC=true
|
||||
|
||||
termux_step_pre_configure() {
|
||||
for patch in $TERMUX_SCRIPTDIR/ndk-patches/$TERMUX_PKG_VERSION/*.patch; do
|
||||
echo "Applying ndk patch: $(basename $patch)"
|
||||
test -f "$patch" && sed \
|
||||
-e "s%\@TERMUX_APP_PACKAGE\@%${TERMUX_APP_PACKAGE}%g" \
|
||||
-e "s%\@TERMUX_BASE_DIR\@%${TERMUX_BASE_DIR}%g" \
|
||||
-e "s%\@TERMUX_CACHE_DIR\@%${TERMUX_CACHE_DIR}%g" \
|
||||
-e "s%\@TERMUX_HOME\@%${TERMUX_ANDROID_HOME}%g" \
|
||||
-e "s%\@TERMUX_PREFIX\@%${TERMUX_PREFIX}%g" \
|
||||
"$patch" | patch --silent -p1
|
||||
done
|
||||
}
|
||||
TERMUX_PKG_ON_DEVICE_BUILD_NOT_SUPPORTED=true
|
||||
|
||||
termux_step_extract_into_massagedir() {
|
||||
mkdir -p $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/lib \
|
||||
$TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/include
|
||||
|
||||
cp -Rf sysroot/usr/include/* \
|
||||
cp -Rf $TERMUX_STANDALONE_TOOLCHAIN/sysroot/usr/include/* \
|
||||
$TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/include
|
||||
|
||||
# replace vulkan headers with upstream version
|
||||
|
|
@ -41,11 +25,11 @@ termux_step_extract_into_massagedir() {
|
|||
# replace ICU headers with upstream version
|
||||
rm -rf $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/include/unicode
|
||||
|
||||
patch -d $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/include/c++/v1 -p1 < $TERMUX_PKG_BUILDER_DIR/math-header.diff
|
||||
patch -d $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/include/c++/v1 -p1 < $TERMUX_PKG_BUILDER_DIR/math-header.diff
|
||||
# disable for now
|
||||
# patch -d $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/ -p1 < $TERMUX_PKG_BUILDER_DIR/gcc_fixes.diff
|
||||
|
||||
cp sysroot/usr/lib/$TERMUX_HOST_PLATFORM/$TERMUX_PKG_API_LEVEL/*.o \
|
||||
cp $TERMUX_STANDALONE_TOOLCHAIN/sysroot/usr/lib/$TERMUX_HOST_PLATFORM/$TERMUX_PKG_API_LEVEL/*.o \
|
||||
$TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/lib
|
||||
|
||||
if [ $TERMUX_ARCH == "i686" ]; then
|
||||
|
|
@ -58,7 +42,7 @@ termux_step_extract_into_massagedir() {
|
|||
|
||||
cp $LIBATOMIC/libatomic.a $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/lib/
|
||||
|
||||
cp sysroot/usr/lib/$TERMUX_HOST_PLATFORM/libcompiler_rt-extras.a $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/lib/
|
||||
cp $TERMUX_STANDALONE_TOOLCHAIN/sysroot/usr/lib/$TERMUX_HOST_PLATFORM/libcompiler_rt-extras.a $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:
|
||||
local _SYSTEM_LIBDIR=/system/lib64
|
||||
|
|
@ -68,7 +52,7 @@ termux_step_extract_into_massagedir() {
|
|||
NDK_ARCH=$TERMUX_ARCH
|
||||
test $NDK_ARCH == 'i686' && NDK_ARCH='i386'
|
||||
# clang 13 requires libunwind on Android.
|
||||
cp lib64/clang/14.0.6/lib/linux/$NDK_ARCH/libunwind.a .
|
||||
cp $TERMUX_STANDALONE_TOOLCHAIN/lib64/clang/14.0.6/lib/linux/$NDK_ARCH/libunwind.a .
|
||||
|
||||
for lib in librt.so libpthread.so libutil.so; do
|
||||
echo 'INPUT(-lc)' > $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/lib/$lib
|
||||
|
|
|
|||
|
|
@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://source.android.com/devices/graphics/arch-vulkan
|
|||
TERMUX_PKG_DESCRIPTION="Vulkan Loader for Android"
|
||||
TERMUX_PKG_LICENSE="NCSA"
|
||||
TERMUX_PKG_MAINTAINER="@termux"
|
||||
TERMUX_PKG_VERSION=25b
|
||||
TERMUX_PKG_SRCURL=https://dl.google.com/android/repository/android-ndk-r${TERMUX_PKG_VERSION}-linux.zip
|
||||
TERMUX_PKG_SHA256=403ac3e3020dd0db63a848dcaba6ceb2603bf64de90949d5c4361f848e44b005
|
||||
TERMUX_PKG_VERSION=$TERMUX_NDK_VERSION
|
||||
TERMUX_PKG_HOSTBUILD=true
|
||||
TERMUX_PKG_SKIP_SRC_EXTRACT=true
|
||||
|
||||
# Desktop Vulkan Loader
|
||||
# https://github.com/KhronosGroup/Vulkan-Loader
|
||||
|
|
@ -45,7 +44,7 @@ termux_step_host_build() {
|
|||
|
||||
termux_step_post_make_install() {
|
||||
install -v -Dm644 \
|
||||
"$TERMUX_PKG_SRCDIR/sysroot/usr/lib/$TERMUX_HOST_PLATFORM/$TERMUX_PKG_API_LEVEL/libvulkan.so" \
|
||||
"$TERMUX_STANDALONE_TOOLCHAIN/sysroot/usr/lib/$TERMUX_HOST_PLATFORM/$TERMUX_PKG_API_LEVEL/libvulkan.so" \
|
||||
"$TERMUX_PREFIX/lib/libvulkan.so"
|
||||
|
||||
local vulkan_loader_version
|
||||
|
|
|
|||
|
|
@ -13,9 +13,9 @@ TERMUX_ANDROID_BUILD_TOOLS_VERSION=33.0.1
|
|||
: "${TERMUX_NDK_REVISION:="b"}"
|
||||
TERMUX_NDK_VERSION=$TERMUX_NDK_VERSION_NUM$TERMUX_NDK_REVISION
|
||||
# when changing the above:
|
||||
# update version and hashsum in packages
|
||||
# remove TERMUX_PKG_REVISION in:
|
||||
# libc++, ndk-multilib, ndk-sysroot, vulkan-loader-android
|
||||
# and update SHA256 sums in scripts/setup-android-sdk.sh
|
||||
# update SHA256 sums in scripts/setup-android-sdk.sh
|
||||
# check all packages build and run correctly and bump if needed
|
||||
|
||||
: "${TERMUX_JAVA_HOME:=/usr/lib/jvm/java-8-openjdk-amd64}"
|
||||
|
|
|
|||
Loading…
Reference in New Issue