* [gentoo-commits] repo/gentoo:master commit in: sys-devel/elftoolchain/, sys-devel/elftoolchain/files/
@ 2021-03-30 10:12 David Seifert
0 siblings, 0 replies; 2+ messages in thread
From: David Seifert @ 2021-03-30 10:12 UTC (permalink / raw
To: gentoo-commits
commit: 20c8d59ab2c7910384b505494a6f9299586bb636
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Tue Mar 30 10:11:41 2021 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Mar 30 10:11:41 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20c8d59a
sys-devel/elftoolchain: Build and install all avalable tools
Closes: https://github.com/gentoo/gentoo/pull/20138
Closes: https://bugs.gentoo.org/778452
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
Signed-off-by: David Seifert <soap <AT> gentoo.org>
...n-0.7.1.ebuild => elftoolchain-0.7.1-r1.ebuild} | 26 +++++++++++------
.../files/elftoolchain-0.7.1-fno-common.patch | 34 ++++++++++++++++++++++
2 files changed, 51 insertions(+), 9 deletions(-)
diff --git a/sys-devel/elftoolchain/elftoolchain-0.7.1.ebuild b/sys-devel/elftoolchain/elftoolchain-0.7.1-r1.ebuild
similarity index 71%
rename from sys-devel/elftoolchain/elftoolchain-0.7.1.ebuild
rename to sys-devel/elftoolchain/elftoolchain-0.7.1-r1.ebuild
index 8b4360d6209..f5ede11619d 100644
--- a/sys-devel/elftoolchain/elftoolchain-0.7.1.ebuild
+++ b/sys-devel/elftoolchain/elftoolchain-0.7.1-r1.ebuild
@@ -14,6 +14,7 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
RDEPEND="
+ app-arch/libarchive:=
!dev-libs/elfutils
!dev-libs/libelf"
DEPEND="${RDEPEND}"
@@ -23,8 +24,14 @@ BDEPEND="
>=sys-devel/bmake-20210206
virtual/yacc"
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
+
src_prepare() {
default
+
+ # needs unpackaged TET tools
+ rm -r test || die
+
sed -i -e "s@cc@$(tc-getCC)@" common/native-elf-format || die
sed -i -e "s@readelf@$(tc-getREADELF)@" common/native-elf-format || die
}
@@ -40,16 +47,17 @@ _bmake() {
src_compile() {
export MAKESYSPATH="${BROOT}"/usr/share/mk/bmake
- _bmake -C common
- _bmake -C libelf
+ _bmake
}
src_install() {
- doheader common/elfdefinitions.h
- doheader libelf/{gelf,libelf}.h
-
- dolib.so libelf/libelf.so.1
- dosym libelf.so.1 /usr/$(get_libdir)/libelf.so
-
- dodoc README
+ _bmake \
+ DESTDIR="${D}" \
+ BINDIR="${EPREFIX}"/usr/${CHOST}-elftoolchain/usr/bin \
+ LIBDIR="${EPREFIX}"/usr/$(get_libdir) \
+ DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \
+ install
+
+ # remove static libraries
+ find "${ED}" -name '*.a' -delete || die
}
diff --git a/sys-devel/elftoolchain/files/elftoolchain-0.7.1-fno-common.patch b/sys-devel/elftoolchain/files/elftoolchain-0.7.1-fno-common.patch
new file mode 100644
index 00000000000..d03bff2d4af
--- /dev/null
+++ b/sys-devel/elftoolchain/files/elftoolchain-0.7.1-fno-common.patch
@@ -0,0 +1,34 @@
+Author: Dimitry Andric <dimitry@andric.com>
+Taken from: https://sourceforge.net/p/elftoolchain/code/3879/
+--- a/ld/amd64.h
++++ b/ld/amd64.h
+@@ -26,6 +26,6 @@
+ * $Id$
+ */
+
+-char *amd64_script;
++extern char *amd64_script;
+
+ void amd64_register(struct ld *);
+--- a/ld/i386.h
++++ b/ld/i386.h
+@@ -26,6 +26,6 @@
+ * $Id$
+ */
+
+-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 *);
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-devel/elftoolchain/, sys-devel/elftoolchain/files/
@ 2025-02-25 13:57 Petr Vaněk
0 siblings, 0 replies; 2+ messages in thread
From: Petr Vaněk @ 2025-02-25 13:57 UTC (permalink / raw
To: gentoo-commits
commit: 0db0474a6fb8afdba2d6773d37c346b836ab8186
Author: Petr Vaněk <arkamar <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 25 12:30:30 2025 +0000
Commit: Petr Vaněk <arkamar <AT> gentoo <DOT> org>
CommitDate: Tue Feb 25 13:55:37 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0db0474a
sys-devel/elftoolchain: drop 0.7.1-r2
Signed-off-by: Petr Vaněk <arkamar <AT> gentoo.org>
sys-devel/elftoolchain/Manifest | 1 -
.../elftoolchain/elftoolchain-0.7.1-r2.ebuild | 58 ----------------------
.../files/elftoolchain-0.7.1-fno-common.patch | 34 -------------
3 files changed, 93 deletions(-)
diff --git a/sys-devel/elftoolchain/Manifest b/sys-devel/elftoolchain/Manifest
index d43a208db906..81ceefc81757 100644
--- a/sys-devel/elftoolchain/Manifest
+++ b/sys-devel/elftoolchain/Manifest
@@ -1,2 +1 @@
-DIST elftoolchain-0.7.1.tar.bz2 5361427 BLAKE2B f86204b3c89433948eaf2cd2edc57abf9b77bfab777dc2a840b7aa5fbddfd31665bd27f31d7af2dea09fab0118e201b12802b4da85f8210af29094661f6f1fe5 SHA512 8226c468b393f0d567167a9dd6b16d2a226227e4d05dab8f44550038da44dcbfb92749f8e1a4b130b893675337a6771e24a81f350f3f864b1b8b17402ed23b26
DIST elftoolchain-0.7.1_p20210319.tar.gz 6767324 BLAKE2B c7e068577744fd42a44784e6a2b03ffdaa9dd15e41f4ff2a6d5fd80df24a61a950ff11fa63ebbbaf2c90bc1b19e58f7184a2b883a6f866adcbf0940ad9fca81c SHA512 968d3247e160dd6f90a88e69bf3cb8e6bf2b8216500a0a91699bc2b8d3de22db8f013212813139701e75c3a9eb852bb4c1360e8058f85959e0973e05e4851c8c
diff --git a/sys-devel/elftoolchain/elftoolchain-0.7.1-r2.ebuild b/sys-devel/elftoolchain/elftoolchain-0.7.1-r2.ebuild
deleted file mode 100644
index a237b0a27ce2..000000000000
--- a/sys-devel/elftoolchain/elftoolchain-0.7.1-r2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Libraries/utilities to handle ELF objects (BSD drop in replacement for libelf)"
-HOMEPAGE="https://wiki.freebsd.org/LibElf"
-SRC_URI="https://netcologne.dl.sourceforge.net/project/elftoolchain/Sources/${P}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
- app-arch/libarchive:=
- !dev-libs/elfutils
- !dev-libs/libelf"
-DEPEND="${RDEPEND}"
-BDEPEND="
- dev-vcs/subversion
- sys-apps/lsb-release
- >=dev-build/bmake-20210314-r1
- app-alternatives/yacc"
-
-PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
-
-src_prepare() {
- default
-
- # needs unpackaged TET tools
- rm -r test || die
-
- sed -i -e "s@cc@$(tc-getCC)@" common/native-elf-format || die
- sed -i -e "s@readelf@$(tc-getREADELF)@" common/native-elf-format || die
-}
-
-src_configure() {
- tc-export AR CC LD RANLIB
- export MAKESYSPATH="${BROOT}"/usr/share/mk/bmake
-}
-
-src_compile() {
- bmake || die
-}
-
-src_install() {
- bmake \
- DESTDIR="${D}" \
- BINDIR="${EPREFIX}"/usr/bin/${CHOST}-elftoolchain \
- LIBDIR="${EPREFIX}"/usr/$(get_libdir) \
- DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \
- install || die
-
- # remove static libraries
- find "${ED}" -name '*.a' -delete || die
-}
diff --git a/sys-devel/elftoolchain/files/elftoolchain-0.7.1-fno-common.patch b/sys-devel/elftoolchain/files/elftoolchain-0.7.1-fno-common.patch
deleted file mode 100644
index d03bff2d4af3..000000000000
--- a/sys-devel/elftoolchain/files/elftoolchain-0.7.1-fno-common.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Author: Dimitry Andric <dimitry@andric.com>
-Taken from: https://sourceforge.net/p/elftoolchain/code/3879/
---- a/ld/amd64.h
-+++ b/ld/amd64.h
-@@ -26,6 +26,6 @@
- * $Id$
- */
-
--char *amd64_script;
-+extern char *amd64_script;
-
- void amd64_register(struct ld *);
---- a/ld/i386.h
-+++ b/ld/i386.h
-@@ -26,6 +26,6 @@
- * $Id$
- */
-
--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 *);
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2025-02-25 13:57 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-02-25 13:57 [gentoo-commits] repo/gentoo:master commit in: sys-devel/elftoolchain/, sys-devel/elftoolchain/files/ Petr Vaněk
-- strict thread matches above, loose matches on Subject: below --
2021-03-30 10:12 David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox