From a6aba05241c31d0627c49c169a746949b79551ca Mon Sep 17 00:00:00 2001 From: shouhuanxiaoji Date: Fri, 28 Feb 2025 14:52:28 +0800 Subject: [PATCH 1/3] fxied a bug caused by 12.3.1.4-1 --- gcc.spec | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/gcc.spec b/gcc.spec index a679589..5b2e2e5 100644 --- a/gcc.spec +++ b/gcc.spec @@ -1,6 +1,6 @@ %global gcc_version 12.3.1.4 %global gcc_major 12 -%global gcc_release 1 +%global gcc_release 2 %global isl_version 0.18 %global tgcc_summary Tencent Compiler %global _unpackaged_files_terminate_build 0 @@ -1581,6 +1581,17 @@ pushd %{buildroot}%{_prefix}/lib/gcc/ ln -s %{gcc_target_platform} %{_arch}-linux-gnu popd +pushd %{buildroot}%{_libdir}/go/%{gcc_major}/ +ln -s %{gcc_target_platform} %{_arch}-linux-gnu +popd + +pushd %{buildroot}%{_includedir}/c++/%{gcc_major}/ +ln -s %{gcc_target_platform} %{_arch}-linux-gnu +popd + +pushd %{buildroot}%{_libexecdir}/gcc/ +ln -s %{gcc_target_platform} %{_arch}-linux-gnu +popd %check @@ -2412,6 +2423,10 @@ end %changelog +* Fri Feb 28 2025 Zhao Zhen - 12.3.1.4-2 +- [Type] bugfix +- [DESC] fixed triple link, caused by 12.3.1.4-1, take building error of clang + * Thu Dec 05 2024 Zhao Zhen - 12.3.1.4-1 - [Type] other - [DESC] Improved KunPeng feature -- Gitee From ae84859595cd683be365f414c60b3e58c5f9ac83 Mon Sep 17 00:00:00 2001 From: shouhuanxiaoji Date: Tue, 4 Mar 2025 10:27:01 +0800 Subject: [PATCH 2/3] small fix for loongarch --- gcc.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gcc.spec b/gcc.spec index 5b2e2e5..0ff8e94 100644 --- a/gcc.spec +++ b/gcc.spec @@ -1581,9 +1581,11 @@ pushd %{buildroot}%{_prefix}/lib/gcc/ ln -s %{gcc_target_platform} %{_arch}-linux-gnu popd +if [ -d %{buildroot}%{_libdir}/go/%{gcc_major}/ ];then pushd %{buildroot}%{_libdir}/go/%{gcc_major}/ ln -s %{gcc_target_platform} %{_arch}-linux-gnu popd +fi pushd %{buildroot}%{_includedir}/c++/%{gcc_major}/ ln -s %{gcc_target_platform} %{_arch}-linux-gnu -- Gitee From 288806d59e84203f625b33af37a216904f318592 Mon Sep 17 00:00:00 2001 From: shouhuanxiaoji Date: Tue, 4 Mar 2025 10:53:49 +0800 Subject: [PATCH 3/3] small fix for loongarch64 --- gcc.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gcc.spec b/gcc.spec index 0ff8e94..4e73c9e 100644 --- a/gcc.spec +++ b/gcc.spec @@ -1581,11 +1581,11 @@ pushd %{buildroot}%{_prefix}/lib/gcc/ ln -s %{gcc_target_platform} %{_arch}-linux-gnu popd -if [ -d %{buildroot}%{_libdir}/go/%{gcc_major}/ ];then +%if %{build_go} pushd %{buildroot}%{_libdir}/go/%{gcc_major}/ ln -s %{gcc_target_platform} %{_arch}-linux-gnu popd -fi +%endif pushd %{buildroot}%{_includedir}/c++/%{gcc_major}/ ln -s %{gcc_target_platform} %{_arch}-linux-gnu @@ -1774,6 +1774,7 @@ end %{_prefix}/lib/gcc/%{_arch}-linux-gnu %dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major} %dir %{_prefix}/libexec/gcc +%{_libexecdir}/gcc/%{_arch}-linux-gnu %dir %{_prefix}/libexec/gcc/%{gcc_target_platform} %dir %{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_major} %dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include @@ -2364,6 +2365,7 @@ end %dir %{_prefix}/%{_lib}/go %dir %{_prefix}/%{_lib}/go/%{gcc_major} %{_prefix}/%{_lib}/go/%{gcc_major}/%{gcc_target_platform} +%{_libdir}/go/%{gcc_major}/%{_arch}-linux-gnu %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libgobegin.a %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libgolibbegin.a %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libgo.so -- Gitee