From 89553b6b47f66268074b385593005eacd7b65ccf Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 17 Sep 2023 23:04:25 +0100 Subject: gentoo auto-resync : 17:09:2023 - 23:04:24 --- dev-util/netsurf-buildsystem/Manifest | 4 +-- ...buildsystem-1.9-parallel-pre-post-targets.patch | 38 ++++++++++++---------- .../netsurf-buildsystem-1.9-r1.ebuild | 28 ---------------- .../netsurf-buildsystem-1.9-r2.ebuild | 28 ++++++++++++++++ 4 files changed, 50 insertions(+), 48 deletions(-) delete mode 100644 dev-util/netsurf-buildsystem/netsurf-buildsystem-1.9-r1.ebuild create mode 100644 dev-util/netsurf-buildsystem/netsurf-buildsystem-1.9-r2.ebuild (limited to 'dev-util/netsurf-buildsystem') diff --git a/dev-util/netsurf-buildsystem/Manifest b/dev-util/netsurf-buildsystem/Manifest index 09d4995059e8..ed9a93ecc666 100644 --- a/dev-util/netsurf-buildsystem/Manifest +++ b/dev-util/netsurf-buildsystem/Manifest @@ -1,6 +1,6 @@ AUX gentoo-helpers-r2.sh 388 BLAKE2B 2e7f1fd1eb7d9366514ccad5cb356689005f7028a423b60600ab8297b053ce37b154de37258ef4bfe759bf2b2b4007c3e416eeb3dd9937f75c9c41ef93c1bfc5 SHA512 8aad232d938e4aaac424389833012eb0c29409b8d558cf4cc6e894b7e3baa23ba29364aa1b7a2872bab6b507d52436cd5ecf3d5b42ccc52bcbed2d2c78034b36 -AUX netsurf-buildsystem-1.9-parallel-pre-post-targets.patch 2615 BLAKE2B d13b45dd8e13bc71a3da5dcda5ad149b76cba6753837e699598e3758232183ac4a67ebfc45d5fb5e3efec98abb29b889fe4d21105b0e4644280e14e881e89f7a SHA512 81e6dd7a0d925eb3e2b8254a63f27547f0c8136bec97c14b1f74c18be69145539710c32f02e6422749dde4bcd439c3babef5439a6b285dfe42ee166cacdd4f89 +AUX netsurf-buildsystem-1.9-parallel-pre-post-targets.patch 2512 BLAKE2B 21a78fea7e204f1c2d4e2325309d24aef4f668d9a72f54d5f5da28667d635b52a281e0524dfffd70a9017a29200bde8a99caf4b0030d9f48422395d3416dd649 SHA512 5e951ddbfb88fb10e4936f8fc8e335c67e5416829741299cda1074665b189249e5c1b8a08e465161284a978a407bbef385cfdc0ae343d1132c42664045df1c73 DIST buildsystem-1.9.tar.gz 38723 BLAKE2B 0fc4aae4f9a21058c7e437170e74147f6b6dc20220d53986a212e717846d5738df2771081f000705cd69335fbe61653b24a3e86d454a53b24f9cadd5e7aaac97 SHA512 52d7181af56946b95f22d5cc8fb2c58287fe43c940d4104e4a05744cfe332d0e0ea6da76cb8d635eb34cac4d66f53dc01ac5f440b82a207265d39744f112a80d -EBUILD netsurf-buildsystem-1.9-r1.ebuild 782 BLAKE2B 931ac8c948b00f8e4ba39ec21d94fcd04e3dc6b69a6d3f1c2a7af0e2eae3088e7e48452d740864ca93cecea6ffb7e4c836ef593c747c8ee6302d6b1b60238fcc SHA512 cbc81e0c1109ef6217cd02983b69222ed18c41de08747e29f75f87b1f14ea46aba6446a1c6eae46987ada9591981d29aed054e1b8dab9d0a9be3049e033175a5 +EBUILD netsurf-buildsystem-1.9-r2.ebuild 782 BLAKE2B 931ac8c948b00f8e4ba39ec21d94fcd04e3dc6b69a6d3f1c2a7af0e2eae3088e7e48452d740864ca93cecea6ffb7e4c836ef593c747c8ee6302d6b1b60238fcc SHA512 cbc81e0c1109ef6217cd02983b69222ed18c41de08747e29f75f87b1f14ea46aba6446a1c6eae46987ada9591981d29aed054e1b8dab9d0a9be3049e033175a5 EBUILD netsurf-buildsystem-1.9.ebuild 711 BLAKE2B 2c0ce11ad6c6453b3b71518e5e7b2b0cada0a4e2ce6d4f85896948b241f75af6e265e9e0821578f069bdbe64bc2aeeb74af9191bfa0454b128696d2c14af2f58 SHA512 3a135a769aecab443acd81b2b15aa811b85e8c074ad8ecb9f23ff2e9ba34a0e14140f6e8f3c19664222570880312c3ac4ddff0d15f51d2d7651309d56bb02ea8 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3 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-dev@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-r1.ebuild deleted file mode 100644 index 635607a0256b..000000000000 --- a/dev-util/netsurf-buildsystem/netsurf-buildsystem-1.9-r1.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# 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 -} diff --git a/dev-util/netsurf-buildsystem/netsurf-buildsystem-1.9-r2.ebuild b/dev-util/netsurf-buildsystem/netsurf-buildsystem-1.9-r2.ebuild new file mode 100644 index 000000000000..635607a0256b --- /dev/null +++ b/dev-util/netsurf-buildsystem/netsurf-buildsystem-1.9-r2.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 +} -- cgit v1.2.3