jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

git: correct utf-16 and utf-32 conversion on musl

Browse source 
musl's iconv treats utf-{16,32} encoding as utf-{16,32}be,
without BOM, correctly according to POSIX.

However, most tools out there think differently.

Change the build flag for the musl system to fix it.

Together with my patch here:
840c40cea1

git's test: t0028 should be fine now.
This commit is contained in:
Doan Tran Cong Danh 2019-10-30 16:30:20 +07:00 committed by Helmut Pozimski
parent 0f76ac7a3b
commit 82a5337c07
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
srcpkgs/git/template
View file

@ -1,7 +1,7 @@
# Template file for 'git'
pkgname=git
version=2.23.0
revision=1
revision=2
build_style=gnu-configure
configure_args="--with-curl --with-expat --with-tcltk --with-libpcre2
ac_cv_snprintf_returns_bogus=no"
@ -13,7 +13,7 @@ makedepends="libglib-devel libcurl-devel libsecret-devel pcre2-devel tk-devel"
# Required by https://
depends="ca-certificates perl-Authen-SASL perl-MIME-tools perl-Net-SMTP-SSL"
short_desc="Git Tree History Storage Tool"
maintainer="Orphaned <orphan@voidlinux.org>"
maintainer="Doan Tran Cong Danh <congdanhqx@gmail.com>"
license="GPL-2.0-only"
homepage="https://git-scm.com/"
changelog="https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/${version}.txt"
@ -25,7 +25,10 @@ register_shell=/usr/bin/git-shell
subpackages="git-cvs git-svn gitk git-gui git-all git-libsecret"
case "$XBPS_TARGET_MACHINE" in
*-musl) configure_args+=" ac_cv_fread_reads_directories=yes" ;;
*-musl)
configure_args+=" ac_cv_fread_reads_directories=yes"
make_build_args+=" ICONV_OMITS_BOM=Yes"
;;
*) configure_args+=" ac_cv_fread_reads_directories=no" ;;
esac