commit:     917b1db301aab0969dcf083dc6440a0d0b7783d3
Author:     Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Mon May 20 03:26:47 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon May 20 06:31:48 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=917b1db3

sys-apps/man-db: run elibtoolize in non-live ebuild

When building live, we always run eautoreconf. However, even in release
mode we should still run elibtoolize to get important fixes -- such as
the ones that pass through LTO sanity flags to the link phase.

Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-apps/man-db/man-db-2.12.0.ebuild | 5 ++++-
 sys-apps/man-db/man-db-2.12.1.ebuild | 3 +++
 sys-apps/man-db/man-db-9999.ebuild   | 3 +++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/sys-apps/man-db/man-db-2.12.0.ebuild 
b/sys-apps/man-db/man-db-2.12.0.ebuild
index 795e71f73b1f..100ac1d652e1 100644
--- a/sys-apps/man-db/man-db-2.12.0.ebuild
+++ b/sys-apps/man-db/man-db-2.12.0.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
@@ -11,6 +11,7 @@ if [[ ${PV} == *9999 ]] ; then
        inherit autotools git-r3
        EGIT_REPO_URI="https://gitlab.com/man-db/man-db";
 else
+       inherit libtool
        # TODO: Change tarballs to gitlab too...?
        SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
        KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
@@ -73,6 +74,8 @@ src_prepare() {
                sh ./bootstrap "${bootstrap_opts[@]}" || die
 
                eautoreconf
+       else
+               elibtoolize
        fi
 
        hprefixify src/man_db.conf.in

diff --git a/sys-apps/man-db/man-db-2.12.1.ebuild 
b/sys-apps/man-db/man-db-2.12.1.ebuild
index edcfb60226c1..cf68b64447c6 100644
--- a/sys-apps/man-db/man-db-2.12.1.ebuild
+++ b/sys-apps/man-db/man-db-2.12.1.ebuild
@@ -11,6 +11,7 @@ if [[ ${PV} == *9999 ]] ; then
        inherit autotools git-r3
        EGIT_REPO_URI="https://gitlab.com/man-db/man-db";
 else
+       inherit libtool
        # TODO: Change tarballs to gitlab too...?
        SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
        KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
@@ -78,6 +79,8 @@ src_prepare() {
                sh ./bootstrap "${bootstrap_opts[@]}" || die
 
                eautoreconf
+       else
+               elibtoolize
        fi
 
        hprefixify src/man_db.conf.in

diff --git a/sys-apps/man-db/man-db-9999.ebuild 
b/sys-apps/man-db/man-db-9999.ebuild
index edcfb60226c1..cf68b64447c6 100644
--- a/sys-apps/man-db/man-db-9999.ebuild
+++ b/sys-apps/man-db/man-db-9999.ebuild
@@ -11,6 +11,7 @@ if [[ ${PV} == *9999 ]] ; then
        inherit autotools git-r3
        EGIT_REPO_URI="https://gitlab.com/man-db/man-db";
 else
+       inherit libtool
        # TODO: Change tarballs to gitlab too...?
        SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
        KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
@@ -78,6 +79,8 @@ src_prepare() {
                sh ./bootstrap "${bootstrap_opts[@]}" || die
 
                eautoreconf
+       else
+               elibtoolize
        fi
 
        hprefixify src/man_db.conf.in

Reply via email to