commit: 5f645198cba114a950d1cf20128a3f25aae08a59 Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org> AuthorDate: Sun Mar 3 23:33:32 2024 +0000 Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org> CommitDate: Sun Mar 3 23:33:32 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f645198
dev-build/netsurf-buildsystem: drop 1.9-r2 Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org> dev-build/netsurf-buildsystem/Manifest | 1 - ...buildsystem-1.9-parallel-pre-post-targets.patch | 74 ---------------------- .../netsurf-buildsystem-1.9-r2.ebuild | 28 -------- 3 files changed, 103 deletions(-) diff --git a/dev-build/netsurf-buildsystem/Manifest b/dev-build/netsurf-buildsystem/Manifest index 7730fa99f8d0..04e085157cb2 100644 --- a/dev-build/netsurf-buildsystem/Manifest +++ b/dev-build/netsurf-buildsystem/Manifest @@ -1,2 +1 @@ DIST buildsystem-1.10.tar.gz 39221 BLAKE2B 99843f0af4c57af2edc78a5ba1a4d0e3988fa622234235b4adc6f556e0550916187f385d2017cbeb42aa8136ee9cb5a987f6b29919b6b37b6b19ec58e62a0a5d SHA512 0b0f9114567e5c0807bbf066f1c507f386dfb43bf993e3fe487b3c77edc6cee8ea573ca1105558e48b78b2c97857791fe1fe65af8e95fa0f4e205ef701677670 -DIST buildsystem-1.9.tar.gz 38723 BLAKE2B 0fc4aae4f9a21058c7e437170e74147f6b6dc20220d53986a212e717846d5738df2771081f000705cd69335fbe61653b24a3e86d454a53b24f9cadd5e7aaac97 SHA512 52d7181af56946b95f22d5cc8fb2c58287fe43c940d4104e4a05744cfe332d0e0ea6da76cb8d635eb34cac4d66f53dc01ac5f440b82a207265d39744f112a80d diff --git a/dev-build/netsurf-buildsystem/files/netsurf-buildsystem-1.9-parallel-pre-post-targets.patch b/dev-build/netsurf-buildsystem/files/netsurf-buildsystem-1.9-parallel-pre-post-targets.patch deleted file mode 100644 index f1e51e7c5251..000000000000 --- a/dev-build/netsurf-buildsystem/files/netsurf-buildsystem-1.9-parallel-pre-post-targets.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 067a5105a76e51eebcdf7e7786d1f91040442d47 Mon Sep 17 00:00:00 2001 -From: Michael Orlitzky <[email protected]> -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 -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 | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/makefiles/Makefile.top b/makefiles/Makefile.top -index 0b0fe22..2a41697 100644 ---- a/makefiles/Makefile.top -+++ b/makefiles/Makefile.top -@@ -422,6 +422,16 @@ else - endif - endif - -+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 -+ - ############################################################################### - # Autogenerated, implied rules - ############################################################################### --- -cgit v1.2.1 - diff --git a/dev-build/netsurf-buildsystem/netsurf-buildsystem-1.9-r2.ebuild b/dev-build/netsurf-buildsystem/netsurf-buildsystem-1.9-r2.ebuild deleted file mode 100644 index b284e33d542c..000000000000 --- a/dev-build/netsurf-buildsystem/netsurf-buildsystem-1.9-r2.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2024 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 -}
