X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/2173f7301d6332bbdb7c9c4d1aa25ddce6ff5964..50ed335795319190a88a0ddefd0ce24d333f2db7:/build-package.sh diff --git a/build-package.sh b/build-package.sh index b3871818..f4fa40d4 100755 --- a/build-package.sh +++ b/build-package.sh @@ -88,10 +88,79 @@ termux_setup_golang() { ( cd "$TERMUX_COMMON_CACHEDIR"; tar xf "$TERMUX_BUILDGO_TAR"; mv go "$TERMUX_BUILDGO_FOLDER"; rm "$TERMUX_BUILDGO_TAR" ) } +# Utility function for cmake-built packages to setup a current ninja. +termux_setup_ninja() { + local NINJA_VERSION=1.7.2 + local NINJA_FOLDER=$TERMUX_COMMON_CACHEDIR/ninja-$NINJA_VERSION + if [ ! -x $NINJA_FOLDER/ninja ]; then + mkdir -p $NINJA_FOLDER + local NINJA_ZIP_FILE=$TERMUX_PKG_TMPDIR/ninja-$NINJA_VERSION.zip + termux_download https://github.com/ninja-build/ninja/releases/download/v$NINJA_VERSION/ninja-linux.zip \ + $NINJA_ZIP_FILE \ + 38fa8cfb9c1632a5cdf7a32fe1a7c5aa89e96c1d492c28624f4cc018e68458b9 + unzip $NINJA_ZIP_FILE -d $NINJA_FOLDER + fi + export PATH=$NINJA_FOLDER:$PATH +} + +# Utility function for cmake-built packages to setup a current meson. +termux_setup_meson() { + termux_setup_ninja + local MESON_VERSION=0.41.2 + local MESON_FOLDER=$TERMUX_COMMON_CACHEDIR/meson-$MESON_VERSION + if [ ! -d "$MESON_FOLDER" ]; then + local MESON_TAR_NAME=meson-$MESON_VERSION.tar.gz + local MESON_TAR_FILE=$TERMUX_PKG_TMPDIR/$MESON_TAR_NAME + termux_download \ + https://github.com/mesonbuild/meson/releases/download/$MESON_VERSION/meson-$MESON_VERSION.tar.gz \ + $MESON_TAR_FILE \ + 074dd24fd068be0893e2e45bcc35c919d8e12777e9d6a7efdf72d4dc300867ca + tar xf "$MESON_TAR_FILE" -C "$TERMUX_COMMON_CACHEDIR" + (cd $MESON_FOLDER && patch -p1 < $TERMUX_SCRIPTDIR/scripts/meson-android.patch) + fi + TERMUX_MESON="$MESON_FOLDER/meson.py" + TERMUX_MESON_CROSSFILE=$TERMUX_COMMON_CACHEDIR/meson-crossfile-$TERMUX_ARCH-v1.txt + if [ ! -f $TERMUX_MESON_CROSSFILE ]; then + local MESON_CPU MESON_CPU_FAMILY + if [ $TERMUX_ARCH = "arm" ]; then + MESON_CPU_FAMILY="arm" + MESON_CPU="armv7" + elif [ $TERMUX_ARCH = "i686" ]; then + MESON_CPU_FAMILY="x86" + MESON_CPU="i686" + elif [ $TERMUX_ARCH = "x86_64" ]; then + MESON_CPU_FAMILY="x86_64" + MESON_CPU="x86_64" + elif [ $TERMUX_ARCH = "aarch64" ]; then + MESON_CPU_FAMILY="arm" + MESON_CPU="aarch64" + else + termux_error_exit "Unsupported arch: $TERMUX_ARCH" + fi + + cat > $TERMUX_MESON_CROSSFILE <<-HERE + [binaries] + ar = '$AR' + c = '$CC' + cpp = '$CXX' + ld = '$LD' + pkg-config = '$PKG_CONFIG' + strip = '$STRIP' + [properties] + needs_exe_wrapper = true + [host_machine] + cpu_family = '$MESON_CPU_FAMILY' + cpu = '$MESON_CPU' + endian = 'little' + system = 'android' + HERE + fi +} + # Utility function for cmake-built packages to setup a current cmake. termux_setup_cmake() { - local TERMUX_CMAKE_MAJORVESION=3.8 - local TERMUX_CMAKE_MINORVERSION=2 + local TERMUX_CMAKE_MAJORVESION=3.9 + local TERMUX_CMAKE_MINORVERSION=1 local TERMUX_CMAKE_VERSION=$TERMUX_CMAKE_MAJORVESION.$TERMUX_CMAKE_MINORVERSION local TERMUX_CMAKE_TARNAME=cmake-${TERMUX_CMAKE_VERSION}-Linux-x86_64.tar.gz local TERMUX_CMAKE_TARFILE=$TERMUX_PKG_TMPDIR/$TERMUX_CMAKE_TARNAME @@ -99,7 +168,7 @@ termux_setup_cmake() { if [ ! -d "$TERMUX_CMAKE_FOLDER" ]; then termux_download https://cmake.org/files/v$TERMUX_CMAKE_MAJORVESION/$TERMUX_CMAKE_TARNAME \ "$TERMUX_CMAKE_TARFILE" \ - 33e4851d3219b720f4b64fcf617151168f1bffdf5afad25eb4b7f5f58cee3a08 + ecbaf72981ccd09d9dade6d580cf1213eef15ef95a675dd9d4f0d693f134644f rm -Rf "$TERMUX_PKG_TMPDIR/cmake-${TERMUX_CMAKE_VERSION}-Linux-x86_64" tar xf "$TERMUX_CMAKE_TARFILE" -C "$TERMUX_PKG_TMPDIR" mv "$TERMUX_PKG_TMPDIR/cmake-${TERMUX_CMAKE_VERSION}-Linux-x86_64" \ @@ -184,9 +253,9 @@ termux_step_setup_variables() { : "${TERMUX_PREFIX:="/data/data/com.termux/files/usr"}" : "${TERMUX_ANDROID_HOME:="/data/data/com.termux/files/home"}" : "${TERMUX_DEBUG:=""}" - : "${TERMUX_API_LEVEL:="21"}" - : "${TERMUX_ANDROID_BUILD_TOOLS_VERSION:="25.0.3"}" - : "${TERMUX_NDK_VERSION:="15.1"}" + : "${TERMUX_PKG_API_LEVEL:="21"}" + : "${TERMUX_ANDROID_BUILD_TOOLS_VERSION:="26.0.1"}" + : "${TERMUX_NDK_VERSION:="15.2"}" if [ "x86_64" = "$TERMUX_ARCH" ] || [ "aarch64" = "$TERMUX_ARCH" ]; then TERMUX_ARCH_BITS=64 @@ -211,18 +280,11 @@ termux_step_setup_variables() { # to avoid stuff like arm-linux-androideabi-ld there to conflict with ones from # the standalone toolchain. TERMUX_DX=$ANDROID_HOME/build-tools/$TERMUX_ANDROID_BUILD_TOOLS_VERSION/dx - TERMUX_JACK=$ANDROID_HOME/build-tools/$TERMUX_ANDROID_BUILD_TOOLS_VERSION/jack.jar - TERMUX_JILL=$ANDROID_HOME/build-tools/$TERMUX_ANDROID_BUILD_TOOLS_VERSION/jill.jar TERMUX_COMMON_CACHEDIR="$TERMUX_TOPDIR/_cache" TERMUX_DEBDIR="$TERMUX_SCRIPTDIR/debs" TERMUX_ELF_CLEANER=$TERMUX_COMMON_CACHEDIR/termux-elf-cleaner - TERMUX_STANDALONE_TOOLCHAIN="$TERMUX_TOPDIR/_lib/${TERMUX_NDK_VERSION}-${TERMUX_ARCH}-${TERMUX_API_LEVEL}" - # Bump the below version if a change is made in toolchain setup to ensure - # that everyone gets an updated toolchain: - TERMUX_STANDALONE_TOOLCHAIN+="-v6" - export prefix=${TERMUX_PREFIX} export PREFIX=${TERMUX_PREFIX} @@ -242,13 +304,16 @@ termux_step_setup_variables() { TERMUX_PKG_EXTRA_MAKE_ARGS="" TERMUX_PKG_BUILD_IN_SRC="" TERMUX_PKG_RM_AFTER_INSTALL="" + TERMUX_PKG_BREAKS="" # https://www.debian.org/doc/debian-policy/ch-relationships.html#s-binarydeps TERMUX_PKG_DEPENDS="" + TERMUX_PKG_BUILD_DEPENDS="" TERMUX_PKG_HOMEPAGE="" TERMUX_PKG_DESCRIPTION="FIXME:Add description" TERMUX_PKG_FOLDERNAME="" TERMUX_PKG_KEEP_STATIC_LIBRARIES="false" TERMUX_PKG_ESSENTIAL="" TERMUX_PKG_CONFLICTS="" # https://www.debian.org/doc/debian-policy/ch-relationships.html#s-conflicts + TERMUX_PKG_RECOMMENDS="" # https://www.debian.org/doc/debian-policy/ch-relationships.html#s-binarydeps TERMUX_PKG_REPLACES="" TERMUX_PKG_CONFFILES="" TERMUX_PKG_INCLUDE_IN_DEVPACKAGE="" @@ -297,6 +362,11 @@ termux_step_start_build() { # shellcheck source=/dev/null source "$TERMUX_PKG_BUILDER_SCRIPT" + TERMUX_STANDALONE_TOOLCHAIN="$TERMUX_TOPDIR/_lib/${TERMUX_NDK_VERSION}-${TERMUX_ARCH}-${TERMUX_PKG_API_LEVEL}" + # Bump the below version if a change is made in toolchain setup to ensure + # that everyone gets an updated toolchain: + TERMUX_STANDALONE_TOOLCHAIN+="-v12" + if [ -n "${TERMUX_PKG_BLACKLISTED_ARCHES:=""}" ] && [ "$TERMUX_PKG_BLACKLISTED_ARCHES" != "${TERMUX_PKG_BLACKLISTED_ARCHES/$TERMUX_ARCH/}" ]; then echo "Skipping building $TERMUX_PKG_NAME for arch $TERMUX_ARCH" exit 0 @@ -451,7 +521,7 @@ termux_step_setup_toolchain() { # We put this after system PATH to avoid picking up toolchain stripped python export PATH=$PATH:$TERMUX_STANDALONE_TOOLCHAIN/bin - export CFLAGS="" #-Werror=implicit-function-declaration" + export CFLAGS="" export LDFLAGS="-L${TERMUX_PREFIX}/lib" if [ "$TERMUX_PKG_CLANG" = "no" ]; then @@ -486,7 +556,7 @@ termux_step_setup_toolchain() { # "We recommend using the -mthumb compiler flag to force the generation of 16-bit Thumb-2 instructions". # With r13 of the ndk ruby 2.4.0 segfaults when built on arm with clang without -mthumb. CFLAGS+=" -march=armv7-a -mfpu=neon -mfloat-abi=softfp -mthumb" - LDFLAGS+=" -march=armv7-a -Wl,--fix-cortex-a8" + LDFLAGS+=" -march=armv7-a" elif [ "$TERMUX_ARCH" = "i686" ]; then # From $NDK/docs/CPU-ARCH-ABIS.html: CFLAGS+=" -march=i686 -msse3 -mstackrealign -mfpmath=sse" @@ -532,10 +602,14 @@ termux_step_setup_toolchain() { fi "$NDK/build/tools/make_standalone_toolchain.py" \ - --api "$TERMUX_API_LEVEL" \ + --api "$TERMUX_PKG_API_LEVEL" \ --arch $_NDK_ARCHNAME \ + --stl=libc++ \ --install-dir $_TERMUX_TOOLCHAIN_TMPDIR + # Remove android-support header wrapping not needed on android-21: + rm -Rf $_TERMUX_TOOLCHAIN_TMPDIR/sysroot/usr/local + local wrapped plusplus CLANG_TARGET=$TERMUX_HOST_PLATFORM if [ $TERMUX_ARCH = arm ]; then CLANG_TARGET=${CLANG_TARGET/arm-/armv7a-}; fi for wrapped in ${TERMUX_HOST_PLATFORM}-clang clang; do @@ -550,11 +624,7 @@ termux_step_setup_toolchain() { done done - if [ "$TERMUX_ARCH" = "arm" ]; then - # Fix to allow e.g. to be included: - cp $_TERMUX_TOOLCHAIN_TMPDIR/include/c++/4.9.x/arm-linux-androideabi/armv7-a/bits/* \ - $_TERMUX_TOOLCHAIN_TMPDIR/include/c++/4.9.x/bits - elif [ "$TERMUX_ARCH" = "aarch64" ]; then + if [ "$TERMUX_ARCH" = "aarch64" ]; then # Use gold by default to work around https://github.com/android-ndk/ndk/issues/148 cp $_TERMUX_TOOLCHAIN_TMPDIR/bin/aarch64-linux-android-ld.gold \ $_TERMUX_TOOLCHAIN_TMPDIR/bin/aarch64-linux-android-ld @@ -562,6 +632,22 @@ termux_step_setup_toolchain() { $_TERMUX_TOOLCHAIN_TMPDIR/aarch64-linux-android/bin/ld fi + if [ "$TERMUX_ARCH" = "arm" ]; then + # Linker wrapper script to add '--exclude-libs libgcc.a', see + # https://github.com/android-ndk/ndk/issues/379 + # https://android-review.googlesource.com/#/c/389852/ + local linker + for linker in ld ld.bfd ld.gold; do + local wrap_linker=$_TERMUX_TOOLCHAIN_TMPDIR/$TERMUX_HOST_PLATFORM/bin/$linker + local real_linker=$_TERMUX_TOOLCHAIN_TMPDIR/$TERMUX_HOST_PLATFORM/bin/$linker.real + cp $wrap_linker $real_linker + echo '#!/bin/bash' > $wrap_linker + echo -n '`dirname $0`/' >> $wrap_linker + echo -n $linker.real >> $wrap_linker + echo ' --exclude-libs libgcc.a "$@"' >> $wrap_linker + done + fi + cd $_TERMUX_TOOLCHAIN_TMPDIR/sysroot for f in $TERMUX_SCRIPTDIR/ndk-patches/*.patch; do @@ -572,13 +658,13 @@ termux_step_setup_toolchain() { # elf.h: Taken from glibc since the elf.h in the NDK is lacking. # sysexits.h: Header-only and used by a few programs. # ifaddrs.h: Added in android-24 unified headers, use a inline implementation for now. - cp "$TERMUX_SCRIPTDIR"/ndk-patches/{elf.h,sysexits.h,ifaddrs.h} usr/include + cp "$TERMUX_SCRIPTDIR"/ndk-patches/{elf.h,sysexits.h,ifaddrs.h,libintl.h} usr/include # Remove from the NDK in favour of that from the libandroid-shmem. # Also remove as it doesn't work for non-root. rm usr/include/sys/{shm.h,sem.h} - sed -i "s/define __ANDROID_API__ __ANDROID_API_FUTURE__/define __ANDROID_API__ $TERMUX_API_LEVEL/" \ + sed -i "s/define __ANDROID_API__ __ANDROID_API_FUTURE__/define __ANDROID_API__ $TERMUX_PKG_API_LEVEL/" \ usr/include/android/api-level.h local _LIBDIR=usr/lib @@ -592,12 +678,14 @@ termux_step_setup_toolchain() { https://raw.githubusercontent.com/madler/zlib/v1.2.8/$file done unset file - + cd $_TERMUX_TOOLCHAIN_TMPDIR/include/c++/4.9.x + sed "s%\@TERMUX_HOST_PLATFORM\@%${TERMUX_HOST_PLATFORM}%g" $TERMUX_SCRIPTDIR/ndk-patches/*.cpppatch | patch -p1 mv $_TERMUX_TOOLCHAIN_TMPDIR $TERMUX_STANDALONE_TOOLCHAIN fi + local _STL_LIBFILE_NAME=libc++_shared.so if [ ! -f $TERMUX_PREFIX/lib/libstdc++.so ]; then - # Setup libgnustl_shared.so in $PREFIX/lib and libstdc++.so as a symlink to it, + # Setup libgnustl_shared.so in $PREFIX/lib and libstdc++.so as a link to it, # so that other C++ using packages links to it instead of the default android # C++ library which does not support exceptions or STL: # https://developer.android.com/ndk/guides/cpp-support.html @@ -607,16 +695,25 @@ termux_step_setup_toolchain() { # which is part of the base Termux installation. mkdir -p "$TERMUX_PREFIX/lib" cd "$TERMUX_PREFIX/lib" - _STL_LIBFILE=$TERMUX_STANDALONE_TOOLCHAIN/${TERMUX_HOST_PLATFORM}/lib/libgnustl_shared.so + + local _STL_LIBFILE= if [ "$TERMUX_ARCH" = arm ]; then - _STL_LIBFILE=$TERMUX_STANDALONE_TOOLCHAIN/${TERMUX_HOST_PLATFORM}/lib/armv7-a/libgnustl_shared.so + local _STL_LIBFILE=$TERMUX_STANDALONE_TOOLCHAIN/${TERMUX_HOST_PLATFORM}/lib/armv7-a/$_STL_LIBFILE_NAME elif [ "$TERMUX_ARCH" = x86_64 ]; then - _STL_LIBFILE=$TERMUX_STANDALONE_TOOLCHAIN/${TERMUX_HOST_PLATFORM}/lib64/libgnustl_shared.so + local _STL_LIBFILE=$TERMUX_STANDALONE_TOOLCHAIN/${TERMUX_HOST_PLATFORM}/lib64/$_STL_LIBFILE_NAME + else + local _STL_LIBFILE=$TERMUX_STANDALONE_TOOLCHAIN/${TERMUX_HOST_PLATFORM}/lib/$_STL_LIBFILE_NAME fi + cp "$_STL_LIBFILE" . - $STRIP --strip-unneeded libgnustl_shared.so - $TERMUX_ELF_CLEANER libgnustl_shared.so - ln -f -s libgnustl_shared.so libstdc++.so + $STRIP --strip-unneeded $_STL_LIBFILE_NAME + $TERMUX_ELF_CLEANER $_STL_LIBFILE_NAME + if [ $TERMUX_ARCH = "arm" ]; then + # Use a linker script to get libunwind.a. + echo 'INPUT(-lunwind -lc++_shared)' > libstdc++.so + else + ln -f $_STL_LIBFILE_NAME libstdc++.so + fi fi export PKG_CONFIG_LIBDIR="$TERMUX_PKG_CONFIG_LIBDIR" @@ -771,6 +868,7 @@ termux_step_configure_cmake () { # pick up cross compiled binutils tool in $PREFIX/bin: cmake -G 'Unix Makefiles' "$TERMUX_PKG_SRCDIR" \ -DCMAKE_AR="$(which $AR)" \ + -DCMAKE_UNAME="$(which uname)" \ -DCMAKE_RANLIB="$(which $RANLIB)" \ -DCMAKE_BUILD_TYPE=$BUILD_TYPE \ -DCMAKE_CROSSCOMPILING=True \ @@ -791,11 +889,26 @@ termux_step_configure_cmake () { $TERMUX_PKG_EXTRA_CONFIGURE_ARGS $TOOLCHAIN_ARGS } +termux_step_configure_meson () { + termux_setup_meson + CC=gcc CXX=g++ $TERMUX_MESON \ + $TERMUX_PKG_SRCDIR \ + $TERMUX_PKG_BUILDDIR \ + --cross-file $TERMUX_MESON_CROSSFILE \ + --prefix $TERMUX_PREFIX \ + --libdir lib \ + --buildtype minsize \ + --strip \ + $TERMUX_PKG_EXTRA_CONFIGURE_ARGS +} + termux_step_configure () { if [ "$TERMUX_PKG_FORCE_CMAKE" == 'no' ] && [ -f "$TERMUX_PKG_SRCDIR/configure" ]; then termux_step_configure_autotools elif [ -f "$TERMUX_PKG_SRCDIR/CMakeLists.txt" ]; then termux_step_configure_cmake + elif [ -f "$TERMUX_PKG_SRCDIR/meson.build" ]; then + termux_step_configure_meson fi } @@ -822,6 +935,8 @@ termux_step_make_install() { else make -j 1 ${TERMUX_PKG_EXTRA_MAKE_ARGS} ${TERMUX_PKG_MAKE_INSTALL_TARGET} fi + elif test -f build.ninja; then + ninja install fi } @@ -835,7 +950,9 @@ termux_step_extract_into_massagedir() { # Build diff tar with what has changed during the build: cd $TERMUX_PREFIX - tar -N "$TERMUX_BUILD_TS_FILE" -czf "$TARBALL_ORIG" . + tar -N "$TERMUX_BUILD_TS_FILE" \ + --exclude='lib/libc++_shared.so' --exclude='lib/libstdc++.so' \ + -czf "$TARBALL_ORIG" . # Extract tar in order to massage it mkdir -p "$TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX" @@ -925,6 +1042,7 @@ termux_step_massage() { local SUB_PKG_DIR=$TERMUX_TOPDIR/$TERMUX_PKG_NAME/subpackages/$SUB_PKG_NAME local TERMUX_SUBPKG_DEPENDS="" local TERMUX_SUBPKG_CONFLICTS="" + local TERMUX_SUBPKG_REPLACES="" local TERMUX_SUBPKG_CONFFILES="" local SUB_PKG_MASSAGE_DIR=$SUB_PKG_DIR/massage/$TERMUX_PREFIX local SUB_PKG_PACKAGE_DIR=$SUB_PKG_DIR/package @@ -965,6 +1083,7 @@ termux_step_massage() { HERE test ! -z "$TERMUX_SUBPKG_DEPENDS" && echo "Depends: $TERMUX_SUBPKG_DEPENDS" >> control test ! -z "$TERMUX_SUBPKG_CONFLICTS" && echo "Conflicts: $TERMUX_SUBPKG_CONFLICTS" >> control + test ! -z "$TERMUX_SUBPKG_REPLACES" && echo "Replaces: $TERMUX_SUBPKG_REPLACES" >> control tar -cJf "$SUB_PKG_PACKAGE_DIR/control.tar.xz" . for f in $TERMUX_SUBPKG_CONFFILES; do echo "$TERMUX_PREFIX/$f" >> conffiles; done @@ -1030,9 +1149,11 @@ termux_step_create_debfile() { Description: $TERMUX_PKG_DESCRIPTION Homepage: $TERMUX_PKG_HOMEPAGE HERE + test ! -z "$TERMUX_PKG_BREAKS" && echo "Breaks: $TERMUX_PKG_BREAKS" >> DEBIAN/control test ! -z "$TERMUX_PKG_DEPENDS" && echo "Depends: $TERMUX_PKG_DEPENDS" >> DEBIAN/control test ! -z "$TERMUX_PKG_ESSENTIAL" && echo "Essential: yes" >> DEBIAN/control test ! -z "$TERMUX_PKG_CONFLICTS" && echo "Conflicts: $TERMUX_PKG_CONFLICTS" >> DEBIAN/control + test ! -z "$TERMUX_PKG_RECOMMENDS" && echo "Recommends: $TERMUX_PKG_RECOMMENDS" >> DEBIAN/control test ! -z "$TERMUX_PKG_REPLACES" && echo "Replaces: $TERMUX_PKG_REPLACES" >> DEBIAN/control # Create DEBIAN/conffiles (see https://www.debian.org/doc/debian-policy/ap-pkg-conffiles.html):