From 7c74bf972632c4ce23ff5877dd0b58ca94e5af7f Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Thu, 16 Jul 2020 23:58:48 +0200 Subject: [PATCH] Rename termux_step_post_extract_package->termux_step_post_get_source --- packages/autoconf/build.sh | 2 +- packages/cfengine/build.sh | 2 +- packages/ctags/build.sh | 2 +- packages/dirb/build.sh | 2 +- packages/emacs/build.sh | 2 +- packages/erlang/build.sh | 2 +- packages/espeak/build.sh | 2 +- packages/ghostscript/build.sh | 2 +- packages/gkermit/build.sh | 2 +- packages/gpsbabel/build.sh | 2 +- packages/jupp/build.sh | 2 +- packages/krb5/build.sh | 2 +- packages/ldc/build.sh | 2 +- packages/libandroid-support/build.sh | 2 +- packages/libgc/build.sh | 2 +- packages/libgpg-error/build.sh | 2 +- packages/libicu/build.sh | 4 ++-- packages/libllvm/build.sh | 2 +- packages/libsearpc/build.sh | 2 +- packages/libzmq/build.sh | 2 +- packages/nodejs-lts/build.sh | 2 +- packages/nodejs/build.sh | 2 +- packages/perl/build.sh | 2 +- packages/pngquant/build.sh | 2 +- packages/swift/build.sh | 2 +- packages/timewarrior/build.sh | 2 +- packages/tintin++/build.sh | 2 +- packages/tsocks/build.sh | 2 +- 28 files changed, 29 insertions(+), 29 deletions(-) diff --git a/packages/autoconf/build.sh b/packages/autoconf/build.sh index 0341fcace..4e5e2079d 100644 --- a/packages/autoconf/build.sh +++ b/packages/autoconf/build.sh @@ -7,7 +7,7 @@ TERMUX_PKG_SHA256=64ebcec9f8ac5b2487125a86a7760d2591ac9e1d3dbd59489633f9de62a576 TERMUX_PKG_DEPENDS="m4, make, perl" TERMUX_PKG_PLATFORM_INDEPENDENT=true -termux_step_post_extract_package() { +termux_step_post_get_source() { perl -p -i -e "s|/bin/sh|$TERMUX_PREFIX/bin/sh|" lib/*/*.m4 } diff --git a/packages/cfengine/build.sh b/packages/cfengine/build.sh index ec530131c..57d0d7e07 100644 --- a/packages/cfengine/build.sh +++ b/packages/cfengine/build.sh @@ -11,7 +11,7 @@ TERMUX_PKG_DEPENDS="liblmdb, openssl, libandroid-glob, pcre" TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-workdir=$TERMUX_PREFIX/var/lib/cfengine --without-pam --without-selinux-policy --without-systemd-service --with-lmdb=$TERMUX_PREFIX --with-openssl=$TERMUX_PREFIX --with-pcre=$TERMUX_PREFIX" -termux_step_post_extract_package() { +termux_step_post_get_source() { cd cfengine-masterfiles-${TERMUX_PKG_VERSION} EXPLICIT_VERSION=${TERMUX_PKG_VERSION} ./configure --prefix=$TERMUX_PREFIX/var/lib/cfengine --bindir=$TERMUX_PREFIX/bin make install diff --git a/packages/ctags/build.sh b/packages/ctags/build.sh index 2e6c34e02..59cca00b5 100644 --- a/packages/ctags/build.sh +++ b/packages/ctags/build.sh @@ -11,7 +11,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-tmpdir=$TERMUX_PREFIX/tmp" TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_HOSTBUILD=true -termux_step_post_extract_package() { +termux_step_post_get_source() { export regcomp_works=yes ./autogen.sh } diff --git a/packages/dirb/build.sh b/packages/dirb/build.sh index 07f642782..c9058ed30 100644 --- a/packages/dirb/build.sh +++ b/packages/dirb/build.sh @@ -7,7 +7,7 @@ TERMUX_PKG_SRCURL=https://sourceforge.net/projects/dirb/files/dirb/${TERMUX_PKG_ TERMUX_PKG_SHA256=f3748ade231ca211a01acbec31cc6a3b576f6c56c906d73329d7dbb79f60fc2c TERMUX_PKG_DEPENDS="libcurl" -termux_step_post_extract_package() { +termux_step_post_get_source() { # dirb222.tar.gz has directory permission problem chmod +x -R "$TERMUX_PKG_SRCDIR" } diff --git a/packages/emacs/build.sh b/packages/emacs/build.sh index f23458d65..1d1c877cb 100644 --- a/packages/emacs/build.sh +++ b/packages/emacs/build.sh @@ -63,7 +63,7 @@ share/man/man1/grep-changelog.1.gz # program still remain in the emacs package): TERMUX_PKG_RM_AFTER_INSTALL+=" bin/ctags share/man/man1/ctags.1 share/man/man1/ctags.1.gz" -termux_step_post_extract_package() { +termux_step_post_get_source() { # Certain packages are not safe to build on device because their # build.sh script deletes specific files in $TERMUX_PREFIX. if $TERMUX_ON_DEVICE_BUILD; then diff --git a/packages/erlang/build.sh b/packages/erlang/build.sh index 13da461d5..c682c1b07 100644 --- a/packages/erlang/build.sh +++ b/packages/erlang/build.sh @@ -11,7 +11,7 @@ TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--without-javac --with-ssl=${TERMUX_PREFIX} --with-termcap" TERMUX_PKG_EXTRA_MAKE_ARGS="noboot" -termux_step_post_extract_package() { +termux_step_post_get_source() { # We need a host build every time: rm -Rf "$TERMUX_PKG_HOSTBUILD_DIR" ./otp_build autoconf diff --git a/packages/espeak/build.sh b/packages/espeak/build.sh index d8d71fee9..f3d2546c8 100644 --- a/packages/espeak/build.sh +++ b/packages/espeak/build.sh @@ -17,7 +17,7 @@ TERMUX_PKG_RM_AFTER_INSTALL="lib/*ng-test*" # --without-async due to that using pthread_cancel(). TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--without-async --with-pcaudiolib" -termux_step_post_extract_package() { +termux_step_post_get_source() { # Certain packages are not safe to build on device because their # build.sh script deletes specific files in $TERMUX_PREFIX. if $TERMUX_ON_DEVICE_BUILD; then diff --git a/packages/ghostscript/build.sh b/packages/ghostscript/build.sh index 4084fc931..a30eb1c3a 100644 --- a/packages/ghostscript/build.sh +++ b/packages/ghostscript/build.sh @@ -15,7 +15,7 @@ CCAUX=gcc --with-system-libtiff " -termux_step_post_extract_package() { +termux_step_post_get_source() { rm -rdf $TERMUX_PKG_SRCDIR/{jpeg,libpng,expat,jasper,freetype,lcms2,tiff,openjpeg} } diff --git a/packages/gkermit/build.sh b/packages/gkermit/build.sh index 541f063dd..082ab95b0 100644 --- a/packages/gkermit/build.sh +++ b/packages/gkermit/build.sh @@ -8,7 +8,7 @@ TERMUX_PKG_DEPENDS="libandroid-support" TERMUX_PKG_BUILD_IN_SRC=true TERMUX_MAKE_PROCESSES=1 -termux_step_post_extract_package() { +termux_step_post_get_source() { local file filename filename=$(basename "$TERMUX_PKG_SRCURL") file="$TERMUX_PKG_CACHEDIR/$filename" diff --git a/packages/gpsbabel/build.sh b/packages/gpsbabel/build.sh index c8759a534..cd6ff6c0c 100644 --- a/packages/gpsbabel/build.sh +++ b/packages/gpsbabel/build.sh @@ -7,6 +7,6 @@ TERMUX_PKG_SRCURL=https://github.com/gpsbabel/gpsbabel/archive/gpsbabel_${TERMUX TERMUX_PKG_SHA256=22860e913f093aa9124e295d52d1d4ae1afccaa67ed6bed6f1f8d8b0a45336d1 TERMUX_PKG_DEPENDS="libexpat" -termux_step_post_extract_package() { +termux_step_post_get_source() { TERMUX_PKG_SRCDIR+=/gpsbabel } diff --git a/packages/jupp/build.sh b/packages/jupp/build.sh index 30dd0e1c6..8b318da14 100644 --- a/packages/jupp/build.sh +++ b/packages/jupp/build.sh @@ -14,7 +14,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --enable-sysconfjoesubdir=/jupp " -termux_step_post_extract_package() { +termux_step_post_get_source() { chmod +x $TERMUX_PKG_SRCDIR/configure } diff --git a/packages/krb5/build.sh b/packages/krb5/build.sh index f75a4874e..5119eb0fd 100644 --- a/packages/krb5/build.sh +++ b/packages/krb5/build.sh @@ -24,7 +24,7 @@ DEFKTNAME=$TERMUX_PREFIX/etc/krb5.keytab DEFCKTNAME=$TERMUX_PREFIX/var/krb5/user/%{euid}/client.keytab " -termux_step_post_extract_package() { +termux_step_post_get_source() { TERMUX_PKG_SRCDIR+="/src" } diff --git a/packages/ldc/build.sh b/packages/ldc/build.sh index 2172c6d44..35af20d58 100644 --- a/packages/ldc/build.sh +++ b/packages/ldc/build.sh @@ -40,7 +40,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -DCMAKE_INSTALL_PREFIX=$LLVM_INSTALL_DIR " -termux_step_post_extract_package() { +termux_step_post_get_source() { # Certain packages are not safe to build on device because their # build.sh script deletes specific files in $TERMUX_PREFIX. if $TERMUX_ON_DEVICE_BUILD; then diff --git a/packages/libandroid-support/build.sh b/packages/libandroid-support/build.sh index 28ce3c547..6fd203b02 100644 --- a/packages/libandroid-support/build.sh +++ b/packages/libandroid-support/build.sh @@ -11,7 +11,7 @@ TERMUX_PKG_PRE_DEPENDS="dpkg (>= 1.19.4-3)" TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_ESSENTIAL=true -termux_step_post_extract_package() { +termux_step_post_get_source() { cp wcwidth-${TERMUX_PKG_VERSION[1]}/wcwidth.c src/ } diff --git a/packages/libgc/build.sh b/packages/libgc/build.sh index d670708be..778bc0f91 100644 --- a/packages/libgc/build.sh +++ b/packages/libgc/build.sh @@ -12,7 +12,7 @@ TERMUX_PKG_BREAKS="libgc-dev" TERMUX_PKG_REPLACES="libgc-dev" TERMUX_PKG_RM_AFTER_INSTALL="share/gc" -termux_step_post_extract_package() { +termux_step_post_get_source() { mv libatomic_ops-${TERMUX_PKG_VERSION[1]} libatomic_ops ./autogen.sh } diff --git a/packages/libgpg-error/build.sh b/packages/libgpg-error/build.sh index 504931488..247ee346d 100644 --- a/packages/libgpg-error/build.sh +++ b/packages/libgpg-error/build.sh @@ -8,7 +8,7 @@ TERMUX_PKG_BREAKS="libgpg-error-dev" TERMUX_PKG_REPLACES="libgpg-error-dev" TERMUX_PKG_RM_AFTER_INSTALL="share/common-lisp" -termux_step_post_extract_package() { +termux_step_post_get_source() { # Upstream only has Android definitions for platform-specific lock objects. # See https://lists.gnupg.org/pipermail/gnupg-devel/2014-January/028203.html # for how to generate a lock-obj header file on devices. diff --git a/packages/libicu/build.sh b/packages/libicu/build.sh index 84e0b3d08..956f12c93 100644 --- a/packages/libicu/build.sh +++ b/packages/libicu/build.sh @@ -1,7 +1,7 @@ TERMUX_PKG_HOMEPAGE=http://site.icu-project.org/home TERMUX_PKG_DESCRIPTION='International Components for Unicode library' TERMUX_PKG_LICENSE="BSD" -# We override TERMUX_PKG_SRCDIR termux_step_post_extract_package so need to do +# We override TERMUX_PKG_SRCDIR termux_step_post_get_source so need to do # this hack to be able to find the license file. TERMUX_PKG_LICENSE_FILE="../LICENSE" # Function `icu::number::FormattedNumber::getAllFieldPositions` was removed @@ -17,6 +17,6 @@ TERMUX_PKG_HOSTBUILD=true TERMUX_PKG_EXTRA_HOSTBUILD_CONFIGURE_ARGS="--disable-samples --disable-tests" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-samples --disable-tests --with-cross-build=$TERMUX_PKG_HOSTBUILD_DIR" -termux_step_post_extract_package() { +termux_step_post_get_source() { TERMUX_PKG_SRCDIR+="/source" } diff --git a/packages/libllvm/build.sh b/packages/libllvm/build.sh index 0ab7bc9b4..472729d73 100644 --- a/packages/libllvm/build.sh +++ b/packages/libllvm/build.sh @@ -55,7 +55,7 @@ TERMUX_PKG_HAS_DEBUG=false # cp: cannot stat '../src/projects/openmp/runtime/exports/common.min.50.ompt.optional/include/omp.h': No such file or directory # common.min.50.ompt.optional should be common.deb.50.ompt.optional when doing debug build -termux_step_post_extract_package() { +termux_step_post_get_source() { if [ "$TERMUX_PKG_QUICK_REBUILD" = "false" ]; then mv clang-${TERMUX_PKG_VERSION}.src tools/clang mv clang-tools-extra-${TERMUX_PKG_VERSION}.src tools/clang/tools/extra diff --git a/packages/libsearpc/build.sh b/packages/libsearpc/build.sh index 41b288b85..5841967c2 100644 --- a/packages/libsearpc/build.sh +++ b/packages/libsearpc/build.sh @@ -9,6 +9,6 @@ TERMUX_PKG_DEPENDS="glib, libjansson" TERMUX_PKG_BREAKS="libsearpc-dev" TERMUX_PKG_REPLACES="libsearpc-dev" -termux_step_post_extract_package() { +termux_step_post_get_source() { ./autogen.sh } diff --git a/packages/libzmq/build.sh b/packages/libzmq/build.sh index 40f1091af..5bd93fdd4 100644 --- a/packages/libzmq/build.sh +++ b/packages/libzmq/build.sh @@ -10,6 +10,6 @@ TERMUX_PKG_BREAKS="libzmq-dev" TERMUX_PKG_REPLACES="libzmq-dev" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-libsodium --disable-libunwind --disable-Werror" -termux_step_post_extract_package() { +termux_step_post_get_source() { ./autogen.sh } diff --git a/packages/nodejs-lts/build.sh b/packages/nodejs-lts/build.sh index 1c047c124..4f3b4fb26 100644 --- a/packages/nodejs-lts/build.sh +++ b/packages/nodejs-lts/build.sh @@ -17,7 +17,7 @@ TERMUX_PKG_RM_AFTER_INSTALL="lib/node_modules/npm/html lib/node_modules/npm/make TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_HOSTBUILD=true -termux_step_post_extract_package() { +termux_step_post_get_source() { # Prevent caching of host build: rm -Rf $TERMUX_PKG_HOSTBUILD_DIR } diff --git a/packages/nodejs/build.sh b/packages/nodejs/build.sh index 2710b1aba..4f44fa594 100644 --- a/packages/nodejs/build.sh +++ b/packages/nodejs/build.sh @@ -31,7 +31,7 @@ TERMUX_PKG_HOSTBUILD=true # collect2: error: ld returned 1 exit status TERMUX_PKG_BLACKLISTED_ARCHES="x86_64" -termux_step_post_extract_package() { +termux_step_post_get_source() { # Prevent caching of host build: rm -Rf $TERMUX_PKG_HOSTBUILD_DIR } diff --git a/packages/perl/build.sh b/packages/perl/build.sh index 9d4be446a..d74a1e604 100644 --- a/packages/perl/build.sh +++ b/packages/perl/build.sh @@ -16,7 +16,7 @@ TERMUX_PKG_BUILD_IN_SRC=true TERMUX_MAKE_PROCESSES=1 TERMUX_PKG_RM_AFTER_INSTALL="bin/perl${TERMUX_PKG_VERSION}" -termux_step_post_extract_package() { +termux_step_post_get_source() { # Certain packages are not safe to build on device because their # build.sh script deletes specific files in $TERMUX_PREFIX. if $TERMUX_ON_DEVICE_BUILD; then diff --git a/packages/pngquant/build.sh b/packages/pngquant/build.sh index d866b0baa..55370d5d2 100644 --- a/packages/pngquant/build.sh +++ b/packages/pngquant/build.sh @@ -13,6 +13,6 @@ TERMUX_PKG_DEPENDS="libpng, littlecms, zlib" TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-sse" -termux_step_post_extract_package() { +termux_step_post_get_source() { mv $TERMUX_PKG_SRCDIR/libimagequant-$TERMUX_PKG_VERSION/* $TERMUX_PKG_SRCDIR/lib/ } diff --git a/packages/swift/build.sh b/packages/swift/build.sh index aa5c564d0..31f6af07d 100644 --- a/packages/swift/build.sh +++ b/packages/swift/build.sh @@ -28,7 +28,7 @@ SWIFT_BUILD_FLAGS="$SWIFT_ANDROID_NDK_FLAGS --build-toolchain-only --build-swift-dynamic-stdlib=0 --build-swift-dynamic-sdk-overlay=0" fi -termux_step_post_extract_package() { +termux_step_post_get_source() { if [ "$TERMUX_PKG_QUICK_REBUILD" = "false" ]; then # The Swift build-script requires a particular organization of source directories, # which the following sets up. diff --git a/packages/timewarrior/build.sh b/packages/timewarrior/build.sh index 68bb1c64e..2f691e8d3 100644 --- a/packages/timewarrior/build.sh +++ b/packages/timewarrior/build.sh @@ -10,7 +10,7 @@ TERMUX_PKG_SHA256=(6199304fc9697a2eb78c542357aec984924bc2ecad90f3bedf1f6299fe345 c37f52fc39c62b3391a0eae061cef2c4079dfd4af0e3bdabac1be98316f9c451) TERMUX_PKG_DEPENDS="libandroid-glob, libc++" -termux_step_post_extract_package() { +termux_step_post_get_source() { rmdir src/libshared mv libshared-${_LIBSHARED_COMMIT}/ src/libshared } diff --git a/packages/tintin++/build.sh b/packages/tintin++/build.sh index 2fe69551e..3f46544f5 100644 --- a/packages/tintin++/build.sh +++ b/packages/tintin++/build.sh @@ -9,7 +9,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="ac_cv_file__dev_ptmx=no" TERMUX_PKG_DEPENDS="pcre, libgnutls, zlib" TERMUX_PKG_BUILD_IN_SRC=true -termux_step_post_extract_package() { +termux_step_post_get_source() { TERMUX_PKG_SRCDIR+="/src" TERMUX_PKG_BUILDDIR="$TERMUX_PKG_SRCDIR" } diff --git a/packages/tsocks/build.sh b/packages/tsocks/build.sh index 119d3b2e3..4620cbbab 100644 --- a/packages/tsocks/build.sh +++ b/packages/tsocks/build.sh @@ -9,7 +9,7 @@ TERMUX_PKG_SHA256=849d7ef5af80d03e76cc05ed9fb8fa2bcc2b724b51ebfd1b6be11c7863f5b3 TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --with-conf=$TERMUX_PREFIX/etc/tsocks.conf" -termux_step_post_extract_package() { +termux_step_post_get_source() { cp $TERMUX_PKG_SRCDIR/tsocks-1.8/* $TERMUX_PKG_SRCDIR/ }