commit:     09792f688fc71e165c9512efff4d23afdfb8e3e7
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 28 19:56:24 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jan 28 19:56:47 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09792f68

www-client/chromium: always pass -Wl,--undefined-version if supported

Needed for e.g. mold and also if the ebuild didn't force lld but it's
being used.

Bug: https://bugs.gentoo.org/918897
Signed-off-by: Sam James <sam <AT> gentoo.org>

 www-client/chromium/chromium-120.0.6099.129.ebuild | 5 +++--
 www-client/chromium/chromium-120.0.6099.224.ebuild | 5 +++--
 www-client/chromium/chromium-121.0.6167.85.ebuild  | 7 ++++---
 www-client/chromium/chromium-122.0.6261.6.ebuild   | 7 ++++---
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/www-client/chromium/chromium-120.0.6099.129.ebuild 
b/www-client/chromium/chromium-120.0.6099.129.ebuild
index 671a9a910671..91a4aac3089a 100644
--- a/www-client/chromium/chromium-120.0.6099.129.ebuild
+++ b/www-client/chromium/chromium-120.0.6099.129.ebuild
@@ -719,10 +719,11 @@ chromium_configure() {
                myconf_gn+=" is_clang=false"
        fi
 
+       # https://bugs.gentoo.org/918897#c32
+       append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
+
        # Force lld for lto and pgo builds, otherwise disable, bug 641556
        if needs_lld || use lto || use pgo; then
-               # https://bugs.gentoo.org/918897#c32
-               append-ldflags -Wl,--undefined-version
                myconf_gn+=" use_lld=true"
        else
                myconf_gn+=" use_lld=false"

diff --git a/www-client/chromium/chromium-120.0.6099.224.ebuild 
b/www-client/chromium/chromium-120.0.6099.224.ebuild
index ec304dfd9b96..fc235299b7a4 100644
--- a/www-client/chromium/chromium-120.0.6099.224.ebuild
+++ b/www-client/chromium/chromium-120.0.6099.224.ebuild
@@ -719,10 +719,11 @@ chromium_configure() {
                myconf_gn+=" is_clang=false"
        fi
 
+       # https://bugs.gentoo.org/918897#c32
+       append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
+
        # Force lld for lto and pgo builds, otherwise disable, bug 641556
        if needs_lld || use lto || use pgo; then
-               # https://bugs.gentoo.org/918897#c32
-               append-ldflags -Wl,--undefined-version
                myconf_gn+=" use_lld=true"
        else
                myconf_gn+=" use_lld=false"

diff --git a/www-client/chromium/chromium-121.0.6167.85.ebuild 
b/www-client/chromium/chromium-121.0.6167.85.ebuild
index ce967e9c792f..b763322aa50c 100644
--- a/www-client/chromium/chromium-121.0.6167.85.ebuild
+++ b/www-client/chromium/chromium-121.0.6167.85.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2009-2023 Gentoo Authors
+# Copyright 2009-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -760,10 +760,11 @@ chromium_configure() {
                myconf_gn+=" is_clang=false"
        fi
 
+       # https://bugs.gentoo.org/918897#c32
+       append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
+
        # 641556: Force lld for lto and pgo builds, otherwise disable
        if needs_lld || use lto || use pgo; then
-               # https://bugs.gentoo.org/918897#c32
-               append-ldflags -Wl,--undefined-version
                myconf_gn+=" use_lld=true"
        else
                # This doesn't prevent lld from being used, but rather prevents 
gn from forcing it

diff --git a/www-client/chromium/chromium-122.0.6261.6.ebuild 
b/www-client/chromium/chromium-122.0.6261.6.ebuild
index 191e521abd6b..6fd300f560f1 100644
--- a/www-client/chromium/chromium-122.0.6261.6.ebuild
+++ b/www-client/chromium/chromium-122.0.6261.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2009-2023 Gentoo Authors
+# Copyright 2009-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -765,9 +765,10 @@ chromium_configure() {
                fi
        fi
 
+       # https://bugs.gentoo.org/918897#c32
+       append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
+
        if needs_lld ; then
-               # https://bugs.gentoo.org/918897#c32
-               append-ldflags -Wl,--undefined-version
                myconf_gn+=" use_lld=true"
        else
                # This doesn't prevent lld from being used, but rather prevents 
gn from forcing it

Reply via email to