commit: 0874242d2d3e01946241de05cfc0b80b5cf4dc8a Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org> AuthorDate: Sun Sep 17 21:22:19 2023 +0000 Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org> CommitDate: Sun Sep 17 21:22:19 2023 +0000 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 <mjo <AT> 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 <mich...@orlitzky.com> -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
