DL-Mirrors/termux-packages
0
0
Fork 1
mirror of https://github.com/termux-pacman/termux-packages.git synced 2026-01-08 20:03:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update repo

Browse Source
This commit is contained in:
termux-pacman-bot
2024-05-24 14:08:50 +00:00
parent b9cf9664ee
commit c8bcc3fa6f
13 changed files with 2 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/build/configure/termux_step_configure_cmake.sh
View File

@@ -9,14 +9,6 @@ termux_step_configure_cmake() {
CMAKE_PROC=$TERMUX_ARCH
test $CMAKE_PROC == "arm" && CMAKE_PROC='armv7-a'
local CMAKE_TERMUX_TOOL_C_COMPILER=False
if [ "$TERMUX_PKG_ENABLE_CLANG16_PORTING" = "true" ]; then
local _cc
if _cc="$(command -v ${CC-})"; then
CMAKE_TERMUX_TOOL_C_COMPILER="$_cc"
fi
fi
local CMAKE_ADDITIONAL_ARGS=()
if [ "$TERMUX_ON_DEVICE_BUILD" = "false" ]; then
if [ "$TERMUX_PACKAGE_LIBRARY" = "bionic" ]; then
@@ -30,11 +22,9 @@ termux_step_configure_cmake() {
if [ "$TERMUX_PACKAGE_LIBRARY" = "bionic" ]; then
CMAKE_ADDITIONAL_ARGS+=("-DCMAKE_SYSTEM_NAME=Android")
CMAKE_ADDITIONAL_ARGS+=("-DCMAKE_SYSTEM_VERSION=$TERMUX_PKG_API_LEVEL")
CMAKE_ADDITIONAL_ARGS+=("-DCMAKE_TERMUX_TOOL_C_COMPILER=$CMAKE_TERMUX_TOOL_C_COMPILER")
CMAKE_ADDITIONAL_ARGS+=("-DCMAKE_ANDROID_STANDALONE_TOOLCHAIN=$TERMUX_STANDALONE_TOOLCHAIN")
elif [ "$TERMUX_PACKAGE_LIBRARY" = "glibc" ]; then
CMAKE_ADDITIONAL_ARGS+=("-DCMAKE_SYSTEM_NAME=Linux")
CMAKE_ADDITIONAL_ARGS+=("-DCMAKE_TERMUX_TOOL_C_COMPILER=$CC")
fi
CMAKE_ADDITIONAL_ARGS+=("-DCMAKE_SYSTEM_PROCESSOR=$CMAKE_PROC")
else

13
scripts/build/setup/cmake-c-compiler.patch
View File

@@ -1,13 +0,0 @@
--- a/share/cmake-3.29/Modules/Platform/Android/Determine-Compiler.cmake
+++ b/share/cmake-3.29/Modules/Platform/Android/Determine-Compiler.cmake
@@ -71,6 +71,10 @@
set(_ANDROID_TOOL_CXX_TOOLCHAIN_SUFFIX "")
endif()
+if(CMAKE_TERMUX_TOOL_C_COMPILER)
+ set(_ANDROID_TOOL_C_COMPILER ${CMAKE_TERMUX_TOOL_C_COMPILER})
+endif()
+
unset(_ANDROID_HOST_EXT)
macro(__android_determine_compiler lang)

7
scripts/build/setup/termux_setup_cmake.sh
View File

@@ -24,13 +24,6 @@ termux_setup_cmake() {
90b543a30220401db0e08347af067545be158ce89ffb09b7df1516cda8617329
rm -Rf "$TERMUX_PKG_TMPDIR/cmake-${TERMUX_CMAKE_VERSION}-linux-x86_64"
tar xf "$TERMUX_CMAKE_TARFILE" -C "$TERMUX_PKG_TMPDIR"
shopt -s nullglob
local f
for f in "$TERMUX_SCRIPTDIR"/scripts/build/setup/cmake-*.patch; do
echo "[${FUNCNAME[0]}]: Applying $(basename "$f")"
patch --silent -p1 -d "$TERMUX_PKG_TMPDIR/cmake-${TERMUX_CMAKE_VERSION}-linux-x86_64" < "$f"
done
shopt -u nullglob
mv "$TERMUX_PKG_TMPDIR/cmake-${TERMUX_CMAKE_VERSION}-linux-x86_64" \
"$TERMUX_CMAKE_FOLDER"
fi

4
scripts/build/termux_step_setup_toolchain.sh
View File

@@ -7,10 +7,10 @@ termux_step_setup_toolchain() {
# toolchain setup to ensure that everyone gets an updated
# toolchain
if [ "${TERMUX_NDK_VERSION}" = "26b" ]; then
TERMUX_STANDALONE_TOOLCHAIN+="-v3"
TERMUX_STANDALONE_TOOLCHAIN+="-v4"
termux_setup_toolchain_26b
elif [ "${TERMUX_NDK_VERSION}" = 23c ]; then
TERMUX_STANDALONE_TOOLCHAIN+="-v6"
TERMUX_STANDALONE_TOOLCHAIN+="-v7"
termux_setup_toolchain_23c
else
termux_error_exit "We do not have a setup_toolchain function for NDK version $TERMUX_NDK_VERSION"

1
scripts/build/termux_step_setup_variables.sh
View File

@@ -141,7 +141,6 @@ termux_step_setup_variables() {
TERMUX_PKG_DEPENDS=""
TERMUX_PKG_DESCRIPTION="FIXME:Add description"
TERMUX_PKG_DISABLE_GIR=false # termux_setup_gir
TERMUX_PKG_ENABLE_CLANG16_PORTING=true
TERMUX_PKG_ESSENTIAL=false
TERMUX_PKG_EXTRA_CONFIGURE_ARGS=""
TERMUX_PKG_EXTRA_HOSTBUILD_CONFIGURE_ARGS=""

25
scripts/build/toolchain/termux_setup_toolchain_26b.sh
View File

@@ -118,15 +118,6 @@ termux_setup_toolchain_26b() {
fi
if [ -d $TERMUX_STANDALONE_TOOLCHAIN ]; then
for HOST_PLAT in aarch64-linux-android armv7a-linux-androideabi i686-linux-android x86_64-linux-android arm-linux-androideabi; do
if [ "$TERMUX_PKG_ENABLE_CLANG16_PORTING" = "true" ]; then
cp $TERMUX_STANDALONE_TOOLCHAIN/bin/$HOST_PLAT-clang.16-porting \
$TERMUX_STANDALONE_TOOLCHAIN/bin/$HOST_PLAT-clang
else
cp $TERMUX_STANDALONE_TOOLCHAIN/bin/$HOST_PLAT-clang.no-16-porting \
$TERMUX_STANDALONE_TOOLCHAIN/bin/$HOST_PLAT-clang
fi
done
return
fi
@@ -170,22 +161,6 @@ termux_setup_toolchain_26b() {
cp $_TERMUX_TOOLCHAIN_TMPDIR/bin/armv7a-linux-androideabi-cpp \
$_TERMUX_TOOLCHAIN_TMPDIR/bin/arm-linux-androideabi-cpp
for HOST_PLAT in aarch64-linux-android armv7a-linux-androideabi i686-linux-android x86_64-linux-android arm-linux-androideabi; do
mv $_TERMUX_TOOLCHAIN_TMPDIR/bin/$HOST_PLAT-clang \
$_TERMUX_TOOLCHAIN_TMPDIR/bin/$HOST_PLAT-clang.no-16-porting
cp $_TERMUX_TOOLCHAIN_TMPDIR/bin/$HOST_PLAT-clang.no-16-porting \
$_TERMUX_TOOLCHAIN_TMPDIR/bin/$HOST_PLAT-clang.16-porting
sed -i 's/"\$@"/--start-no-unused-arguments -Wno-error=implicit-function-declaration -Wno-error=implicit-int -Wno-error=int-conversion -Wno-error=incompatible-function-pointer-types --end-no-unused-arguments \0/g' \
$_TERMUX_TOOLCHAIN_TMPDIR/bin/$HOST_PLAT-clang.no-16-porting
if [ "$TERMUX_PKG_ENABLE_CLANG16_PORTING" = "true" ]; then
cp $_TERMUX_TOOLCHAIN_TMPDIR/bin/$HOST_PLAT-clang.16-porting \
$_TERMUX_TOOLCHAIN_TMPDIR/bin/$HOST_PLAT-clang
else
cp $_TERMUX_TOOLCHAIN_TMPDIR/bin/$HOST_PLAT-clang.no-16-porting \
$_TERMUX_TOOLCHAIN_TMPDIR/bin/$HOST_PLAT-clang
fi
done
# rust 1.75.0+ expects this directory to be present
rm -fr "${_TERMUX_TOOLCHAIN_TMPDIR}"/toolchains
mkdir -p "${_TERMUX_TOOLCHAIN_TMPDIR}"/toolchains/llvm/prebuilt