From d7439d5074b936940b8c87a2d6769a96ad99b854 Mon Sep 17 00:00:00 2001 From: liyancheng <412998149@qq.com> Date: Mon, 28 Nov 2022 20:26:50 +0800 Subject: [PATCH] [RPM] Remove hard code 'openEuler' in spec file Remove hard code 'openEuler' with %{vendor} in spec file (cherry picked from commit 6ef7dfd48c464b16f784b81d016841c4a9fe0415) --- gcc-12.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gcc-12.spec b/gcc-12.spec index 665e4b9..9b164ef 100644 --- a/gcc-12.spec +++ b/gcc-12.spec @@ -1,4 +1,5 @@ %global scl 1 +%global vendor %{?_vendor:%{_vendor}}%{!?_vendor:openEuler} %global gcc_major 12 @@ -11,7 +12,7 @@ %if 0%{?scl:1} %global scl_prefix gcc-toolset-12- -%global _prefix /opt/openEuler/gcc-toolset-12/root/usr +%global _prefix /opt/%{vendor}/gcc-toolset-12/root/usr %global gcc_ver %{nil} %define binsuffix %{nil} %define __provides_exclude ^lib.*$ @@ -599,7 +600,7 @@ not stable, so plugins must be rebuilt any time GCC is updated. %patch2 -p1 %patch3 -p1 -echo 'openEuler %{version}-%{release}' > gcc/DEV-PHASE +echo '%{vendor} %{version}-%{release}' > gcc/DEV-PHASE cp -a libstdc++-v3/config/cpu/i{4,3}86/atomicity.h -- Gitee