apt: go back to using host docbook-xsl

manpages were broken
This commit is contained in:
Lucy Phipps 2021-08-08 01:16:31 +01:00 committed by GitHub
parent 036afb7882
commit b6dc2c8e12
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -3,12 +3,11 @@ TERMUX_PKG_DESCRIPTION="Front-end for the dpkg package manager"
TERMUX_PKG_LICENSE="GPL-2.0"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=2.3.7
TERMUX_PKG_REVISION=2
TERMUX_PKG_REVISION=3
TERMUX_PKG_SRCURL=http://deb.debian.org/debian/pool/main/a/apt/apt_${TERMUX_PKG_VERSION}.tar.xz
TERMUX_PKG_SHA256=c946a126263b3ea51a15216689602367c0da95d6878b76dc891ea335d87bd936
# apt-key requires utilities from coreutils, findutils, gpgv, grep, sed.
TERMUX_PKG_DEPENDS="coreutils, dpkg, findutils, gpgv, grep, libandroid-glob, libbz2, libc++, libcurl, libgnutls, liblz4, liblzma, sed, termux-licenses, xxhash, zlib"
TERMUX_PKG_BUILD_DEPENDS="docbook-xsl"
TERMUX_PKG_CONFLICTS="apt-transport-https, libapt-pkg"
TERMUX_PKG_REPLACES="apt-transport-https, libapt-pkg"
TERMUX_PKG_RECOMMENDS="game-repo, science-repo"
@ -28,6 +27,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
-DDPKG_DATADIR=$TERMUX_PREFIX/share/dpkg
-DUSE_NLS=OFF
-DWITH_DOC=OFF
-DDOCBOOK_XSL=/usr/share/xml/docbook/stylesheet/docbook-xsl
"
# ubuntu uses instead $PREFIX/lib instead of $PREFIX/libexec to
@ -64,10 +64,6 @@ termux_step_pre_configure() {
CXXFLAGS+=" -Wno-c++11-narrowing"
# Fix glob() on Android 7.
LDFLAGS+=" -Wl,--no-as-needed -landroid-glob"
# for manpage build
local docbook_xsl_version=$(. $TERMUX_SCRIPTDIR/packages/docbook-xsl/build.sh; echo $TERMUX_PKG_VERSION)
TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" -DDOCBOOK_XSL=$TERMUX_PREFIX/share/xml/docbook/xsl-stylesheets-$docbook_xsl_version"
}
termux_step_post_make_install() {