diff options
Diffstat (limited to 'dev-util/libtree')
| -rw-r--r-- | dev-util/libtree/Manifest | 3 | ||||
| -rw-r--r-- | dev-util/libtree/files/libtree-3.1.1-test-flags.patch | 49 | ||||
| -rw-r--r-- | dev-util/libtree/libtree-3.1.1.ebuild | 3 |
3 files changed, 53 insertions, 2 deletions
diff --git a/dev-util/libtree/Manifest b/dev-util/libtree/Manifest index 0e71f5fdb0ca..5d6338e21900 100644 --- a/dev-util/libtree/Manifest +++ b/dev-util/libtree/Manifest @@ -1,4 +1,5 @@ AUX libtree-3.1.1-modern-c.patch 4584 BLAKE2B 7a35eb096abc47561506e9a625fcd9c13944e2ba3f781ea81c84b2e44a9bdff33764d76d2da3bea0e2481f168864df4ce594f3270fe4f77bf86627397b6a9b1e SHA512 4fc8910fea3a547eb763c9a24746184b96a11977f9fbc744a15f65ff7a9ef76316f000ed4c3bbcb742df251b37765a394ef103fdbde010f64c6a31d90343fee5 +AUX libtree-3.1.1-test-flags.patch 1316 BLAKE2B 41295a1e2263456a88d7d2ac7fcd2ec6e84cf4b7000f306ef317b25bdfada660a151d336683da23c1ab182b4c6251d3274cfcc022d28711d5a45eba3723e6522 SHA512 c1acc0dd70806eac8f9c2afe687026597659b132748e868e573ae43f008cc3a82e3963efb31f2e4d468ebeb757c2521023523b3b6009f1dae747dda987043674 DIST libtree-3.1.1.tar.gz 79931 BLAKE2B 70359c36a83ad1fb7937e57757f872e067ae167b65ee0bf065a357ac0c4dad2106370fe8a9cca11a477e37bed7266073ceb79947ab9d4b5e7cd0d2a6bacca8e9 SHA512 6b4b41b16edfcaa83c16b566a3afff1de0ecffdd5f91af2c82db95fca678b993e021ca8fac5fd1d37ad60ea2215100a0889ee457ce08019f3888e32c755ba1ce -EBUILD libtree-3.1.1.ebuild 549 BLAKE2B 785a61d60aa93e9fbcf72deb871d4bac784846c45a57cc49e6547897375ea0a5024de00d9886c9e0afaa000bb8b1b2c336cc4a51f4e899c7522410ddcfe048e8 SHA512 7d6ad05b7ac663453c0b77c763a195900687cc7dcfb606d1620e1ccb52b1e3b28446183c6d6d155e58698eb3b53b897c3ae1a53f2438bb7d5d3adf9d8b4348f0 +EBUILD libtree-3.1.1.ebuild 593 BLAKE2B 769404a2122c43d292eb68ec51d96f6f26cc0e80673673052e9e76b64d81c479deca0f851e56d59f2109e1293e1b1e57edd5eca725f4708d18160a964beb066d SHA512 b1d2e9fb0b8dc8650fcf00d92c4de99cb507c5eb2d86269588f07597134d4a76cee2e2f62c64c743d20a36de665864f7688341c0e73316f2e7b49419551978d9 MISC metadata.xml 320 BLAKE2B 7c5fe56a3cb0f496d86aeec399e20af48e5b951f63f9fca6553488e7d124f5b1c1d7eb73bbc508aecfc246d67667307ac1dd3acc763eb8549d8a904a38e05833 SHA512 d6a205bddcbbbb0099f146861e2285bf6262f2195c484195f5cceed112396a1130451016e133c41dc6cac315eb5e8fbd9b57a4463ac03a5af198d5d8c7a33b39 diff --git a/dev-util/libtree/files/libtree-3.1.1-test-flags.patch b/dev-util/libtree/files/libtree-3.1.1-test-flags.patch new file mode 100644 index 000000000000..f1a53d2f0966 --- /dev/null +++ b/dev-util/libtree/files/libtree-3.1.1-test-flags.patch @@ -0,0 +1,49 @@ +https://bugs.gentoo.org/905774 +https://github.com/haampie/libtree/issues/78 +https://github.com/haampie/libtree/pull/83 + +From 061d3ec62707a526a83482e57d202a66f9d776cd Mon Sep 17 00:00:00 2001 +From: Ismael Luceno <ismael@iodev.co.uk> +Date: Tue, 23 Aug 2022 19:34:39 +0200 +Subject: [PATCH] Test the -m32 and -m64 compiler flags before use + +Fixes: https://github.com/haampie/libtree/issues/78 +Signed-off-by: Ismael Luceno <ismael@iodev.co.uk> +--- a/tests/05_32_bits/Makefile ++++ b/tests/05_32_bits/Makefile +@@ -3,7 +3,7 @@ + + LD_LIBRARY_PATH= + +-.PHONY: clean ++.PHONY: clean check + + all: check + +@@ -21,11 +21,21 @@ exe64: lib64/libx.so + exe32: lib32/libx.so + echo 'extern int a(); int _start(){return a();}' | $(CC) -m32 "-Wl,-rpath,$(CURDIR)/lib64" "-Wl,-rpath,$(CURDIR)/lib32" -o $@ -nostdlib -x c - -Llib32 -lx + +-check: exe32 exe64 +- ../../libtree exe32 +- ../../libtree exe64 +- + clean: + rm -rf lib32 lib64 exe* + + CURDIR ?= $(.CURDIR) ++ ++test-flag = 2>/dev/null ${CC} -E /dev/null ++test-end = && echo y || echo n ++support-m32 != ${test-flag} -m32 ${test-end} ++support-m64 != ${test-flag} -m64 ${test-end} ++ ++check${support-m32:y=}:: exe32 ++ ../../libtree exe32 ++ ++check${support-m64:y=}:: exe64 ++ ../../libtree exe64 ++ ++check${support-m32:n=} check${support-m64:n=}:: ++ @echo WARNING: test skipped at ${CURDIR} + diff --git a/dev-util/libtree/libtree-3.1.1.ebuild b/dev-util/libtree/libtree-3.1.1.ebuild index 78f8742c0517..801e7bc8e4c2 100644 --- a/dev-util/libtree/libtree-3.1.1.ebuild +++ b/dev-util/libtree/libtree-3.1.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -15,6 +15,7 @@ KEYWORDS="~amd64" PATCHES=( "${FILESDIR}"/${P}-modern-c.patch + "${FILESDIR}"/${PN}-3.1.1-test-flags.patch ) src_configure() { |