X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/3f300a10fc7d4d34642f80368bb02f2898f7fb8a..3d0baea2bb61f49e294831f8b6e334a7b93bdb25:/packages/apt/build.sh

diff --git a/packages/apt/build.sh b/packages/apt/build.sh
index 514ea6cc..90c5e4fa 100644
--- a/packages/apt/build.sh
+++ b/packages/apt/build.sh
@@ -1,9 +1,10 @@
 TERMUX_PKG_HOMEPAGE=https://packages.debian.org/apt
 TERMUX_PKG_DESCRIPTION="Front-end for the dpkg package manager"
-TERMUX_PKG_DEPENDS="liblzma, dpkg, gnupg"
+TERMUX_PKG_DEPENDS="liblzma, dpkg, gpgv"
 # Wait with updating to later version until the NDK supports std::to_string() and other
 # functions (hopefully in r13):
 TERMUX_PKG_VERSION=1.2.12
+TERMUX_PKG_BUILD_REVISION=1
 # TERMUX_PKG_SRCURL=http://ftp.debian.org/debian/pool/main/a/apt/apt_${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_SRCURL=https://launchpad.net/ubuntu/+archive/primary/+files/apt_${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--host=${TERMUX_ARCH}-linux --disable-rpath acl_cv_rpath=$TERMUX_PREFIX/lib gt_cv_func_CFPreferencesCopyAppValue=no gt_cv_func_CFLocaleCopyCurrent=no ac_cv_c_bigendian=no --no-create"
@@ -13,13 +14,13 @@ TERMUX_PKG_FOLDERNAME=apt-${TERMUX_PKG_VERSION}
 TERMUX_PKG_ESSENTIAL=yes
 TERMUX_PKG_CONFFILES="etc/apt/sources.list"
 
-# Some files use STD*_FILENO without including <unistd.h> where they are declared.
-# Define them here to avoid having to patch files:
-CXXFLAGS+=" -DSTDIN_FILENO=0 -DSTDOUT_FILENO=1 -DSTDERR_FILENO=2 -DAI_IDN=0"
-
 termux_step_pre_configure () {
-	cp $TERMUX_COMMON_CACHEDIR/config.{guess,sub} $TERMUX_PKG_SRCDIR/buildlib
-        perl -p -i -e "s/TERMUX_ARCH/$TERMUX_ARCH/" $TERMUX_PKG_SRCDIR/configure
+	# Some files use STD*_FILENO without including <unistd.h> where they are declared.
+	# Define them here to avoid having to patch files:
+	CXXFLAGS+=" -DSTDIN_FILENO=0 -DSTDOUT_FILENO=1 -DSTDERR_FILENO=2 -DAI_IDN=0"
+
+	cp $TERMUX_SCRIPTDIR/scripts/config.{guess,sub} $TERMUX_PKG_SRCDIR/buildlib
+	perl -p -i -e "s/TERMUX_ARCH/$TERMUX_ARCH/" $TERMUX_PKG_SRCDIR/configure
 
 	rm $TERMUX_PKG_SRCDIR/apt-pkg/{cdrom.cc,indexcopy.cc}
 }