a3d7ce6fce
git build system will trigger a rebuild if it detects
if flags passed to make changed.
In commit 886036d094, ("chroot-git: correct iconv usage on musl",
2019-10-30), we tried to correct the git-iconv interaction on musl,
but we forget to pass that flag into `make install'.
Hence, on do_install, git build system rebuild git without
ICONV_OMITS_BOM=Yes flag, thus produce faulty binary.
Save that flag into config.mak[1] in order to keep it consistent across
build stage.
While we're at it, also move other make_*_args into config.mak
[1]: https://public-inbox.org/git/20191031181116.GC2133@sigill.intra.peff.net/
49 lines
1.3 KiB
Bash
49 lines
1.3 KiB
Bash
# Template file for 'chroot-git'
|
|
pkgname=chroot-git
|
|
version=2.23.0
|
|
revision=3
|
|
bootstrap=yes
|
|
wrksrc="git-${version}"
|
|
build_style=gnu-configure
|
|
configure_args="--without-curl --without-openssl
|
|
--without-python --without-expat --without-tcltk
|
|
ac_cv_lib_curl_curl_global_init=no ac_cv_lib_expat_XML_ParserCreate=no
|
|
ac_cv_snprintf_returns_bogus=no"
|
|
makedepends="zlib-devel"
|
|
short_desc="GIT Tree History Storage Tool -- for xbps-src use"
|
|
maintainer="Enno Boland <gottox@voidlinux.org>"
|
|
license="GPL-2.0-only"
|
|
homepage="https://git-scm.com/"
|
|
distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
|
|
checksum=234fa05b6839e92dc300b2dd78c92ec9c0c8d439f65e1d430a7034f60af16067
|
|
|
|
if [ "$CHROOT_READY" ]; then
|
|
hostmakedepends="perl"
|
|
else
|
|
configure_args+=" --with-zlib=${XBPS_MASTERDIR}/usr"
|
|
fi
|
|
|
|
case "$XBPS_TARGET_MACHINE" in
|
|
*-musl)
|
|
configure_args+=" ac_cv_fread_reads_directories=yes"
|
|
;;
|
|
*) configure_args+=" ac_cv_fread_reads_directories=no" ;;
|
|
esac
|
|
|
|
post_configure() {
|
|
cat <<-EOF >config.mak
|
|
CC_LD_DYNPATH=-L
|
|
NO_INSTALL_HARDLINKS=Yes
|
|
EOF
|
|
case "$XBPS_TARGET_MACHINE" in
|
|
*-musl) echo "ICONV_OMITS_BOM=Yes" >>config.mak ;;
|
|
esac
|
|
}
|
|
|
|
do_install() {
|
|
# remove unneeded stuff.
|
|
make DESTDIR=${wrksrc}/build-tmp install
|
|
|
|
vbin ${wrksrc}/build-tmp/usr/bin/git chroot-git
|
|
}
|