Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] ne: update to 3.3.2.
@ 2022-11-06  7:25 mobinmob
  2023-01-24  5:50 ` kruceter
                   ` (3 more replies)
  0 siblings, 4 replies; 6+ messages in thread
From: mobinmob @ 2022-11-06  7:25 UTC (permalink / raw)
  To: ml

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

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

https://github.com/mobinmob/void-packages ne
https://github.com/void-linux/void-packages/pull/40354

ne: update to 3.3.2.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

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

From b2701215ed8a85481d3dc4395336cddd1c2866f4 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 6 Nov 2022 09:24:14 +0200
Subject: [PATCH] ne: update to 3.3.2.

---
 srcpkgs/ne/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ne/template b/srcpkgs/ne/template
index a2a33a66cf40..d40caaf2fd97 100644
--- a/srcpkgs/ne/template
+++ b/srcpkgs/ne/template
@@ -1,6 +1,6 @@
 # Template file for 'ne'
 pkgname=ne
-version=3.3.1
+version=3.3.2
 revision=1
 build_style=gnu-makefile
 hostmakedepends="perl texinfo"
@@ -11,7 +11,7 @@ license="GPL-3.0-only"
 homepage="http://ne.di.unimi.it/"
 changelog="https://raw.githubusercontent.com/vigna/ne/master/NEWS"
 distfiles="https://github.com/vigna/ne/archive/refs/tags/${version}.tar.gz"
-checksum=931f01380b48e539b06d65d80ddf313cce67aab6d7b62462a548253ab9b3e10a
+checksum=9b8b757db22bd8cb783cf063f514143a8c325e5c321af31901e0f76e77455417
 
 do_build() {
 	make CFLAGS="$CFLAGS -std=c99 -D_GNU_SOURCE" CC=$CC ${makejobs}

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

* Re: ne: update to 3.3.2.
  2022-11-06  7:25 [PR PATCH] ne: update to 3.3.2 mobinmob
@ 2023-01-24  5:50 ` kruceter
  2023-01-28 11:08 ` [PR PATCH] [Updated] " mobinmob
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 6+ messages in thread
From: kruceter @ 2023-01-24  5:50 UTC (permalink / raw)
  To: ml

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

New comment by kruceter on void-packages repository

https://github.com/void-linux/void-packages/pull/40354#issuecomment-1401427502

Comment:
Failing `armv6l-musl` is just a coincidence. From what I see in CI logs, it tries to generate headers while using gcc parallelly when generation had not yet been finished.

To prove my point, here is the extrace output:

```sh
/usr/bin/perl /usr/bin/makeinfo -D autohelp ne.texinfo
/usr/bin/perl /usr/bin/makeinfo -D autohelp ne.texinfo
/usr/bin/perl /usr/bin/makeinfo -D autohelp ne.texinfo
/bin/bash /builddir/.xbps-ne/wrappers/arm-linux-musleabihf-gcc -fstack-clash-protection '-D_FORTIFY_SOURCE=2' -O2 -pipe '-march=armv6' '-mfpu=vfp' '-mfloat-abi=hard' '-std=c99' -D_GNU_SOURCE -I/usr/arm-linux-musleabihf/usr/include '-ffile-prefix-map=/builddir/ne-3.3.2=.' -c -o ansi.o ansi.c
/usr/bin/arm-linux-musleabihf-gcc -fstack-clash-protection '-D_FORTIFY_SOURCE=2' -O2 -pipe '-march=armv6' '-mfpu=vfp' '-mfloat-abi=hard' '-std=c99' -D_GNU_SOURCE -I/usr/arm-linux-musleabihf/usr/include '-ffile-prefix-map=/builddir/ne-3.3.2=.' -c -o ansi.o ansi.c
/usr/lib/gcc/arm-linux-musleabihf/12.2.0/cc1 -quiet -I /usr/arm-linux-musleabihf/usr/include -D '_FORTIFY_SOURCE=2' -D _GNU_SOURCE ansi.c -quiet -dumpbase ansi.c -dumpbase-ext .c '-mfpu=vfp' '-mfloat-abi=hard' '-mtls-dialect=gnu' -marm '-mlibarch=armv6+fp' '-march=armv6+fp' -O2 '-std=c99' -fstack-clash-protection '-ffile-prefix-map=/builddir/ne-3.3.2=.' -o -
/usr/lib/gcc/arm-linux-musleabihf/12.2.0/../../../../arm-linux-musleabihf/bin/as -I /usr/arm-linux-musleabihf/usr/include '-march=armv6+fp' '-mfloat-abi=hard' '-mfpu=vfp' '-meabi=5' -o ansi.o
perl info2src.pl
/bin/sh -c 'rm -f ne.info*'
rm -f ne.info
perl info2src.pl
perl info2src.pl
```

And the relevant part of makefile for comparison:

```makefile
enums.h names.c names.h hash.c hash.h help.c help.h ext.c: ne.texinfo version.texinfo info2src.pl
	makeinfo -D autohelp ne.texinfo
	perl info2src.pl
	rm -f ne.info*
```

This recipe was supposed to be executed once to generate all of the listed target files, not by the amount of dedicated cpu cores.

Basically I see two ways to resolve this race: either generate headers and docs separately before `do_build`:

```diff
diff --git a/srcpkgs/ne/template b/srcpkgs/ne/template
index a2a33a66cf..85d06659a0 100644
--- a/srcpkgs/ne/template
+++ b/srcpkgs/ne/template
@@ -1,6 +1,6 @@
 # Template file for 'ne'
 pkgname=ne
-version=3.3.1
+version=3.3.2
 revision=1
 build_style=gnu-makefile
 hostmakedepends="perl texinfo"
@@ -11,8 +11,12 @@ license="GPL-3.0-only"
 homepage="http://ne.di.unimi.it/"
 changelog="https://raw.githubusercontent.com/vigna/ne/master/NEWS"
 distfiles="https://github.com/vigna/ne/archive/refs/tags/${version}.tar.gz"
-checksum=931f01380b48e539b06d65d80ddf313cce67aab6d7b62462a548253ab9b3e10a
+checksum=9b8b757db22bd8cb783cf063f514143a8c325e5c321af31901e0f76e77455417
 
-do_build() {
-	make CFLAGS="$CFLAGS -std=c99 -D_GNU_SOURCE" CC=$CC ${makejobs}
+CFLAGS="-std=c99 -D_GNU_SOURCE"
+
+pre_build() {
+	# docs and headers should be generated sequently before building
+	make -C doc
+	make -C src enums.h
 }
```

or disable parallel builds entirely by using `disable_parallel_build=yes`:

```diff
diff --git a/srcpkgs/ne/template b/srcpkgs/ne/template
index a2a33a66cf..f52de77d8b 100644
--- a/srcpkgs/ne/template
+++ b/srcpkgs/ne/template
@@ -1,6 +1,6 @@
 # Template file for 'ne'
 pkgname=ne
-version=3.3.1
+version=3.3.2
 revision=1
 build_style=gnu-makefile
 hostmakedepends="perl texinfo"
@@ -11,8 +11,7 @@ license="GPL-3.0-only"
 homepage="http://ne.di.unimi.it/"
 changelog="https://raw.githubusercontent.com/vigna/ne/master/NEWS"
 distfiles="https://github.com/vigna/ne/archive/refs/tags/${version}.tar.gz"
-checksum=931f01380b48e539b06d65d80ddf313cce67aab6d7b62462a548253ab9b3e10a
+checksum=9b8b757db22bd8cb783cf063f514143a8c325e5c321af31901e0f76e77455417
+disable_parallel_build=yes
 
-do_build() {
-	make CFLAGS="$CFLAGS -std=c99 -D_GNU_SOURCE" CC=$CC ${makejobs}
-}
+CFLAGS="-std=c99 -D_GNU_SOURCE"
```

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

* Re: [PR PATCH] [Updated] ne: update to 3.3.2.
  2022-11-06  7:25 [PR PATCH] ne: update to 3.3.2 mobinmob
  2023-01-24  5:50 ` kruceter
@ 2023-01-28 11:08 ` mobinmob
  2023-01-28 11:09 ` mobinmob
  2023-01-28 15:14 ` [PR PATCH] [Merged]: " Johnnynator
  3 siblings, 0 replies; 6+ messages in thread
From: mobinmob @ 2023-01-28 11:08 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by mobinmob against master on the void-packages repository

https://github.com/mobinmob/void-packages ne
https://github.com/void-linux/void-packages/pull/40354

ne: update to 3.3.2.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

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

From 491ad4b796ae003375ae1615167361aaa1e1ba69 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 6 Nov 2022 09:24:14 +0200
Subject: [PATCH] ne: update to 3.3.2.

Also:
- disable parallel build and properly define CFLAGS (thanks @kruceter ).
---
 srcpkgs/ne/template | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/ne/template b/srcpkgs/ne/template
index a2a33a66cf40..b5db046bc772 100644
--- a/srcpkgs/ne/template
+++ b/srcpkgs/ne/template
@@ -1,6 +1,6 @@
 # Template file for 'ne'
 pkgname=ne
-version=3.3.1
+version=3.3.2
 revision=1
 build_style=gnu-makefile
 hostmakedepends="perl texinfo"
@@ -11,8 +11,6 @@ license="GPL-3.0-only"
 homepage="http://ne.di.unimi.it/"
 changelog="https://raw.githubusercontent.com/vigna/ne/master/NEWS"
 distfiles="https://github.com/vigna/ne/archive/refs/tags/${version}.tar.gz"
-checksum=931f01380b48e539b06d65d80ddf313cce67aab6d7b62462a548253ab9b3e10a
-
-do_build() {
-	make CFLAGS="$CFLAGS -std=c99 -D_GNU_SOURCE" CC=$CC ${makejobs}
-}
+checksum=9b8b757db22bd8cb783cf063f514143a8c325e5c321af31901e0f76e77455417
+disable_parallel_build=yes
+CFLAGS="-std=c99 -D_GNU_SOURCE"

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

* Re: ne: update to 3.3.2.
  2022-11-06  7:25 [PR PATCH] ne: update to 3.3.2 mobinmob
  2023-01-24  5:50 ` kruceter
  2023-01-28 11:08 ` [PR PATCH] [Updated] " mobinmob
@ 2023-01-28 11:09 ` mobinmob
  2023-01-28 15:14 ` [PR PATCH] [Merged]: " Johnnynator
  3 siblings, 0 replies; 6+ messages in thread
From: mobinmob @ 2023-01-28 11:09 UTC (permalink / raw)
  To: ml

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

New comment by mobinmob on void-packages repository

https://github.com/void-linux/void-packages/pull/40354#issuecomment-1407375610

Comment:
@kruceter Thanks :) Ι disabled parallel builds.


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

* Re: [PR PATCH] [Merged]: ne: update to 3.3.2.
  2022-11-06  7:25 [PR PATCH] ne: update to 3.3.2 mobinmob
                   ` (2 preceding siblings ...)
  2023-01-28 11:09 ` mobinmob
@ 2023-01-28 15:14 ` Johnnynator
  3 siblings, 0 replies; 6+ messages in thread
From: Johnnynator @ 2023-01-28 15:14 UTC (permalink / raw)
  To: ml

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

There's a merged pull request on the void-packages repository

ne: update to 3.3.2.
https://github.com/void-linux/void-packages/pull/40354

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

* [PR PATCH] ne: update to 3.3.2.
@ 2022-10-04 17:59 tpar2911
  0 siblings, 0 replies; 6+ messages in thread
From: tpar2911 @ 2022-10-04 17:59 UTC (permalink / raw)
  To: ml

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

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

https://github.com/tpar2911/void-packages ne
https://github.com/void-linux/void-packages/pull/39717

ne: update to 3.3.2.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

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

From 9ada94ab8c64c04f2fc1b9270553e2a433fec2e9 Mon Sep 17 00:00:00 2001
From: tpar2911 <tadej.paris@protonmail.com>
Date: Tue, 4 Oct 2022 19:59:22 +0200
Subject: [PATCH] ne: update to 3.3.2.

---
 srcpkgs/ne/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ne/template b/srcpkgs/ne/template
index a2a33a66cf40..d40caaf2fd97 100644
--- a/srcpkgs/ne/template
+++ b/srcpkgs/ne/template
@@ -1,6 +1,6 @@
 # Template file for 'ne'
 pkgname=ne
-version=3.3.1
+version=3.3.2
 revision=1
 build_style=gnu-makefile
 hostmakedepends="perl texinfo"
@@ -11,7 +11,7 @@ license="GPL-3.0-only"
 homepage="http://ne.di.unimi.it/"
 changelog="https://raw.githubusercontent.com/vigna/ne/master/NEWS"
 distfiles="https://github.com/vigna/ne/archive/refs/tags/${version}.tar.gz"
-checksum=931f01380b48e539b06d65d80ddf313cce67aab6d7b62462a548253ab9b3e10a
+checksum=9b8b757db22bd8cb783cf063f514143a8c325e5c321af31901e0f76e77455417
 
 do_build() {
 	make CFLAGS="$CFLAGS -std=c99 -D_GNU_SOURCE" CC=$CC ${makejobs}

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

end of thread, other threads:[~2023-01-28 15:14 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-11-06  7:25 [PR PATCH] ne: update to 3.3.2 mobinmob
2023-01-24  5:50 ` kruceter
2023-01-28 11:08 ` [PR PATCH] [Updated] " mobinmob
2023-01-28 11:09 ` mobinmob
2023-01-28 15:14 ` [PR PATCH] [Merged]: " Johnnynator
  -- strict thread matches above, loose matches on Subject: below --
2022-10-04 17:59 [PR PATCH] " tpar2911

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).