Subject: [PATCH] 3.11: git: correct build flag for iconv

From: Đoàn Trần Công Danh <[email-masked]>
Date: Thu, 19 Mar 2020 18:26:36 +0700

t3900 will be fixed in 2.25.0

Signed-off-by: Đoàn Trần Công Danh <[email-masked]>
---
 main/git/APKBUILD | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/main/git/APKBUILD b/main/git/APKBUILD
index cb11c12d2f..c9ceb6dca7 100644
--- a/main/git/APKBUILD
+++ b/main/git/APKBUILD
@@ -21,7 +21,7 @@
 #   - CVE-2017-1000117
 pkgname=git
 pkgver=2.24.1
-pkgrel=0
+pkgrel=1
 pkgdesc="Distributed version control system"
 url="https://www.git-scm.com/"
 arch="all"
@@ -29,7 +29,6 @@ license="GPL-2.0-or-later"
 # we need tcl and tk to be built before git due to git-gui and gitk
 makedepends="zlib-dev openssl-dev curl-dev expat-dev perl-dev python3-dev
 	pcre2-dev asciidoc xmlto perl-error tcl tk"
-options="!check" # Check is currently failing on t3900-i18n-commit.sh ISO-2022-JP.txt
 # note that order matters
 subpackages="$pkgname-doc
 	$pkgname-bash-completion:completion:noarch
@@ -67,6 +66,7 @@ prepare() {
 		USE_LIBPCRE2=YesPlease
 		NO_SYS_POLL_H=1
 		CFLAGS=$CFLAGS
+		ICONV_OMITS_BOM=Yes
 	EOF
 
 	# The multimail hook is installed with git.  Use python3 to avoid an
@@ -82,6 +82,13 @@ build() {
 	make prefix=/usr DESTDIR="$pkgdir" perllibdir=$(_perl_config vendorlib)
 }
 
+check() {
+	make prefix=/usr DESTDIR="$pkgdir" \
+		perllibdir=$(_perl_config vendorlib) \
+		GIT_SKIP_TESTS='t3900 t4061 t4124 t5003 t5616 t5703 t7063' \
+		test
+}
+
 package() {
 	cd "$builddir"
 
-- 
2.26.0.rc2.291.gafcc196a35

---

From: Đoàn Trần Công Danh <[email-masked]>
Date: Thu, 19 Mar 2020 18:26:37 +0700

index 568e7f997e..9eceb253c4 100644
 pkgver=2.25.2
 
 	# The multimail hook is installed with git. Use python3 to avoid an
@@ -81,6 +81,13 @@ build() {
 	make prefix=/usr DESTDIR="$pkgdir" perllibdir=$(_perl_config vendorlib)
 }
 
+check() {
+	make prefix=/usr DESTDIR="$pkgdir" \
+		perllibdir=$(_perl_config vendorlib) \
+		GIT_SKIP_TESTS='t4061 t4124 t5003 t5616 t5703 t7063' \
+		test
+}
+
 package() {
 	make prefix=/usr DESTDIR="$pkgdir" INSTALLDIRS=vendor \
 		perllibdir=$(_perl_config vendorlib) \
-- 
2.26.0.rc2.291.gafcc196a35