diff options
Diffstat (limited to 'sys-devel/mold')
| -rw-r--r-- | sys-devel/mold/Manifest | 7 | ||||
| -rw-r--r-- | sys-devel/mold/files/mold-1.2.1-install-nopython.patch | 34 | ||||
| -rw-r--r-- | sys-devel/mold/mold-1.2.1-r1.ebuild (renamed from sys-devel/mold/mold-1.1.1.ebuild) | 10 | ||||
| -rw-r--r-- | sys-devel/mold/mold-9999.ebuild | 9 |
4 files changed, 54 insertions, 6 deletions
diff --git a/sys-devel/mold/Manifest b/sys-devel/mold/Manifest index 6daf31e37a59..9b23dbe7d4ba 100644 --- a/sys-devel/mold/Manifest +++ b/sys-devel/mold/Manifest @@ -1,6 +1,7 @@ -DIST mold-1.1.1.tar.gz 4530297 BLAKE2B 78f3beee1b463b3ca028fd72ecf92deb9e8848a4f9cb07c7c549666ef3fef038f395dd30e755be2807dc504b4c3f4893ca359154de9c944c2a03e04f37f5ccea SHA512 981d9737ed7a23134b9bafc04db0cd0233ab4fd588a3b250688dba64936fe84f6736168379fc3e4485273bcef11bca70e5c426b043b5d8b9775ae1cd3aea5b52 +AUX mold-1.2.1-install-nopython.patch 1178 BLAKE2B 62092d363291f640567e334a7d16e90640b5e98a972729340527eb1a10f7febd77b6ae6a71e82c93c4d8c3ea04812893b1a42cd7404b3d6aba6bd35ede308567 SHA512 c22cd13018472ecf84fbd9a192c7072e4d7cd263e9bb19a94b1997014b110790266c7ae62977ce716aedb659a5d40be4bc95e8c0dbb2b8b5cf8e1d799fff4887 +DIST mold-1.2.1.tar.gz 4669615 BLAKE2B ba483a479d3eff0ea1dbce0da8c292b6a95c0faee2ac0f52d7be392e41d70e5ff3d7859e43fd721720bfb8331984823f2762acfd9dc51d3f5d8fd0a4865088c9 SHA512 fc39674b00119d09b3275ed7232356f0b25dad1a0f3a498f9db1a4835b6d4f9ea637ca9a643a05591ea895e8751d9bee43cdcb42303beb082462e76ddb42a0f1 DIST mold-1.2.tar.gz 4759743 BLAKE2B 496a4804ac656d52cf54675740091a5e50048a2cc0aae9eab17a08ae88b16e138c364bf76c4d7959cf631d42ed69df3b18207620bf33f6675477ef38bbb0a016 SHA512 1308f5f274867a5d2d2c000a043ce645eff2a0c876fc1bec33c077cd7f5fc0f1f2b983211ca479cebc80f1ed3f3b0ea0d4c8f7e3e7f2124b713354b18ebc8676 -EBUILD mold-1.1.1.ebuild 1899 BLAKE2B 537010414a43b9c333994f779f3cb3d9b006515ec924a5da27d0320669e6b80b3360c5270a607cb67a4d4e449dc971bf079e4cdcbb72a2a20cd29cf085b54ee2 SHA512 8f7b7271adb44c0317a5e8b1f336eb105504edc63dd9934abc9c817631589959a395d2f6f3ee09735239d7a32c17a1301b4b22775bc30c277f31bd20521c88fa +EBUILD mold-1.2.1-r1.ebuild 2077 BLAKE2B dead3180e202c977b360f92f4e373f1f7fc0039ad91fb29a14039c99ccada384032055aa48385ff169977ff57818e93938a5e1ed577987bca71eb79eb79f23dc SHA512 26330e3db2925074bb5597bfe51dbab16ddb4a4b441b6b068d8813f6c2001dc3180f5e56379ab67622a0115801dc1e437c95e8bb437de3f6be262aea1752fd05 EBUILD mold-1.2.ebuild 1966 BLAKE2B 64888a2c9ba37c9c43d656a4cff2173127793b149878cd0ed6d577c4de03d1ac752bdf2804c36112785b2726c0a22df6caa3121bd3d503b1ddcf67d38c86c714 SHA512 f373d1e090b165a728ae132a1aa175b8b3805593c96a1fc64b9a3df139aad930a3d4eee4e5c695f7e31ffca5ff84385b02192283b2cd95a52619849203f2b7bb -EBUILD mold-9999.ebuild 1966 BLAKE2B 64888a2c9ba37c9c43d656a4cff2173127793b149878cd0ed6d577c4de03d1ac752bdf2804c36112785b2726c0a22df6caa3121bd3d503b1ddcf67d38c86c714 SHA512 f373d1e090b165a728ae132a1aa175b8b3805593c96a1fc64b9a3df139aad930a3d4eee4e5c695f7e31ffca5ff84385b02192283b2cd95a52619849203f2b7bb +EBUILD mold-9999.ebuild 2077 BLAKE2B dead3180e202c977b360f92f4e373f1f7fc0039ad91fb29a14039c99ccada384032055aa48385ff169977ff57818e93938a5e1ed577987bca71eb79eb79f23dc SHA512 26330e3db2925074bb5597bfe51dbab16ddb4a4b441b6b068d8813f6c2001dc3180f5e56379ab67622a0115801dc1e437c95e8bb437de3f6be262aea1752fd05 MISC metadata.xml 424 BLAKE2B a1c0cbdcb86c323fa1e6143c9665ec548f7713e74002a25b2fc26c51b60dae00922d3448a5aaecd5027a8cb026a681386ca7dea90657a3e10b25fb194dafc0d3 SHA512 1adc934e78ca0210743a1aa7479ebc4b5ea0b66a348c4408423460f02b404b885d3a8eca6e89ea8ac53ac9c76e85116965f1eef79e3f3e1f0451c8cf5ce0dfd6 diff --git a/sys-devel/mold/files/mold-1.2.1-install-nopython.patch b/sys-devel/mold/files/mold-1.2.1-install-nopython.patch new file mode 100644 index 000000000000..661d3dcf392f --- /dev/null +++ b/sys-devel/mold/files/mold-1.2.1-install-nopython.patch @@ -0,0 +1,34 @@ +From 4fb6d4208cfb20bad4a3491a18e78409b5a8183f Mon Sep 17 00:00:00 2001 +From: Matthew Smith <matt@offtopica.uk> +Date: Sat, 30 Apr 2022 07:42:50 +0100 +Subject: [PATCH] Don't invoke Python to create libexec/mold/ld symlink + +Reverts commits 8073a92614fb59f59570031badab5dd4bc3b4f7f and +5803c3c200f301adc3abdb66df16d3d669712d70. + +Bug #841575 +--- + Makefile | 7 +------ + 1 file changed, 1 insertion(+), 6 deletions(-) + +diff --git a/Makefile b/Makefile +index d1abc850..10e053a9 100644 +--- a/Makefile ++++ b/Makefile +@@ -204,12 +204,7 @@ install: all + $(STRIP) $D$(LIBDIR)/mold/mold-wrapper.so + + $(INSTALL) -d $D$(LIBEXECDIR)/mold +- +-# We want to make a symblink with a relative path, so that users can +-# move the entire directory to other place without breaking the reference. +-# GNU ln supports `--relative` to do that, but that's not supported by +-# non-GNU systems. So we use Python to compute a relative path. +- ln -sf `python3 -c "import os.path; print(os.path.relpath('$(BINDIR)/mold', '$(LIBEXECDIR)/mold'))"` $D$(LIBEXECDIR)/mold/ld ++ ln -sf $(BINDIR)/mold $D$(LIBEXECDIR)/mold/ld + + $(INSTALL) -d $D$(MANDIR)/man1 + $(INSTALL_DATA) docs/mold.1 $D$(MANDIR)/man1 +-- +2.35.3 + diff --git a/sys-devel/mold/mold-1.1.1.ebuild b/sys-devel/mold/mold-1.2.1-r1.ebuild index 5ea54e0926db..87931221e192 100644 --- a/sys-devel/mold/mold-1.1.1.ebuild +++ b/sys-devel/mold/mold-1.2.1-r1.ebuild @@ -28,6 +28,11 @@ RDEPEND=">=dev-cpp/tbb-2021.4.0:= # TODO: restore SYSTEM_XXHASH upstream? DEPEND="${RDEPEND}" +PATCHES=( + # Bug #841575 + "${FILESDIR}"/${PN}-1.2.1-install-nopython.patch +) + pkg_pretend() { # Requires a c++20 compiler, see #831473 if [[ ${MERGE_TYPE} != binary ]]; then @@ -43,7 +48,10 @@ src_prepare() { default # Needs unpackaged dwarfdump - rm test/elf/{compress-debug-sections,compressed-debug-info}.sh || die + rm test/elf/{{dead,compress}-debug-sections,compressed-debug-info}.sh || die + + # Heavy tests, need qemu + rm test/elf/gdb-index-{compress-output,dwarf{2,3,4,5}}.sh || die # Sandbox sadness rm test/elf/run.sh || die diff --git a/sys-devel/mold/mold-9999.ebuild b/sys-devel/mold/mold-9999.ebuild index 83ebef232694..87931221e192 100644 --- a/sys-devel/mold/mold-9999.ebuild +++ b/sys-devel/mold/mold-9999.ebuild @@ -28,6 +28,11 @@ RDEPEND=">=dev-cpp/tbb-2021.4.0:= # TODO: restore SYSTEM_XXHASH upstream? DEPEND="${RDEPEND}" +PATCHES=( + # Bug #841575 + "${FILESDIR}"/${PN}-1.2.1-install-nopython.patch +) + pkg_pretend() { # Requires a c++20 compiler, see #831473 if [[ ${MERGE_TYPE} != binary ]]; then @@ -45,8 +50,8 @@ src_prepare() { # Needs unpackaged dwarfdump rm test/elf/{{dead,compress}-debug-sections,compressed-debug-info}.sh || die - # Heavy test, needs qemu - rm test/elf/gdb-index.sh || die + # Heavy tests, need qemu + rm test/elf/gdb-index-{compress-output,dwarf{2,3,4,5}}.sh || die # Sandbox sadness rm test/elf/run.sh || die |