From f5587f468f78cc7685ff75205e262f0f61da62c4 Mon Sep 17 00:00:00 2001 From: liheavy <17865196565@163.com> Date: Sat, 31 Jul 2021 09:57:23 +0800 Subject: [PATCH 1/2] fix compile failed due to multiple definition --- texlive-base.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/texlive-base.spec b/texlive-base.spec index e19f517..1e0af77 100644 --- a/texlive-base.spec +++ b/texlive-base.spec @@ -5850,8 +5850,8 @@ done %global mysources %{lua: for index,value in ipairs(sources) do if index >= 16 then print(value.." ") end end} %build -export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -Werror=format-security" -export CXXFLAGS="$RPM_OPT_FLAGS -std=c++11 -fno-strict-aliasing -Werror=format-security" +export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -Werror=format-security -fcommon" +export CXXFLAGS="$RPM_OPT_FLAGS -std=c++11 -fno-strict-aliasing -Werror=format-security -fcommon" export LDFLAGS="%{build_ldflags}" cd source PREF=`pwd`/inst -- Gitee From 15ac1cec71c52ca7bcbd635192808811f6998829 Mon Sep 17 00:00:00 2001 From: liheavy <17865196565@163.com> Date: Sat, 31 Jul 2021 10:01:01 +0800 Subject: [PATCH 2/2] fix compile failed due to multiple definition --- texlive-base.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/texlive-base.spec b/texlive-base.spec index 1e0af77..a034d58 100644 --- a/texlive-base.spec +++ b/texlive-base.spec @@ -4,7 +4,7 @@ Name: texlive-base Version: 20180414 -Release: 30 +Release: 31 Epoch: 7 Summary: TeX formatting system License: ASL 2.0 and LGPL-2.1-only and Zlib and OFL-1.1 and Public Domain and LGPL-2.0-only and GPLv2+ and MPL-1.1 and Libpng and LGPL-3.0-only and BSL-1.0 and GPLv2 and GPLv3 and CPL-1.0 and IJG and MIT and LPPL-1.3c and ICU and psutils @@ -8096,6 +8096,9 @@ done <<< "$list" %doc %{_datadir}/texlive/texmf-dist/doc/latex/yplan/ %changelog +* Sat Jul 31 2021 Haiwei Li - 20180414-31 +- Fix compilation failed due to multiple definition + * Wed 30 Jun 2021 sunguoshuai - 20180414-30 - Fix build error when srctopdf is ok -- Gitee