Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] m4: various fixes
@ 2020-10-16 13:27 ev-ermakov
  2020-10-16 15:17 ` sgn
                   ` (4 more replies)
  0 siblings, 5 replies; 6+ messages in thread
From: ev-ermakov @ 2020-10-16 13:27 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 362 bytes --]

There is a new pull request by ev-ermakov against master on the void-packages repository

https://github.com/ev-ermakov/void-packages pkg/m4
https://github.com/void-linux/void-packages/pull/25655

m4: various fixes
Add texinfo in hostmakedepends. Partially fixes #25604.

A patch file from https://github.com/void-linux/void-packages/pull/25655.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pkg/m4-25655.patch --]
[-- Type: text/x-diff, Size: 1245 bytes --]

From d280688062fd2fe65a9b39620b9ababd6e5a49c2 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Fri, 16 Oct 2020 23:59:12 +1100
Subject: [PATCH] m4: various fixes

- require texinfo in hostmakedepends
- fix xlint warnings
---
 srcpkgs/m4/template | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/m4/template b/srcpkgs/m4/template
index 111dc6a6b07..428fdc8fee3 100644
--- a/srcpkgs/m4/template
+++ b/srcpkgs/m4/template
@@ -1,18 +1,19 @@
 # Template file for 'm4'
 pkgname=m4
 version=1.4.18
-revision=2
-patch_args="-Np1"
+revision=3
 bootstrap=yes
-replaces="chroot-m4>=0"
 build_style=gnu-configure
 configure_args="--enable-changeword --enable-threads"
+hostmakedepends="texinfo"
 short_desc="GNU version of UNIX m4 macro language processor"
-homepage="https://www.gnu.org/software/m4/"
-license="GPL-3.0-or-later"
 maintainer="Enno Boland <gottox@voidlinux.org>"
+license="GPL-3.0-or-later"
+homepage="https://www.gnu.org/software/m4/"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
 checksum=f2c1e86ca0a404ff281631bdc8377638992744b175afb806e25871a24a934e07
+replaces="chroot-m4>=0"
+patch_args="-Np1"
 
 pre_check() {
 	case "$XBPS_TARGET_MACHINE" in

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: m4: various fixes
  2020-10-16 13:27 [PR PATCH] m4: various fixes ev-ermakov
@ 2020-10-16 15:17 ` sgn
  2020-10-16 15:19 ` sgn
                   ` (3 subsequent siblings)
  4 siblings, 0 replies; 6+ messages in thread
From: sgn @ 2020-10-16 15:17 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 310 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/25655#issuecomment-710109022

Comment:
Hm, no. I don't think we want that. I prefer to go with this instead: https://github.com/void-linux/void-packages/pull/24343/commits/f48c94727461c07e0bc4ddfb5afef5cbf5d2076f

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: m4: various fixes
  2020-10-16 13:27 [PR PATCH] m4: various fixes ev-ermakov
  2020-10-16 15:17 ` sgn
@ 2020-10-16 15:19 ` sgn
  2020-10-19  7:32 ` fosslinux
                   ` (2 subsequent siblings)
  4 siblings, 0 replies; 6+ messages in thread
From: sgn @ 2020-10-16 15:19 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 889 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/25655#issuecomment-710109022

Comment:
Hm, no. I don't think we want that. I prefer to go with this instead: https://github.com/void-linux/void-packages/pull/24343/commits/f48c94727461c07e0bc4ddfb5afef5cbf5d2076f

```diff
diff --git a/srcpkgs/m4/template b/srcpkgs/m4/template
index 111dc6a6b07..6db163696da 100644
--- a/srcpkgs/m4/template
+++ b/srcpkgs/m4/template
@@ -14,6 +14,11 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
 checksum=f2c1e86ca0a404ff281631bdc8377638992744b175afb806e25871a24a934e07
 
+# Ubuntu 20.04 makeinfo breaks the build with ISO-8859-1 characters
+if [ ! "$CHROOT_READY" ]; then
+	export MAKEINFO=true
+fi
+
 pre_check() {
 	case "$XBPS_TARGET_MACHINE" in
 		*-musl* )

```

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: m4: various fixes
  2020-10-16 13:27 [PR PATCH] m4: various fixes ev-ermakov
  2020-10-16 15:17 ` sgn
  2020-10-16 15:19 ` sgn
@ 2020-10-19  7:32 ` fosslinux
  2020-10-19 15:25 ` sgn
  2020-10-19 15:26 ` sgn
  4 siblings, 0 replies; 6+ messages in thread
From: fosslinux @ 2020-10-19  7:32 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 324 bytes --]

New comment by fosslinux on void-packages repository

https://github.com/void-linux/void-packages/pull/25655#issuecomment-711760003

Comment:
No, we don't want texinfo in the bootstrap, this has been previously discussed.

@sgn I think your patch also needs an `if [ "$CHROOT_READY ]; then hostmakedepends+="texinfo"`



^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: m4: various fixes
  2020-10-16 13:27 [PR PATCH] m4: various fixes ev-ermakov
                   ` (2 preceding siblings ...)
  2020-10-19  7:32 ` fosslinux
@ 2020-10-19 15:25 ` sgn
  2020-10-19 15:26 ` sgn
  4 siblings, 0 replies; 6+ messages in thread
From: sgn @ 2020-10-19 15:25 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 930 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/25655#issuecomment-712243897

Comment:
@fosslinux I don't know, I think I've run the build inside chroot without `texinfo`, but I haven't build `m4` in a while. I could try that later. I guess you mean something like:

```diff
diff --git a/srcpkgs/m4/template b/srcpkgs/m4/template
index 111dc6a6b07..6db163696da 100644
--- a/srcpkgs/m4/template
+++ b/srcpkgs/m4/template
@@ -14,6 +14,11 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
 checksum=f2c1e86ca0a404ff281631bdc8377638992744b175afb806e25871a24a934e07
 
+# Ubuntu 20.04 makeinfo breaks the build with ISO-8859-1 characters
+if [ ! "$CHROOT_READY" ]; then
+	export MAKEINFO=true
+else
+	hostmakedepends="texinfo"
+fi
+
 pre_check() {
 	case "$XBPS_TARGET_MACHINE" in
 		*-musl* )

```

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: m4: various fixes
  2020-10-16 13:27 [PR PATCH] m4: various fixes ev-ermakov
                   ` (3 preceding siblings ...)
  2020-10-19 15:25 ` sgn
@ 2020-10-19 15:26 ` sgn
  4 siblings, 0 replies; 6+ messages in thread
From: sgn @ 2020-10-19 15:26 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 951 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/25655#issuecomment-712243897

Comment:
@fosslinux I don't know, I think I've run the build inside chroot without `texinfo`, but I haven't build `m4` in a while. I could try that later. I guess you mean something like (diff edit manually):

```diff
diff --git a/srcpkgs/m4/template b/srcpkgs/m4/template
index 111dc6a6b07..6db163696da 100644
--- a/srcpkgs/m4/template
+++ b/srcpkgs/m4/template
@@ -14,6 +14,13 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
 checksum=f2c1e86ca0a404ff281631bdc8377638992744b175afb806e25871a24a934e07
 
+# Ubuntu 20.04 makeinfo breaks the build with ISO-8859-1 characters
+if [ ! "$CHROOT_READY" ]; then
+	export MAKEINFO=true
+else
+	hostmakedepends="texinfo"
+fi
+
 pre_check() {
 	case "$XBPS_TARGET_MACHINE" in
 		*-musl* )

```

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2020-10-19 15:26 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-16 13:27 [PR PATCH] m4: various fixes ev-ermakov
2020-10-16 15:17 ` sgn
2020-10-16 15:19 ` sgn
2020-10-19  7:32 ` fosslinux
2020-10-19 15:25 ` sgn
2020-10-19 15:26 ` sgn

Github messages for voidlinux

This inbox may be cloned and mirrored by anyone:

	git clone --mirror http://inbox.vuxu.org/voidlinux-github

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V1 voidlinux-github voidlinux-github/ http://inbox.vuxu.org/voidlinux-github \
		voidlinux-github@inbox.vuxu.org
	public-inbox-index voidlinux-github

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://inbox.vuxu.org/vuxu.github.voidlinux


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git