commit:     c273403f0950cbaaea87ddf9eeef78ee56742371
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Oct  9 19:48:37 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Oct  9 19:48:37 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c273403f

sys-devel/clang-common: Move common config into gentoo-common.cfg

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 ...{clang-common-15.0.2.ebuild => clang-common-15.0.2-r1.ebuild} | 9 +++++++--
 sys-devel/clang-common/clang-common-15.0.2.9999.ebuild           | 9 +++++++--
 sys-devel/clang-common/clang-common-16.0.0.9999.ebuild           | 9 +++++++--
 ...20221006.ebuild => clang-common-16.0.0_pre20221006-r1.ebuild} | 9 +++++++--
 4 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/sys-devel/clang-common/clang-common-15.0.2.ebuild 
b/sys-devel/clang-common/clang-common-15.0.2-r1.ebuild
similarity index 93%
rename from sys-devel/clang-common/clang-common-15.0.2.ebuild
rename to sys-devel/clang-common/clang-common-15.0.2-r1.ebuild
index 71e8aa15b6d8..9962f257ccc0 100644
--- a/sys-devel/clang-common/clang-common-15.0.2.ebuild
+++ b/sys-devel/clang-common/clang-common-15.0.2-r1.ebuild
@@ -76,12 +76,17 @@ src_install() {
                # It is used to specify the selected GCC installation.
        EOF
 
+       newins - gentoo-common.cfg <<-EOF
+               # This file contains flags common to clang, clang++ and 
clang-cpp.
+               @gentoo-runtimes.cfg
+               @gentoo-gcc-install.cfg
+       EOF
+
        local tool
        for tool in clang{,++,-cpp}; do
                newins - "${tool}.cfg" <<-EOF
                        # This configuration file is used by ${tool} driver.
-                       @gentoo-runtimes.cfg
-                       @gentoo-gcc-install.cfg
+                       @gentoo-common.cfg
                EOF
        done
 }

diff --git a/sys-devel/clang-common/clang-common-15.0.2.9999.ebuild 
b/sys-devel/clang-common/clang-common-15.0.2.9999.ebuild
index e318815568c5..0ff52691cc71 100644
--- a/sys-devel/clang-common/clang-common-15.0.2.9999.ebuild
+++ b/sys-devel/clang-common/clang-common-15.0.2.9999.ebuild
@@ -75,12 +75,17 @@ src_install() {
                # It is used to specify the selected GCC installation.
        EOF
 
+       newins - gentoo-common.cfg <<-EOF
+               # This file contains flags common to clang, clang++ and 
clang-cpp.
+               @gentoo-runtimes.cfg
+               @gentoo-gcc-install.cfg
+       EOF
+
        local tool
        for tool in clang{,++,-cpp}; do
                newins - "${tool}.cfg" <<-EOF
                        # This configuration file is used by ${tool} driver.
-                       @gentoo-runtimes.cfg
-                       @gentoo-gcc-install.cfg
+                       @gentoo-common.cfg
                EOF
        done
 }

diff --git a/sys-devel/clang-common/clang-common-16.0.0.9999.ebuild 
b/sys-devel/clang-common/clang-common-16.0.0.9999.ebuild
index e318815568c5..0ff52691cc71 100644
--- a/sys-devel/clang-common/clang-common-16.0.0.9999.ebuild
+++ b/sys-devel/clang-common/clang-common-16.0.0.9999.ebuild
@@ -75,12 +75,17 @@ src_install() {
                # It is used to specify the selected GCC installation.
        EOF
 
+       newins - gentoo-common.cfg <<-EOF
+               # This file contains flags common to clang, clang++ and 
clang-cpp.
+               @gentoo-runtimes.cfg
+               @gentoo-gcc-install.cfg
+       EOF
+
        local tool
        for tool in clang{,++,-cpp}; do
                newins - "${tool}.cfg" <<-EOF
                        # This configuration file is used by ${tool} driver.
-                       @gentoo-runtimes.cfg
-                       @gentoo-gcc-install.cfg
+                       @gentoo-common.cfg
                EOF
        done
 }

diff --git a/sys-devel/clang-common/clang-common-16.0.0_pre20221006.ebuild 
b/sys-devel/clang-common/clang-common-16.0.0_pre20221006-r1.ebuild
similarity index 93%
rename from sys-devel/clang-common/clang-common-16.0.0_pre20221006.ebuild
rename to sys-devel/clang-common/clang-common-16.0.0_pre20221006-r1.ebuild
index e318815568c5..0ff52691cc71 100644
--- a/sys-devel/clang-common/clang-common-16.0.0_pre20221006.ebuild
+++ b/sys-devel/clang-common/clang-common-16.0.0_pre20221006-r1.ebuild
@@ -75,12 +75,17 @@ src_install() {
                # It is used to specify the selected GCC installation.
        EOF
 
+       newins - gentoo-common.cfg <<-EOF
+               # This file contains flags common to clang, clang++ and 
clang-cpp.
+               @gentoo-runtimes.cfg
+               @gentoo-gcc-install.cfg
+       EOF
+
        local tool
        for tool in clang{,++,-cpp}; do
                newins - "${tool}.cfg" <<-EOF
                        # This configuration file is used by ${tool} driver.
-                       @gentoo-runtimes.cfg
-                       @gentoo-gcc-install.cfg
+                       @gentoo-common.cfg
                EOF
        done
 }

Reply via email to