From 95acf6ed4a18ef862e5a011e52e676cd7cc20203 Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Fri, 3 Mar 2017 13:40:42 +0100 Subject: [PATCH] apt: Fix build failure when libdb is available --- packages/apt/build.sh | 1 + packages/apt/configure.patch | 13 +++++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/packages/apt/build.sh b/packages/apt/build.sh index 1a56e1f69..51f11b749 100644 --- a/packages/apt/build.sh +++ b/packages/apt/build.sh @@ -9,6 +9,7 @@ TERMUX_PKG_VERSION=1.2.12 TERMUX_PKG_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_SHA256=e820d27cba73476df4abcff27dadd1b5847474bfe85f7e9202a9a07526973ea6 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="\ --no-create ac_cv_c_bigendian=no diff --git a/packages/apt/configure.patch b/packages/apt/configure.patch index d121f47f0..5cf86d88d 100644 --- a/packages/apt/configure.patch +++ b/packages/apt/configure.patch @@ -1,6 +1,6 @@ diff -u -r ../apt-1.2.12/configure ./configure ---- ../apt-1.2.12/configure 2016-05-11 08:58:04.000000000 +0000 -+++ ./configure 2017-01-20 14:42:21.801501806 +0000 +--- ../apt-1.2.12/configure 2016-05-11 10:58:04.000000000 +0200 ++++ ./configure 2017-03-03 13:31:05.373948035 +0100 @@ -569,7 +569,7 @@ ac_clean_files= ac_config_libobj_dir=. @@ -10,6 +10,15 @@ diff -u -r ../apt-1.2.12/configure ./configure subdirs= MFLAGS= MAKEFLAGS= +@@ -4611,7 +4611,7 @@ + return 0; + } + _ACEOF +-if ac_fn_c_try_link "$LINENO"; then : ++if false; then : + $as_echo "#define HAVE_BDB 1" >>confdefs.h + + BDBLIB="-ldb" @@ -5056,7 +5056,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking debian architecture" >&5