dev-libs/elftoolchain: respect CC and LD

12101111 · Jan 14, 2021 · ab03d6a · ab03d6a
1 parent 083b403
commit ab03d6a
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 4 deletions.
diff --git a/dev-libs/elftoolchain/Manifest b/dev-libs/elftoolchain/Manifest
@@ -1,7 +1,8 @@
 AUX 0001-gelf_symshndx-allow-xndxdata-parameter-to-be-NULL.patch 942 BLAKE2B 47632f1d1cc96c83e0048f6d0bafab4a6170363773b3c98e8daf0e82f636ae224f1c51ade554e3deab452c6b46e7207524276c87fd0f83393464a615362c091b SHA512 b1891b5ffd740fad2b0e866f62e7a5c8789cbfa5af19312a515a42d934dea5ad24cee3a6a0831e3a5debef7332f03b42a73b548ae5e5d004553f57dd2f8e9bdb
 AUX elfdefinitions.patch 249 BLAKE2B 61a9f95e0618bf69a39ce59e0a4f6d2aae13e82de3058c6fbc5b86ac0a5b8d64078ddfeb48b45fe086b9c15e4b07695e427369b955eb995cf727109551557f1d SHA512 c5ab502787b700611f79ccd639232995b2b6ccc12069421ff53b592a9bf2c7ecfcf0b48f4650aa7815a1e6d572aa0d3e7ee0f07d0fa3afb412550f28945a35a5
+AUX fix-fno-common.patch 911 BLAKE2B 9f2e73f84c3f10124301d597105edcefd6f02410040fede1e9779ad1d02ad8cae0bafc3b5de49f7cb9174cd13f8eea384577ffd3cee14c906d2b93cd0fbe291b SHA512 6b52ffc58221751ca1959ceb4695b774009f1757b3fc36cfe5091c224319743ffa0b9d529d01d05a3bd9e944d31701c01f919eb47cec836e97659d70277fd8d1
 AUX make-toolchain-version 2277 BLAKE2B aa5c0965467b36bebe12c4aff0f5157e62d21d021c941fb01e435c6755774bbb06d512a88bb0da85e1b0edc3d47609cbfd03f8ede18dfed720932ba22258c1f4 SHA512 ca93397d6f03a4a9100274fb643f7492bdd0143624b55daa432c9f20f2c05bde1b2b625df4baa297bead9605ae1eec9235ebf32701fab03b3fb427233f726c1a
 DIST elftoolchain-0.7.1.tar.bz2 5361427 BLAKE2B f86204b3c89433948eaf2cd2edc57abf9b77bfab777dc2a840b7aa5fbddfd31665bd27f31d7af2dea09fab0118e201b12802b4da85f8210af29094661f6f1fe5 SHA512 8226c468b393f0d567167a9dd6b16d2a226227e4d05dab8f44550038da44dcbfb92749f8e1a4b130b893675337a6771e24a81f350f3f864b1b8b17402ed23b26
-EBUILD elftoolchain-0.7.1.ebuild 1547 BLAKE2B e0335d02cfb64861b1c79a375c9aaccd58216735186abdb371a16e03f55c534c9fdb3eeaf5659e4cee7fcbfb391b3e5e6ada7079d657905b08769e290327e376 SHA512 26e481257b4a43e8700e0041b835a581189a0002a32f65a1d99ff8d0d83fb54125ddb5ea25de319288d741a0980fda8be629d8164856af8dad6ba19d4f0d8503
+EBUILD elftoolchain-0.7.1.ebuild 1739 BLAKE2B 884c227e94d43e3f13d35521db6473924773b081b420026933729799908dbb516cdca95e86d82f0476035b2ab0994046e3a097485a45a3bd162812f85acfa1fb SHA512 ebdbc041ff6dc802f41b0e4a850bd75c7fce7311eb96497c40e4564376154b481062eefb195461e51075d4d0066130a6208bd9fa3ca97178699e4115b3ac2ff2
 EBUILD elftoolchain-9999.ebuild 1295 BLAKE2B f0f8388e8b421ff2e593f71272f8865c4891f2f1b9eb3e9aa2753d5964496d28bca6f745496f4b226f974b20e06984b0ef388fbe8c99ef7aba55a651831f94d8 SHA512 61d175a899588e13bf7ab317131169946948e56974bb4d60de9ef0b7aeafcabc945a771ff1c3db36f24293ee744b0f01e6f8d1b054fc1174135805bc3f46ec76
 MISC metadata.xml 261 BLAKE2B 3f0608510244925a8f2494ada5cf892119e3d00e5bb66814cee24725f67ed7135a411e3bcb7fb27779cc46ffeb5e6834bea9ff3d1fceb4d21cb626a642c7c6d1 SHA512 2ad688a6df1e0ca1950317a0c6e8eeb2cefce97da1a1fc54ce6a8b6b3e509891276a64bba7eef791fb3abade7466f61098cfa420554718f09b7387ac461b19a9
diff --git a/dev-libs/elftoolchain/elftoolchain-0.7.1.ebuild b/dev-libs/elftoolchain/elftoolchain-0.7.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit multilib-minimal toolchain-funcs portability
+inherit multilib-minimal flag-o-matic toolchain-funcs portability
 
 DESCRIPTION="Libraries/utilities to handle ELF objects (BSD drop in replacement for libelf)"
 HOMEPAGE="https://wiki.freebsd.org/LibElf"
@@ -36,21 +36,24 @@ DEPEND="${RDEPEND}
 PATCHES=(
 	"${FILESDIR}/0001-gelf_symshndx-allow-xndxdata-parameter-to-be-NULL.patch"
 	"${FILESDIR}/elfdefinitions.patch"
+	"${FILESDIR}/fix-fno-common.patch"
 )
 
 src_prepare() {
 	default
 	cp ${FILESDIR}/make-toolchain-version libelftc/ || die
 	rm -rf test || die
 	rm -rf documentation || die
+	strip-unsupported-flags
+	filter-flags -fomit-frame-pointer
 }
 
 src_compile() {
-	$(get_bmake) || die
+	MAKE="$(get_bmake)" emake CC="$(tc-getCC)" LD="$(tc-getLD)" || die
 }
 
 src_install() {
-	$(get_bmake) DESTDIR=${ED} install || die
+	MAKE="$(get_bmake)" emake DESTDIR=${ED} install || die
 	if ! use utils; then
 		rm -rf "${ED}"/usr/bin || die
 	else

diff --git a/dev-libs/elftoolchain/files/fix-fno-common.patch b/dev-libs/elftoolchain/files/fix-fno-common.patch
@@ -0,0 +1,40 @@
+--- a/ld/amd64.h
++++ b/ld/amd64.h
+@@ -23,9 +23,9 @@
+  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+  * SUCH DAMAGE.
+  *
+- * $Id: amd64.h 2500 2012-04-29 18:07:43Z kaiwang27 $
++ * $Id: amd64.h 3879 2020-11-07 18:50:43Z jkoshy $
+  */
+
+-char *amd64_script;
++extern char *amd64_script;
+
+ void	amd64_register(struct ld *);
+--- a/ld/i386.h
++++ b/ld/i386.h
+@@ -23,9 +23,9 @@
+  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+  * SUCH DAMAGE.
+  *
+- * $Id: i386.h 2500 2012-04-29 18:07:43Z kaiwang27 $
++ * $Id: i386.h 3879 2020-11-07 18:50:43Z jkoshy $
+  */
+
+-char *i386_script;
++extern char *i386_script;
+
+ void	i386_register(struct ld *);
+--- a/ld/mips.h
++++ b/ld/mips.h
+@@ -23,7 +23,7 @@
+  * SUCH DAMAGE.
+  */
+
+-char *littlemips_script;
+-char *bigmips_script;
++extern char *littlemips_script;
++extern char *bigmips_script;
+
+ void	mips_register(struct ld *);