From 6b750aaff324f1ddb9435bfafa24be75281ae819 Mon Sep 17 00:00:00 2001 From: WB02254423 Date: Fri, 15 Aug 2025 01:59:36 -0400 Subject: [PATCH 1/4] add support for sw_64 build Signed-off-by: WB02254423 --- texlive-base.spec | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/texlive-base.spec b/texlive-base.spec index 3ba5d3b..66562ac 100644 --- a/texlive-base.spec +++ b/texlive-base.spec @@ -1,4 +1,4 @@ -%define anolis_release 17 +%define anolis_release 18 %global shortname texlive %global source_date 20220321 %global source_name texlive-%{source_date}-source @@ -508,7 +508,7 @@ of TeX macros and font libraries. The distribution includes extensive general documentation about TeX, as well as the documentation for the included software packages. -%ifnarch loongarch64 riscv64 +%ifnarch loongarch64 riscv64 sw_64 %include %{SOURCE10000} %else %include %{SOURCE10001} @@ -542,6 +542,12 @@ done %patch43 -p1 -b .c99-4 %global mysources %{lua: for index,value in ipairs(sources) do if index >= 16 then print(value.." ") end end} +%ifarch sw_64 +cp -fv /usr/lib/rpm/%{_vendor}/config.* source/build-aux/ +cp -fv /usr/lib/rpm/%{_vendor}/config.* source/libs/icu/icu-src/source/ +cp -fv /usr/lib/rpm/%{_vendor}/config.* source/libs/freetype2/freetype-src/builds/unix/ +cp -fv /usr/lib/rpm/%{_vendor}/config.* source/utils/asymptote/ +%endif rm -rf source/libs/xpdf @@ -576,8 +582,13 @@ latex dummy.tex rm -f dummy.* %endif +%ifarch sw_64 +export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" +export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" +%else export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -Werror=format-security" export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -Werror=format-security" +%endif cd source PREF=`pwd`/inst @@ -599,7 +610,7 @@ export XPDF_LIBS="-lxpdfcore -lfofi -lgoo -lsplash $GLIB_LIBS $PAPER_LIBS $FONTC --disable-native-texlive-build --disable-t1utils --enable-psutils --disable-biber --disable-ptexenc --disable-largefile \ --with-banner-add='/CVE-2023-32700 patched' \ --with-system-xpdf \ -%ifarch loongarch64 riscv64 +%ifarch loongarch64 riscv64 sw_64 --disable-mfluajit \ --disable-luajithbtex \ --disable-luajittex \ @@ -862,7 +873,7 @@ for i in afm2pl afm2tfm aleph bibtex bibtex8 bibtexu chkdvifont chktex ctie ctan chrpath --delete %{buildroot}%{_bindir}/$i done -%ifnarch loongarch64 riscv64 +%ifnarch loongarch64 riscv64 sw_64 chrpath --delete %{buildroot}%{_bindir}/luajithbtex chrpath --delete %{buildroot}%{_bindir}/luajittex chrpath --delete %{buildroot}%{_bindir}/mfluajit @@ -1003,6 +1014,9 @@ yes | %{_bindir}/updmap-sys --quiet --syncwithtrees >/dev/null 2>&1 || : %ghost %{_datadir}/texmf.rpmmoved %changelog +* Fri Aug 15 2025 lzq11122 -10:20220321-18 +- add support for sw_64 build + * Tue Aug 12 2025 wh02252983 - 10:20220321-17 - add patch to fix CVE-2023-46048 -- Gitee From eea94a7d50f53cb3e6c57eb93fd1c34a64277fea Mon Sep 17 00:00:00 2001 From: WB02254423 Date: Fri, 15 Aug 2025 02:59:10 -0400 Subject: [PATCH 2/4] add support for sw_64 build Signed-off-by: WB02254423 --- texlive-base.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/texlive-base.spec b/texlive-base.spec index 66562ac..3c39997 100644 --- a/texlive-base.spec +++ b/texlive-base.spec @@ -542,7 +542,7 @@ done %patch43 -p1 -b .c99-4 %global mysources %{lua: for index,value in ipairs(sources) do if index >= 16 then print(value.." ") end end} -%ifarch sw_64 +%ifarch sw_64 loongarch64 cp -fv /usr/lib/rpm/%{_vendor}/config.* source/build-aux/ cp -fv /usr/lib/rpm/%{_vendor}/config.* source/libs/icu/icu-src/source/ cp -fv /usr/lib/rpm/%{_vendor}/config.* source/libs/freetype2/freetype-src/builds/unix/ -- Gitee From bdccba93e01602220ac57717ad06702c2a17853d Mon Sep 17 00:00:00 2001 From: WB02254423 Date: Fri, 15 Aug 2025 05:30:51 -0400 Subject: [PATCH 3/4] test Signed-off-by: WB02254423 --- texlive-base.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/texlive-base.spec b/texlive-base.spec index 3c39997..2c6528f 100644 --- a/texlive-base.spec +++ b/texlive-base.spec @@ -585,10 +585,11 @@ rm -f dummy.* %ifarch sw_64 export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" -%else +%endif + export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -Werror=format-security" export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -Werror=format-security" -%endif + cd source PREF=`pwd`/inst -- Gitee From a36d598ae8114d49392fd370b5c3cb852cf7e72c Mon Sep 17 00:00:00 2001 From: WB02254423 Date: Fri, 15 Aug 2025 06:08:40 -0400 Subject: [PATCH 4/4] test Signed-off-by: WB02254423 --- texlive-base.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/texlive-base.spec b/texlive-base.spec index 2c6528f..cfb1138 100644 --- a/texlive-base.spec +++ b/texlive-base.spec @@ -542,7 +542,7 @@ done %patch43 -p1 -b .c99-4 %global mysources %{lua: for index,value in ipairs(sources) do if index >= 16 then print(value.." ") end end} -%ifarch sw_64 loongarch64 +%ifarch sw_64 cp -fv /usr/lib/rpm/%{_vendor}/config.* source/build-aux/ cp -fv /usr/lib/rpm/%{_vendor}/config.* source/libs/icu/icu-src/source/ cp -fv /usr/lib/rpm/%{_vendor}/config.* source/libs/freetype2/freetype-src/builds/unix/ -- Gitee