commit:     c17e8df006b0c4ff17e41f602323a58a4ca45aa9
Author:     Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
AuthorDate: Tue May  6 20:03:15 2025 +0000
Commit:     Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
CommitDate: Wed May  7 05:41:06 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c17e8df0

dev-db/postgresql: use dot-a.eclass

... to avoid installing broken static libraries w/ LTO.

Signed-off-by: Eli Schwartz <eschwartz <AT> gentoo.org>

 dev-db/postgresql/postgresql-13.20.ebuild | 5 ++++-
 dev-db/postgresql/postgresql-14.17.ebuild | 5 ++++-
 dev-db/postgresql/postgresql-15.12.ebuild | 5 ++++-
 dev-db/postgresql/postgresql-16.8.ebuild  | 5 ++++-
 dev-db/postgresql/postgresql-17.4.ebuild  | 5 ++++-
 dev-db/postgresql/postgresql-9999.ebuild  | 5 ++++-
 6 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/dev-db/postgresql/postgresql-13.20.ebuild 
b/dev-db/postgresql/postgresql-13.20.ebuild
index 7729f87d6ba4..e335f4faaee8 100644
--- a/dev-db/postgresql/postgresql-13.20.ebuild
+++ b/dev-db/postgresql/postgresql-13.20.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{10,11,12,13} )
 LLVM_COMPAT=( {15..20} )
 LLVM_OPTIONAL=1
 
-inherit flag-o-matic linux-info llvm-r1 pam python-single-r1 systemd tmpfiles
+inherit dot-a flag-o-matic linux-info llvm-r1 pam python-single-r1 systemd 
tmpfiles
 
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
@@ -115,6 +115,8 @@ src_prepare() {
 }
 
 src_configure() {
+       lto-guarantee-fat
+
        case ${CHOST} in
                *-darwin*|*-solaris*)
                        use nls && append-libs intl
@@ -230,6 +232,7 @@ src_install() {
        use static-libs || \
                find "${ED}" -name '*.a' ! -name libpgport.a ! -name 
libpgcommon.a \
                         -delete
+       strip-lto-bytecode "${ED}"
 
        # Make slot specific links to programs
        local f bn

diff --git a/dev-db/postgresql/postgresql-14.17.ebuild 
b/dev-db/postgresql/postgresql-14.17.ebuild
index 6f039209b493..0d552940b68f 100644
--- a/dev-db/postgresql/postgresql-14.17.ebuild
+++ b/dev-db/postgresql/postgresql-14.17.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{10,11,12,13} )
 LLVM_COMPAT=( {15..20} )
 LLVM_OPTIONAL=1
 
-inherit flag-o-matic linux-info llvm-r1 pam python-single-r1 systemd tmpfiles
+inherit dot-a flag-o-matic linux-info llvm-r1 pam python-single-r1 systemd 
tmpfiles
 
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
@@ -114,6 +114,8 @@ src_prepare() {
 }
 
 src_configure() {
+       lto-guarantee-fat
+
        case ${CHOST} in
                *-darwin*|*-solaris*)
                        use nls && append-libs intl
@@ -230,6 +232,7 @@ src_install() {
        use static-libs || \
                find "${ED}" -name '*.a' ! -name libpgport.a ! -name 
libpgcommon.a \
                         -delete
+       strip-lto-bytecode "${ED}"
 
        # Make slot specific links to programs
        local f bn

diff --git a/dev-db/postgresql/postgresql-15.12.ebuild 
b/dev-db/postgresql/postgresql-15.12.ebuild
index 6df4844e003d..58b2bdc98692 100644
--- a/dev-db/postgresql/postgresql-15.12.ebuild
+++ b/dev-db/postgresql/postgresql-15.12.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{10,11,12,13} )
 LLVM_COMPAT=( {15..20} )
 LLVM_OPTIONAL=1
 
-inherit flag-o-matic linux-info llvm-r1 pam python-single-r1 systemd tmpfiles
+inherit dot-a flag-o-matic linux-info llvm-r1 pam python-single-r1 systemd 
tmpfiles
 
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 
sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
@@ -115,6 +115,8 @@ src_prepare() {
 }
 
 src_configure() {
+       lto-guarantee-fat
+
        case ${CHOST} in
                *-darwin*|*-solaris*)
                        use nls && append-libs intl
@@ -232,6 +234,7 @@ src_install() {
        use static-libs || \
                find "${ED}" -name '*.a' ! -name libpgport.a ! -name 
libpgcommon.a \
                         -delete
+       strip-lto-bytecode "${ED}"
 
        # Make slot specific links to programs
        local f bn

diff --git a/dev-db/postgresql/postgresql-16.8.ebuild 
b/dev-db/postgresql/postgresql-16.8.ebuild
index a9d7d1d4bb16..c66390dac89a 100644
--- a/dev-db/postgresql/postgresql-16.8.ebuild
+++ b/dev-db/postgresql/postgresql-16.8.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{10,11,12,13} )
 LLVM_COMPAT=( {15..20} )
 LLVM_OPTIONAL=1
 
-inherit flag-o-matic linux-info llvm-r1 pam python-single-r1 systemd tmpfiles
+inherit dot-a flag-o-matic linux-info llvm-r1 pam python-single-r1 systemd 
tmpfiles
 
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 
sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
@@ -116,6 +116,8 @@ src_prepare() {
 }
 
 src_configure() {
+       lto-guarantee-fat
+
        case ${CHOST} in
                *-darwin*|*-solaris*)
                        use nls && append-libs intl
@@ -233,6 +235,7 @@ src_install() {
        use static-libs || \
                find "${ED}" -name '*.a' ! -name libpgport.a ! -name 
libpgcommon.a \
                         -delete
+       strip-lto-bytecode "${ED}"
 
        # Make slot specific links to programs
        local f bn

diff --git a/dev-db/postgresql/postgresql-17.4.ebuild 
b/dev-db/postgresql/postgresql-17.4.ebuild
index 4f42b00fe030..1fbe117d7d89 100644
--- a/dev-db/postgresql/postgresql-17.4.ebuild
+++ b/dev-db/postgresql/postgresql-17.4.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{10,11,12,13} )
 LLVM_COMPAT=( {15..20} )
 LLVM_OPTIONAL=1
 
-inherit flag-o-matic linux-info llvm-r1 pam python-single-r1 systemd tmpfiles
+inherit dot-a flag-o-matic linux-info llvm-r1 pam python-single-r1 systemd 
tmpfiles
 
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 
sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
@@ -128,6 +128,8 @@ src_prepare() {
 }
 
 src_configure() {
+       lto-guarantee-fat
+
        # Fails to build with C23, fallback to the old default in < GCC 15
        # for now: https://marc.info/?l=pgsql-bugs&m=173185132906874&w=2
        append-cflags -std=gnu17
@@ -250,6 +252,7 @@ src_install() {
        use static-libs || \
                find "${ED}" -name '*.a' ! -name libpgport.a ! -name 
libpgcommon.a \
                         -delete
+       strip-lto-bytecode "${ED}"
 
        # Make slot specific links to programs
        local f bn

diff --git a/dev-db/postgresql/postgresql-9999.ebuild 
b/dev-db/postgresql/postgresql-9999.ebuild
index 2447d33b3159..52a54384b01b 100644
--- a/dev-db/postgresql/postgresql-9999.ebuild
+++ b/dev-db/postgresql/postgresql-9999.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{10,11,12,13} )
 LLVM_COMPAT=( {15..20} )
 LLVM_OPTIONAL=1
 
-inherit flag-o-matic linux-info llvm-r1 meson pam python-single-r1 \
+inherit dot-a flag-o-matic linux-info llvm-r1 meson pam python-single-r1 \
                systemd tmpfiles
 
 DESCRIPTION="PostgreSQL RDBMS"
@@ -146,6 +146,8 @@ src_prepare() {
 }
 
 src_configure() {
+       lto-guarantee-fat
+
        # Fails to build with C23, fallback to the old default in < GCC 15
        # for now: https://marc.info/?l=pgsql-bugs&m=173185132906874&w=2
        append-cflags -std=gnu17
@@ -297,6 +299,7 @@ src_install() {
        use static-libs || \
                find "${ED}" -name '*.a' ! -name libpgport.a ! -name 
libpgcommon.a \
                         -delete
+       strip-lto-bytecode "${ED}"
 
        if use systemd; then
                newbin "${FILESDIR}/${PN}-check-db-dir" 
"${PN}-${SLOT}-check-db-dir"

Reply via email to