~alpine/aports

This thread contains a patchset. You're looking at the original emails, but you may wish to use the patch review UI. Review patch
3 3

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

Đoàn Trần Công Danh <congdanhqx@gmail.com>
Details
Message ID
<20200319112637.27462-1-congdanhqx@gmail.com>
DKIM signature
missing
Download raw message
4 years ago
Patch: +9 -2 
t3900 will be fixed in 2.25.0

Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
---
 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

[PATCH] edge: git: correct build flag for iconv

Đoàn Trần Công Danh <congdanhqx@gmail.com>
Details
Message ID
<20200319112637.27462-2-congdanhqx@gmail.com>
In-Reply-To
<20200319112637.27462-1-congdanhqx@gmail.com> (view parent)
DKIM signature
missing
Download raw message
4 years ago
Patch: +9 -2 
Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
---
 main/git/APKBUILD | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/main/git/APKBUILD b/main/git/APKBUILD
index 568e7f997e..9eceb253c4 100644
--- a/main/git/APKBUILD
+++ b/main/git/APKBUILD
@@ -21,7 +21,7 @@
#     - CVE-2017-1000117
pkgname=git
pkgver=2.25.2
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
@@ -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
Kevin Daudt <kdaudt@alpinelinux.org>
Details
Message ID
<20200419171423.GA1801681@alpha>
In-Reply-To
<20200319112637.27462-1-congdanhqx@gmail.com> (view parent)
DKIM signature
missing
Download raw message
4 years ago 
On Thu, Mar 19, 2020 at 06:26:36PM +0700, Đoàn Trần Công Danh wrote:
> t3900 will be fixed in 2.25.0
> 
> Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
> ---
>  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

Hello,

Sorry for taking a bit of time, but these have now been applied. I
needed to disable some more tests to make the test suite pass.

Enabling the git test suite has been on my todo-list for quite a while,
so I really appreciate this contribution.

Thanks, Kevin.
Danh Doan <congdanhqx@gmail.com>
Details
Message ID
<20200419223624.GE28207@danh.dev>
In-Reply-To
<20200419171423.GA1801681@alpha> (view parent)
DKIM signature
missing
Download raw message
4 years ago 
On 2020-04-19 19:14:23+0200, Kevin Daudt <kdaudt@alpinelinux.org> wrote:
> On Thu, Mar 19, 2020 at 06:26:36PM +0700, Đoàn Trần Công Danh wrote:
> > t3900 will be fixed in 2.25.0
> > 
> > Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
> > ---
> > @@ -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
> 
> Hello,
> 
> Sorry for taking a bit of time, but these have now been applied. I
> needed to disable some more tests to make the test suite pass.
> 
> Enabling the git test suite has been on my todo-list for quite a while,
> so I really appreciate this contribution.

No worry.

actualy, only t3900 is really failure.
Other test case is failed because unsupported feature of busybox.

In Git 2.27.0, all test cases should be passed.
My series submited to Git is ready to be merged down to master soon.

-- 
Danh
Reply to thread Export thread (mbox)