Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/gdbm/
Date: Wed, 27 Apr 2022 01:36:23
Message-Id: 1651023370.ba06b6b628c51a87ef82430dad2f642b669c557b.sam@gentoo
1 commit: ba06b6b628c51a87ef82430dad2f642b669c557b
2 Author: Manoj Gupta <manojgupta <AT> google <DOT> com>
3 AuthorDate: Tue Apr 26 22:02:08 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Wed Apr 27 01:36:10 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba06b6b6
7
8 sys-libs/gdbm: call elibtoolize in src_prepare
9
10 gdbm's default libtool file causes to link with /usr/lib directory
11 i.e. -L/usr/lib which causes linker (LLD) to complain when
12 cross-compiling building for arm32.
13
14 Call elibtoolize in src_prepare to regen files to avoid the
15 linker errors.
16
17 Signed-off-by: Manoj Gupta <manojgupta <AT> google.com>
18 Closes: https://github.com/gentoo/gentoo/pull/25219
19 Signed-off-by: Sam James <sam <AT> gentoo.org>
20
21 sys-libs/gdbm/gdbm-1.23.ebuild | 9 ++++++++-
22 1 file changed, 8 insertions(+), 1 deletion(-)
23
24 diff --git a/sys-libs/gdbm/gdbm-1.23.ebuild b/sys-libs/gdbm/gdbm-1.23.ebuild
25 index 634e8f355c15..3f48806dc843 100644
26 --- a/sys-libs/gdbm/gdbm-1.23.ebuild
27 +++ b/sys-libs/gdbm/gdbm-1.23.ebuild
28 @@ -4,7 +4,7 @@
29 EAPI=7
30
31 VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gdbm.asc
32 -inherit multilib-minimal verify-sig
33 +inherit autotools multilib-minimal verify-sig
34
35 DESCRIPTION="Standard GNU database libraries"
36 HOMEPAGE="https://www.gnu.org/software/gdbm/"
37 @@ -20,6 +20,13 @@ DEPEND="readline? ( sys-libs/readline:=[${MULTILIB_USEDEP}] )"
38 RDEPEND="${DEPEND}"
39 BDEPEND="verify-sig? ( sec-keys/openpgp-keys-gdbm )"
40
41 +src_prepare() {
42 + default
43 + # gdbm ships with very old libtool files, regen to avoid
44 + # errors when cross-compiling.
45 + elibtoolize
46 +}
47 +
48 multilib_src_configure() {
49 # gdbm doesn't appear to use either of these libraries
50 export ac_cv_lib_dbm_main=no ac_cv_lib_ndbm_main=no