[gentoo-commits] repo/gentoo:master commit in: dev-util/netsurf-buildsystem/, dev-util/netsurf-buildsystem/files/
commit: 0874242d2d3e01946241de05cfc0b80b5cf4dc8a Author: Michael Orlitzky gentoo org> AuthorDate: Sun Sep 17 21:22:19 2023 + Commit: Michael Orlitzky gentoo org> CommitDate: Sun Sep 17 21:22:19 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0874242d dev-util/netsurf-buildsystem: use upstream version of a patch Our PRE_ and POST_TARGETS patch was merged upstream with a tweak to ensure that rule prerequisites are not empty. Let's use that merged version instead. Signed-off-by: Michael Orlitzky gentoo.org> ...buildsystem-1.9-parallel-pre-post-targets.patch | 38 -- ...r1.ebuild => netsurf-buildsystem-1.9-r2.ebuild} | 0 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/dev-util/netsurf-buildsystem/files/netsurf-buildsystem-1.9-parallel-pre-post-targets.patch b/dev-util/netsurf-buildsystem/files/netsurf-buildsystem-1.9-parallel-pre-post-targets.patch index 8ae044887356..f1e51e7c5251 100644 --- a/dev-util/netsurf-buildsystem/files/netsurf-buildsystem-1.9-parallel-pre-post-targets.patch +++ b/dev-util/netsurf-buildsystem/files/netsurf-buildsystem-1.9-parallel-pre-post-targets.patch @@ -1,10 +1,7 @@ -https://listmaster.pepperfish.net/hyperkitty/list/netsurf-...@netsurf-browser.org/thread/NUOLUXAZS2GYBJ3Q5GCTGSYLKOX3MCME/ - -From 1a6171aa8fd69b20f5c7d2be31ab00539adae959 Mon Sep 17 00:00:00 2001 +From 067a5105a76e51eebcdf7e7786d1f91040442d47 Mon Sep 17 00:00:00 2001 From: Michael Orlitzky -Date: Mon, 14 Aug 2023 12:43:54 -0400 -Subject: [PATCH] makefiles/Makefile.top: dependencies for PRE_ and - POST_TARGETS +Date: Mon, 14 Aug 2023 13:23:09 -0400 +Subject: makefiles/Makefile.top: dependencies for PRE_ and POST_TARGETS The PRE_TARGETS and POST_TARGETS are supposed to be built before and after $(OBJECTS), respectively -- at least according to the comments @@ -48,25 +45,30 @@ Gentoo bug 711200. The fix simply adds the stated dependencies on $(OBJECTS) and $(POST_TARGETS) to guarantee the correct order. --- - makefiles/Makefile.top | 5 + - 1 file changed, 5 insertions(+) + makefiles/Makefile.top | 10 ++ + 1 file changed, 10 insertions(+) diff --git a/makefiles/Makefile.top b/makefiles/Makefile.top -index caac166..dafdfaa 100644 +index 0b0fe22..2a41697 100644 --- a/makefiles/Makefile.top +++ b/makefiles/Makefile.top -@@ -176,6 +176,11 @@ OBJECTS := $(addprefix $(BUILDDIR)/,$(filter %.o, \ - $(subst /,_,$(subst .cmhg,.o,$(SOURCES))) \ - $(subst /,_,$(subst .s,.o,$(SOURCES) +@@ -422,6 +422,16 @@ else + endif + endif -+# Ensure that PRE_TARGETS are built before OBJECTS, and POST_TARGETS -+# after them. ++ifneq ($(PRE_TARGETS),) ++# Ensure that PRE_TARGETS are built before OBJECTS. +$(OBJECTS): $(PRE_TARGETS) ++endif ++ ++ifneq ($(POST_TARGETS),) ++# Ensure that POST_TARGETS are built after OBJECTS. +$(POST_TARGETS): $(OBJECTS) ++endif + - bin_for_test = $(addprefix $(BUILDDIR)/,$(firstword $(subst :, ,$(ITEM - TEST_BINARIES := $(foreach ITEM,$(TEST_ITEMS),$(bin_for_test)) - + ### + # Autogenerated, implied rules + ### -- -2.41.0 +cgit v1.2.1 diff --git a/dev-util/netsurf-buildsystem/netsurf-buildsystem-1.9-r1.ebuild b/dev-util/netsurf-buildsystem/netsurf-buildsystem-1.9-r2.ebuild similarity index 100% rename from dev-util/netsurf-buildsystem/netsurf-buildsystem-1.9-r1.ebuild rename to dev-util/netsurf-buildsystem/netsurf-buildsystem-1.9-r2.ebuild
[gentoo-commits] repo/gentoo:master commit in: dev-util/netsurf-buildsystem/, dev-util/netsurf-buildsystem/files/
commit: 608ba1baed7f84b08ca089305845a9d12ad6b64b
Author: Michael Orlitzky gentoo org>
AuthorDate: Thu Aug 31 01:22:09 2023 +
Commit: Michael Orlitzky gentoo org>
CommitDate: Thu Aug 31 01:22:18 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=608ba1ba
dev-util/netsurf-buildsystem: update EAPI 7 -> 8, fix parallel builds
Add a patch (sent upstream but not yet applied) that ensures that the
PRE_ and POST_TARGETS are actually built before and after the targets.
Closes: https://bugs.gentoo.org/711200
Signed-off-by: Michael Orlitzky gentoo.org>
...buildsystem-1.9-parallel-pre-post-targets.patch | 72 ++
.../netsurf-buildsystem-1.9-r1.ebuild | 28 +
2 files changed, 100 insertions(+)
diff --git
a/dev-util/netsurf-buildsystem/files/netsurf-buildsystem-1.9-parallel-pre-post-targets.patch
b/dev-util/netsurf-buildsystem/files/netsurf-buildsystem-1.9-parallel-pre-post-targets.patch
new file mode 100644
index ..8ae044887356
--- /dev/null
+++
b/dev-util/netsurf-buildsystem/files/netsurf-buildsystem-1.9-parallel-pre-post-targets.patch
@@ -0,0 +1,72 @@
+https://listmaster.pepperfish.net/hyperkitty/list/netsurf-...@netsurf-browser.org/thread/NUOLUXAZS2GYBJ3Q5GCTGSYLKOX3MCME/
+
+From 1a6171aa8fd69b20f5c7d2be31ab00539adae959 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky
+Date: Mon, 14 Aug 2023 12:43:54 -0400
+Subject: [PATCH] makefiles/Makefile.top: dependencies for PRE_ and
+ POST_TARGETS
+
+The PRE_TARGETS and POST_TARGETS are supposed to be built before and
+after $(OBJECTS), respectively -- at least according to the comments
+in Makefile.top:
+
+ # List of targets to run before building $(OBJECT)
+ PRE_TARGETS :=
+ # List of targets to run after building $(OBJECT)
+ POST_TARGETS :=
+
+The default target however builds them at the same time as $(OUTPUT),
+
+ # Default target
+ all: $(PRE_TARGETS) $(OUTPUT) $(POST_TARGETS)
+
+where $(OUTPUT) basically just builds $(OBJECTS):
+
+ $(OUTPUT): $(BUILDDIR)/stamp $(OBJECTS)
+ ...
+
+As a result, there is a race condition when $(OBJECTS) truly requires
+$(PRE_TARGETS), because they may be built at the same time. The same
+problem arises the other way around with $(POST_TARGETS). As a
+demonstration, one can try to build the libsvgtiny shared library
+directly (note: the details are platform-dependent),
+
+ $ BD=build-x86_64-pc-linux-gnu-x86_64-pc-linux-gnu-release-lib-shared
+ $ make COMPONENT_TYPE=lib-shared "${BD}/libsvgtiny.so.0.1.7"
+ COMPILE: src/svgtiny.c
+ ...
+ src/svgtiny.c:24:10: fatal error: autogenerated_colors.c: No such file or
directory
+ 24 | #include "autogenerated_colors.c"
+ | ^~~~
+ compilation terminated.
+
+This is because $(PRE_TARGETS) is not satisfied. In practice, this
+condition seems hard to hit unintentionally, but it can happen if you
+are building in parallel and extemely unlucky. A user discovered it in
+Gentoo bug 711200.
+
+The fix simply adds the stated dependencies on $(OBJECTS) and
+$(POST_TARGETS) to guarantee the correct order.
+---
+ makefiles/Makefile.top | 5 +
+ 1 file changed, 5 insertions(+)
+
+diff --git a/makefiles/Makefile.top b/makefiles/Makefile.top
+index caac166..dafdfaa 100644
+--- a/makefiles/Makefile.top
b/makefiles/Makefile.top
+@@ -176,6 +176,11 @@ OBJECTS := $(addprefix $(BUILDDIR)/,$(filter %.o, \
+ $(subst /,_,$(subst .cmhg,.o,$(SOURCES))) \
+ $(subst /,_,$(subst .s,.o,$(SOURCES)
+
++# Ensure that PRE_TARGETS are built before OBJECTS, and POST_TARGETS
++# after them.
++$(OBJECTS): $(PRE_TARGETS)
++$(POST_TARGETS): $(OBJECTS)
++
+ bin_for_test = $(addprefix $(BUILDDIR)/,$(firstword $(subst :, ,$(ITEM
+ TEST_BINARIES := $(foreach ITEM,$(TEST_ITEMS),$(bin_for_test))
+
+--
+2.41.0
+
diff --git a/dev-util/netsurf-buildsystem/netsurf-buildsystem-1.9-r1.ebuild
b/dev-util/netsurf-buildsystem/netsurf-buildsystem-1.9-r1.ebuild
new file mode 100644
index ..635607a0256b
--- /dev/null
+++ b/dev-util/netsurf-buildsystem/netsurf-buildsystem-1.9-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_P="buildsystem-${PV}"
+DESCRIPTION="Build system used for netsurf and its libs"
+HOMEPAGE="https://www.netsurf-browser.org;
+SRC_URI="https://download.netsurf-browser.org/libs/releases/${MY_P}.tar.gz;
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv
~sparc ~x86"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=( "${FILESDIR}/${P}-parallel-pre-post-targets.patch" )
+
+src_prepare() {
+ default
+ sed -e 's:/bin/which:which:' -i "makefiles/Makefile.tools" || die
+}
+
+src_install() {
+ emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+ insinto /usr/share/netsurf-buildsystem
+ newins "${FILESDIR}/gentoo-helpers-r2.sh" gentoo-helpers.sh
+}
[gentoo-commits] repo/gentoo:master commit in: dev-util/netsurf-buildsystem/, dev-util/netsurf-buildsystem/files/
commit: a010ea0530fa297a41a6d84ff243db56579ddf3d
Author: Sam James gentoo org>
AuthorDate: Sun Apr 17 18:54:38 2022 +
Commit: Sam James gentoo org>
CommitDate: Sun Apr 17 19:00:00 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a010ea05
dev-util/netsurf-buildsystem: drop 1.8-r1
Signed-off-by: Sam James gentoo.org>
dev-util/netsurf-buildsystem/Manifest | 1 -
.../netsurf-buildsystem/files/gentoo-helpers-r1.sh | 22 --
.../netsurf-buildsystem-1.8-r1.ebuild | 26 --
3 files changed, 49 deletions(-)
diff --git a/dev-util/netsurf-buildsystem/Manifest
b/dev-util/netsurf-buildsystem/Manifest
index 91a37af3916f..1e6a45d6ddc2 100644
--- a/dev-util/netsurf-buildsystem/Manifest
+++ b/dev-util/netsurf-buildsystem/Manifest
@@ -1,2 +1 @@
-DIST buildsystem-1.8.tar.gz 38617 BLAKE2B
0fd5539feae0b81828efe90c82baf6ce7fceec2f2189adddb0e32d2106f9263ebd14b32f3dce8daae13110f0e69801caed48ce81709ce09d809ba50041690cc7
SHA512
0f577f4867e5e12770f9b9c42ea55e884362180bc195b6ebf56e56305ce84e230407cd2ebb3b182cc03087ffef5f39187e52e2e2f8f2b86aa20a16fa33bdff8b
DIST buildsystem-1.9.tar.gz 38723 BLAKE2B
0fc4aae4f9a21058c7e437170e74147f6b6dc20220d53986a212e717846d5738df2771081f000705cd69335fbe61653b24a3e86d454a53b24f9cadd5e7aaac97
SHA512
52d7181af56946b95f22d5cc8fb2c58287fe43c940d4104e4a05744cfe332d0e0ea6da76cb8d635eb34cac4d66f53dc01ac5f440b82a207265d39744f112a80d
diff --git a/dev-util/netsurf-buildsystem/files/gentoo-helpers-r1.sh
b/dev-util/netsurf-buildsystem/files/gentoo-helpers-r1.sh
deleted file mode 100644
index e0ea21c898b0..
--- a/dev-util/netsurf-buildsystem/files/gentoo-helpers-r1.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash
-
-netsurf_define_makeconf() {
- NETSURF_MAKECONF=(
- NSSHARED="${EROOT}"/usr/share/netsurf-buildsystem
- LIBDIR="$(get_libdir)"
- PREFIX="${EROOT}/usr"
- Q=
- CC="$(tc-getCC)"
- LD="$(tc-getLD)"
- HOST_CC="\$(CC)"
- BUILD_CC="$(tc-getBUILD_CC)"
- CXX="$(tc-getCXX)"
- BUILD_CXX="$(tc-getBUILD_CXX)"
- CCOPT=
- CCNOOPT=
- CCDBG=
- LDDBG=
- AR="$(tc-getAR)"
- WARNFLAGS=
- )
-}
diff --git a/dev-util/netsurf-buildsystem/netsurf-buildsystem-1.8-r1.ebuild
b/dev-util/netsurf-buildsystem/netsurf-buildsystem-1.8-r1.ebuild
deleted file mode 100644
index a7c8e561fd64..
--- a/dev-util/netsurf-buildsystem/netsurf-buildsystem-1.8-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="buildsystem-${PV}"
-DESCRIPTION="Build system used for netsurf and its libs"
-HOMEPAGE="https://www.netsurf-browser.org;
-SRC_URI="https://download.netsurf-browser.org/libs/releases/${MY_P}.tar.gz;
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- default
- sed -e 's:/bin/which:which:' -i "makefiles/Makefile.tools" || die
-}
-
-src_install() {
- emake DESTDIR="${ED}" PREFIX=/usr install
- insinto /usr/share/netsurf-buildsystem
- newins "${FILESDIR}/gentoo-helpers-r1.sh" gentoo-helpers.sh
-}
[gentoo-commits] repo/gentoo:master commit in: dev-util/netsurf-buildsystem/, dev-util/netsurf-buildsystem/files/
commit: ae58cbc4df32bfc463141f4b8d93012ae86485c6
Author: Jaco Kroon uls co za>
AuthorDate: Sun May 3 17:44:15 2020 +
Commit: Joonas Niilola gentoo org>
CommitDate: Wed May 13 13:16:46 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae58cbc4
dev-util/netsurf-buildsystem: BUILD_CC, CXX and BUILD_CXX
Closes: https://bugs.gentoo.org/718010
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Jaco Kroon uls.co.za>
Closes: https://github.com/gentoo/gentoo/pull/15629
Signed-off-by: Joonas Niilola gentoo.org>
dev-util/netsurf-buildsystem/files/gentoo-helpers-r1.sh| 3 +++
...etsurf-buildsystem-1.8.ebuild => netsurf-buildsystem-1.8-r1.ebuild} | 0
2 files changed, 3 insertions(+)
diff --git a/dev-util/netsurf-buildsystem/files/gentoo-helpers-r1.sh
b/dev-util/netsurf-buildsystem/files/gentoo-helpers-r1.sh
index 9ac4354e386..e0ea21c898b 100644
--- a/dev-util/netsurf-buildsystem/files/gentoo-helpers-r1.sh
+++ b/dev-util/netsurf-buildsystem/files/gentoo-helpers-r1.sh
@@ -9,6 +9,9 @@ netsurf_define_makeconf() {
CC="$(tc-getCC)"
LD="$(tc-getLD)"
HOST_CC="\$(CC)"
+ BUILD_CC="$(tc-getBUILD_CC)"
+ CXX="$(tc-getCXX)"
+ BUILD_CXX="$(tc-getBUILD_CXX)"
CCOPT=
CCNOOPT=
CCDBG=
diff --git a/dev-util/netsurf-buildsystem/netsurf-buildsystem-1.8.ebuild
b/dev-util/netsurf-buildsystem/netsurf-buildsystem-1.8-r1.ebuild
similarity index 100%
rename from dev-util/netsurf-buildsystem/netsurf-buildsystem-1.8.ebuild
rename to dev-util/netsurf-buildsystem/netsurf-buildsystem-1.8-r1.ebuild
