X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/59f0d218a6ff34c80cf898f6d7ac62555ba8eb11..e339be429f8c6f9f2d363002c5bff5c5f0bd94bd:/build-package.sh diff --git a/build-package.sh b/build-package.sh index f8effd82..22b6e40a 100755 --- a/build-package.sh +++ b/build-package.sh @@ -1,25 +1,21 @@ #!/bin/bash -# Required setup for ubuntu (only tested on 15.04): -# $ apt install asciidoc automake bison cmake flex gettext libglib2.0-dev help2man libc6-dev-i386 libcurl4-openssl-dev libgdk-pixbuf2.0-dev libncurses5-dev libtool lzip m4 mercurial pkg-config scons texinfo xmlto xutils-dev -# where libc6-dev-i386 is needed by luajit host part of the build for -# xutils-dev provides 'makedepend' which openssl build uses -# gettext provides 'msgfmt' which apt build uses -# libcurl4-openssl-dev is needed by apt build -# libglib2.0-dev provides 'glib-genmarshal' which glib build uses -# libgdk-pixbuf2.0-dev provides 'gdk-pixbuf-query-loaders' which librsvg build uses -# Required setup for mac (not regularly used, and may not build all packages): -# $ port install asciidoc bison cmake flex gnutar help2man lzip mercurial p5-libwww-perl pkgconfig scons xmlto -# where Busybox requires that sed is gsed: ln -s /opt/local/bin/gsed /opt/local/bin/sed - set -e -o pipefail -u -if [ "$#" -ne 1 ]; then echo "ERROR: Specify one argument!"; exit 1; fi -export TERMUX_PKG_NAME=$1 +if [ "$#" -ne 1 ]; then echo "ERROR: Specify one argument (name of or path to package)"; exit 1; fi +export TERMUX_PKG_NAME=`basename $1` export TERMUX_SCRIPTDIR=`cd $(dirname $0); pwd` -export TERMUX_PKG_BUILDER_DIR=$TERMUX_SCRIPTDIR/packages/$TERMUX_PKG_NAME + +if [[ $1 == *"/"* ]]; then + # Path to directory which may be outside this repo: + if [ ! -d $1 ]; then echo "ERROR: '$1' seems to be a path but is not a directory"; exit 1; fi + export TERMUX_PKG_BUILDER_DIR=`realpath $1` +else + # Package name: + export TERMUX_PKG_BUILDER_DIR=$TERMUX_SCRIPTDIR/packages/$TERMUX_PKG_NAME +fi export TERMUX_PKG_BUILDER_SCRIPT=$TERMUX_PKG_BUILDER_DIR/build.sh -if test ! -f $TERMUX_PKG_BUILDER_SCRIPT; then echo "ERROR: No such package builder: ${TERMUX_PKG_BUILDER_SCRIPT}!"; exit 1; fi +if test ! -f $TERMUX_PKG_BUILDER_SCRIPT; then echo "ERROR: No build.sh script at supposed package dir $TERMUX_PKG_BUILDER_DIR!"; exit 1; fi echo "termux - building $1..." test -t 1 && printf "\033]0;$1...\007" @@ -33,7 +29,11 @@ test -f $HOME/.termuxrc && . $HOME/.termuxrc if [ ! -d "$NDK" ]; then echo 'ERROR: $NDK not defined as pointing at a directory - define it pointing at a android NDK installation!'; exit 1; fi : ${TERMUX_MAKE_PROCESSES:='4'} : ${TERMUX_TOPDIR:="$HOME/termux"} -: ${TERMUX_ARCH:="arm"} +: ${TERMUX_ARCH:="arm"} # (arm|aarch64|i686|x86_64) - the 64 bit variants do not work yet +TERMUX_ARCH_BITS="32" +if [ "x86_64" = $TERMUX_ARCH -o "aarch64" = $TERMUX_ARCH ]; then + TERMUX_ARCH_BITS="64" +fi : ${TERMUX_HOST_PLATFORM:="${TERMUX_ARCH}-linux-android"} if [ $TERMUX_ARCH = "arm" ]; then TERMUX_HOST_PLATFORM="${TERMUX_HOST_PLATFORM}eabi"; fi : ${TERMUX_PREFIX:='/data/data/com.termux/files/usr'} @@ -43,7 +43,7 @@ if [ $TERMUX_ARCH = "arm" ]; then TERMUX_HOST_PLATFORM="${TERMUX_HOST_PLATFORM}e : ${TERMUX_GCC_VERSION:="4.9"} : ${TERMUX_API_LEVEL:="21"} : ${TERMUX_STANDALONE_TOOLCHAIN:="$HOME/lib/android-standalone-toolchain-${TERMUX_ARCH}-api${TERMUX_API_LEVEL}-gcc${TERMUX_GCC_VERSION}"} -: ${TERMUX_ANDROID_BUILD_TOOLS_VERSION:="22.0.1"} +: ${TERMUX_ANDROID_BUILD_TOOLS_VERSION:="23.0.0"} # We do not put all of build-tools/$TERMUX_ANDROID_BUILD_TOOLS_VERSION/ into PATH # to avoid stuff like arm-linux-androideabi-ld there to conflict with ones from # the standalone toolchain. @@ -99,6 +99,9 @@ if [ "$TERMUX_ARCH" = "arm" ]; then elif [ $TERMUX_ARCH = "i686" ]; then # From $NDK/docs/CPU-ARCH-ABIS.html: CFLAGS+=" -march=i686 -msse3 -mstackrealign -mfpmath=sse" +elif [ $TERMUX_ARCH = "aarch64" ]; then + LDFLAGS+=" -Wl,-rpath-link,$TERMUX_PREFIX/lib" + LDFLAGS+=" -Wl,-rpath-link,$TERMUX_STANDALONE_TOOLCHAIN/sysroot/usr/lib" fi if [ -n "$TERMUX_DEBUG" ]; then @@ -115,11 +118,13 @@ export ac_cv_func_getpwnam=no export ac_cv_func_getpwuid=no if [ ! -d $TERMUX_STANDALONE_TOOLCHAIN ]; then - _TERMUX_NDK_TOOLCHAIN_NAME="" - if [ "arm" = $TERMUX_ARCH ]; then - _TERMUX_NDK_TOOLCHAIN_NAME="$TERMUX_HOST_PLATFORM" - elif [ "i686" = $TERMUX_ARCH ]; then + # See https://developer.android.com/ndk/guides/standalone_toolchain.html about toolchain naming. + if [ "i686" = $TERMUX_ARCH ]; then _TERMUX_NDK_TOOLCHAIN_NAME="x86" + elif [ "x86_64" = $TERMUX_ARCH ]; then + _TERMUX_NDK_TOOLCHAIN_NAME="x86_64" + else + _TERMUX_NDK_TOOLCHAIN_NAME="$TERMUX_HOST_PLATFORM" fi bash $NDK/build/tools/make-standalone-toolchain.sh --platform=android-$TERMUX_API_LEVEL --toolchain=${_TERMUX_NDK_TOOLCHAIN_NAME}-${TERMUX_GCC_VERSION} \ --install-dir=$TERMUX_STANDALONE_TOOLCHAIN --system=`uname | tr '[:upper:]' '[:lower:]'`-x86_64 @@ -173,15 +178,15 @@ TERMUX_PKG_FOLDERNAME="" TERMUX_PKG_KEEP_STATIC_LIBRARIES="false" TERMUX_PKG_KEEP_HEADER_FILES="false" TERMUX_PKG_ESSENTIAL="" +TERMUX_PKG_CONFLICTS="" # https://www.debian.org/doc/debian-policy/ch-relationships.html#s-conflicts TERMUX_PKG_CONFFILES="" +TERMUX_PKG_INCLUDE_IN_DEVPACKAGE="" # Set if a host build should be done in TERMUX_PKG_HOSTBUILD_DIR: TERMUX_PKG_HOSTBUILD="" TERMUX_PKG_MAINTAINER="Fredrik Fornwall " # Cleanup old state rm -Rf $TERMUX_PKG_BUILDDIR $TERMUX_PKG_PACKAGEDIR $TERMUX_PKG_SRCDIR $TERMUX_PKG_TMPDIR $TERMUX_PKG_MASSAGEDIR -# Ensure folders present (but not $TERMUX_PKG_SRCDIR, it will be created in build) -mkdir -p $TERMUX_PKG_BUILDDIR $TERMUX_PKG_PACKAGEDIR $TERMUX_PKG_TMPDIR $TERMUX_PKG_CACHEDIR $TERMUX_PKG_MASSAGEDIR $PKG_CONFIG_LIBDIR $TERMUX_PREFIX/{bin,lib,share,tmp} # If $TERMUX_PREFIX already exists, it may have been built for a different arch TERMUX_ARCH_FILE=/data/TERMUX_ARCH @@ -209,6 +214,13 @@ if [ -f "${TERMUX_ARCH_FILE}" ]; then fi echo $TERMUX_ARCH > $TERMUX_ARCH_FILE +# Ensure folders present (but not $TERMUX_PKG_SRCDIR, it will be created in build) +mkdir -p $TERMUX_PKG_BUILDDIR $TERMUX_PKG_PACKAGEDIR $TERMUX_PKG_TMPDIR $TERMUX_PKG_CACHEDIR $TERMUX_PKG_MASSAGEDIR $PKG_CONFIG_LIBDIR $TERMUX_PREFIX/{bin,etc,lib,libexec,share,tmp} + +# Make $TERMUX_PREFIX/bin/sh executable on the builder, so that build script can assume that it works +# on both builder and host later on: +ln -f -s /bin/sh $TERMUX_PREFIX/bin/sh + if [ ! -f $PKG_CONFIG ]; then echo "Creating pkg-config wrapper..." # We use path to host pkg-config to avoid picking up a cross-compiled pkg-config later on @@ -233,16 +245,18 @@ Requires: Libs: -L$TERMUX_STANDALONE_TOOLCHAIN/sysroot/usr/lib -lz Cflags: -I$TERMUX_STANDALONE_TOOLCHAIN/sysroot/usr/include HERE - sleep 1 # Sleep so that zlib.c get older timestamp then TERMUX_BUILD_TS_FILE. fi TERMUX_ELF_CLEANER=$TERMUX_COMMON_CACHEDIR/termux-elf-cleaner -if [ ! -f $TERMUX_ELF_CLEANER ]; then - g++ -std=c++11 -Wall -Wextra -pedantic -Os $TERMUX_SCRIPTDIR/packages/termux-tools/termux-elf-cleaner.cpp -o $TERMUX_ELF_CLEANER +TERMUX_ELF_CLEANER_SRC=$TERMUX_SCRIPTDIR/packages/termux-tools/termux-elf-cleaner.cpp +if [ $TERMUX_ELF_CLEANER_SRC -nt $TERMUX_ELF_CLEANER ]; then + g++ -std=c++11 -Wall -Wextra -pedantic -Os $TERMUX_ELF_CLEANER_SRC -o $TERMUX_ELF_CLEANER fi # Keep track of when build started so we can see what files have been created export TERMUX_BUILD_TS_FILE=$TERMUX_PKG_TMPDIR/timestamp_$TERMUX_PKG_NAME +sleep 1 # Sleep so that any generated files above (such as zlib.c and $PREFIX/bin/sh) + #get older timestamp then TERMUX_BUILD_TS_FILE rm -f $TERMUX_BUILD_TS_FILE && touch $TERMUX_BUILD_TS_FILE # Run just after sourcing $TERMUX_PKG_BUILDER_SCRIPT @@ -285,7 +299,8 @@ termux_step_host_build () { # This should not be overridden termux_step_patch_package () { cd $TERMUX_PKG_SRCDIR - for patch in $TERMUX_PKG_BUILDER_DIR/*.patch; do + # Suffix patch with ".patch32" or ".patch64" to only apply for these bitnesses: + for patch in $TERMUX_PKG_BUILDER_DIR/*.patch{$TERMUX_ARCH_BITS,}; do test -f $patch && sed "s%\@TERMUX_PREFIX\@%${TERMUX_PREFIX}%g" $patch | patch -p1 done @@ -333,7 +348,15 @@ termux_step_configure () { set -e -o pipefail export PATH=$TERMUX_PKG_TMPDIR/config-scripts:$PATH - $TERMUX_PKG_SRCDIR/configure \ + # See http://wiki.buici.com/xwiki/bin/view/Programing+C+and+C%2B%2B/Autoconf+and+RPL_MALLOC + # about this problem which may cause linker errors in test scripts not undef:ing malloc and + # also cause problems with e.g. malloc interceptors such as libgc: + local AVOID_AUTOCONF_WRAPPERS="ac_cv_func_malloc_0_nonnull=yes ac_cv_func_realloc_0_nonnull=yes" + # Similarly, disable gnulib's rpl_getcwd(). It returns the wrong value, affecting zile. See + # . + local AVOID_AUTOCONF_WRAPPERS="gl_cv_func_getcwd_null=yes gl_cv_func_getcwd_posix_signature=yes gl_cv_func_getcwd_path_max=yes gl_cv_func_getcwd_abort_bug=no $AVOID_AUTOCONF_WRAPPERS" + + env $AVOID_AUTOCONF_WRAPPERS $TERMUX_PKG_SRCDIR/configure \ --disable-dependency-tracking \ --prefix=$TERMUX_PREFIX \ --disable-rpath --disable-rpath-hack \ @@ -420,13 +443,13 @@ termux_step_massage () { if [ "$TERMUX_DEBUG" = "" ]; then find . -type f | xargs file | grep -E "(executable|shared object)" | grep ELF | cut -f 1 -d : | xargs $STRIP --strip-unneeded --preserve-dates -R '.gnu.version*' fi - # Remove DT_ entries which the android 5.1 linker warns about: - find . -type f | xargs $TERMUX_ELF_CLEANER # Fix shebang paths: for file in `find . -type f`; do head -c 100 $file | grep -E "^#\!.*\\/bin\\/.*" | grep -q -E -v "^#\! ?\\/system" && sed --follow-symlinks -i -E "s@^#\!(.*)/bin/(.*)@#\!$TERMUX_PREFIX/bin/\2@" $file done set -e -o pipefail + # Remove DT_ entries which the android 5.1 linker warns about: + find . -type f -print0 | xargs -0 $TERMUX_ELF_CLEANER test ! -z "$TERMUX_PKG_RM_AFTER_INSTALL" && rm -Rf $TERMUX_PKG_RM_AFTER_INSTALL @@ -436,9 +459,13 @@ termux_step_massage () { if [ -d include -a -z "${TERMUX_PKG_NO_DEVELSPLIT}" ]; then # Add virtual -dev sub package if there are include files: _DEVEL_SUBPACKAGE_FILE=$TERMUX_PKG_TMPDIR/${TERMUX_PKG_NAME}-dev.subpackage.sh - echo TERMUX_SUBPKG_INCLUDE=\"include share/man/man3 lib/pkgconfig share/aclocal\" > $_DEVEL_SUBPACKAGE_FILE + echo TERMUX_SUBPKG_INCLUDE=\"include share/man/man3 lib/pkgconfig share/aclocal $TERMUX_PKG_INCLUDE_IN_DEVPACKAGE\" > $_DEVEL_SUBPACKAGE_FILE echo TERMUX_SUBPKG_DESCRIPTION=\"Development files for ${TERMUX_PKG_NAME}\" >> $_DEVEL_SUBPACKAGE_FILE echo TERMUX_SUBPKG_DEPENDS=\"$TERMUX_PKG_NAME\" >> $_DEVEL_SUBPACKAGE_FILE + if [ x$TERMUX_PKG_CONFLICTS != x ]; then + # Assume that dev packages conflicts as well. + echo "TERMUX_SUBPKG_CONFLICTS=${TERMUX_PKG_CONFLICTS}-dev" >> $_DEVEL_SUBPACKAGE_FILE + fi fi # Now build all sub packages rm -Rf $TERMUX_TOPDIR/$TERMUX_PKG_NAME/subpackages @@ -450,6 +477,7 @@ termux_step_massage () { echo "$SUB_PKG_NAME => $subpackage" SUB_PKG_DIR=$TERMUX_TOPDIR/$TERMUX_PKG_NAME/subpackages/$SUB_PKG_NAME TERMUX_SUBPKG_DEPENDS="" + TERMUX_SUBPKG_CONFLICTS="" SUB_PKG_MASSAGE_DIR=$SUB_PKG_DIR/massage/$TERMUX_PREFIX SUB_PKG_PACKAGE_DIR=$SUB_PKG_DIR/package mkdir -p $SUB_PKG_MASSAGE_DIR $SUB_PKG_PACKAGE_DIR @@ -484,6 +512,7 @@ Description: $TERMUX_SUBPKG_DESCRIPTION Homepage: $TERMUX_PKG_HOMEPAGE HERE test ! -z "$TERMUX_SUBPKG_DEPENDS" && echo "Depends: $TERMUX_SUBPKG_DEPENDS" >> control + test ! -z "$TERMUX_SUBPKG_CONFLICTS" && echo "Conflicts: $TERMUX_SUBPKG_CONFLICTS" >> control $TERMUX_TAR -czf $SUB_PKG_PACKAGE_DIR/control.tar.gz . # Create the actual .deb file: @@ -514,6 +543,23 @@ termux_step_create_debscripts () { return } +termux_setup_golang () { + local TERMUX_GO_VERSION=go1.6beta1 + local TERMUX_GO_PLATFORM=linux-amd64 + test `uname` = "Darwin" && TERMUX_GO_PLATFORM=darwin-amd64 + + export TERMUX_BUILDGO_FOLDER=$TERMUX_COMMON_CACHEDIR/${TERMUX_GO_VERSION}.${TERMUX_GO_PLATFORM} + export GOROOT=$TERMUX_BUILDGO_FOLDER + export PATH=$GOROOT/bin:$PATH + + if [ -d $TERMUX_BUILDGO_FOLDER ]; then return; fi + + local TERMUX_BUILDGO_TAR=$TERMUX_COMMON_CACHEDIR/${TERMUX_GO_VERSION}.${TERMUX_GO_PLATFORM}.tar.gz + rm -Rf $TERMUX_COMMON_CACHEDIR/go $TERMUX_BUILDGO_FOLDER + curl -o $TERMUX_BUILDGO_TAR https://storage.googleapis.com/golang/${TERMUX_GO_VERSION}.${TERMUX_GO_PLATFORM}.tar.gz + ( cd $TERMUX_COMMON_CACHEDIR; tar xf $TERMUX_BUILDGO_TAR; mv go $TERMUX_BUILDGO_FOLDER; rm $TERMUX_BUILDGO_TAR ) +} + source $TERMUX_PKG_BUILDER_SCRIPT # Compute full version: @@ -605,7 +651,9 @@ cd $TERMUX_PKG_BUILDDIR termux_step_post_make_install cd $TERMUX_PKG_MASSAGEDIR termux_step_extract_into_massagedir +cd $TERMUX_PKG_MASSAGEDIR termux_step_massage +cd $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX termux_step_post_massage # Create data tarball containing files to package: @@ -637,6 +685,7 @@ Homepage: $TERMUX_PKG_HOMEPAGE HERE 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 # Create DEBIAN/conffiles (see https://www.debian.org/doc/debian-policy/ap-pkg-conffiles.html): for f in $TERMUX_PKG_CONFFILES; do echo $TERMUX_PREFIX/$f >> DEBIAN/conffiles; done