Re-enable xindy

xindy depends on clisp which we finally have available.

Signed-off-by: David Abdurachmanov <david.abdurachmanov@sifive.com>
This commit is contained in:
David Abdurachmanov 2020-01-17 18:53:29 +02:00
parent d2931c6ebd
commit df34c67be2
Signed by: davidlt
GPG Key ID: 8B7F1DA0E2C9FDBB

View File

@ -15,10 +15,6 @@
# We do not want exec perms changing. # We do not want exec perms changing.
%global __brp_mangle_shebangs_exclude ^$ %global __brp_mangle_shebangs_exclude ^$
# Not ppc64, not s390x, not aarch64 due to lack of clisp
# code SIGSEGV's on armv7hl
%global xindy_arches empty
Name: %{shortname}-base Name: %{shortname}-base
Version: %{source_date} Version: %{source_date}
Release: 7.0.riscv64%{?dist} Release: 7.0.riscv64%{?dist}
@ -455,10 +451,8 @@ BuildRequires: gmp-devel mpfr-devel
# This is really for macros. # This is really for macros.
BuildRequires: python3-devel BuildRequires: python3-devel
# This is for xindy # This is for xindy
%ifarch %{xindy_arches}
BuildRequires: clisp-devel BuildRequires: clisp-devel
BuildRequires: texlive-cyrillic, texlive-latex, texlive-metafont, texlive-cm-super, texlive-ec BuildRequires: texlive-cyrillic, texlive-latex, texlive-metafont, texlive-cm-super, texlive-ec
%endif
# Cleanup Provides/Obsoletes # Cleanup Provides/Obsoletes
# texlive-cjk-gs-integrate (depackaged 2018-03-09) # texlive-cjk-gs-integrate (depackaged 2018-03-09)
Provides: texlive-cjk-gs-integrate = %{epoch}:%{source_date}-%{release} Provides: texlive-cjk-gs-integrate = %{epoch}:%{source_date}-%{release}
@ -6449,7 +6443,6 @@ BuildArch: noarch
%description -n %{shortname}-xindex %description -n %{shortname}-xindex
Unicode compatible index program for LaTeX. Unicode compatible index program for LaTeX.
%ifarch %{xindy_arches}
%package -n %{shortname}-xindy %package -n %{shortname}-xindy
Provides: tex-xindy = %{epoch}:%{source_date}-%{release} Provides: tex-xindy = %{epoch}:%{source_date}-%{release}
Provides: tex-xindy-bin = %{epoch}:%{source_date}-%{release} Provides: tex-xindy-bin = %{epoch}:%{source_date}-%{release}
@ -6465,6 +6458,7 @@ Summary: A general-purpose index processor
# BuildArch: noarch # BuildArch: noarch
Requires: texlive-base Requires: texlive-base
Requires: texlive-kpathsea Requires: texlive-kpathsea
Requires: clisp
%description -n %{shortname}-xindy %description -n %{shortname}-xindy
Xindy was deceloped after an impasse had been encountered in Xindy was deceloped after an impasse had been encountered in
@ -6473,7 +6467,6 @@ Xindy can be used to process indexes for documents marked up
using (La)TeX, Nroff family and SGML-based languages. Xindy is using (La)TeX, Nroff family and SGML-based languages. Xindy is
highly configurable, both in markup terms and in terms of the highly configurable, both in markup terms and in terms of the
collating order of the text being processed. collating order of the text being processed.
%endif
%package -n %{shortname}-xmltex %package -n %{shortname}-xmltex
Provides: tex-xmltex = %{epoch}:%{source_date}-%{release} Provides: tex-xmltex = %{epoch}:%{source_date}-%{release}
@ -6567,6 +6560,17 @@ done
%global mysources %{lua: for index,value in ipairs(sources) do if index >= 16 then print(value.." ") end end} %global mysources %{lua: for index,value in ipairs(sources) do if index >= 16 then print(value.." ") end end}
%build %build
# Make texlive generate latex.fmt, so that multiple threads do not race to
# make it during the xindy build.
cat > dummy.tex << EOF
\documentclass{article}
\begin{document}
This is a document.
\end{document}
EOF
latex dummy.tex
rm -f dummy.*
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -Werror=format-security" 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 CXXFLAGS="$RPM_OPT_FLAGS -std=c++11 -fno-strict-aliasing -Werror=format-security"
# When redhat-rpm-config is updated in all stable targets, this conditional can go away # When redhat-rpm-config is updated in all stable targets, this conditional can go away
@ -6589,11 +6593,7 @@ cd work
%ifarch aarch64 %{mips} %{power64} s390 s390x riscv64 %ifarch aarch64 %{mips} %{power64} s390 s390x riscv64
--disable-luajittex --disable-mfluajit \ --disable-luajittex --disable-mfluajit \
%endif %endif
%ifarch %{xindy_arches}
--enable-xindy --disable-xindy-docs --disable-xindy-make-rules \ --enable-xindy --disable-xindy-docs --disable-xindy-make-rules \
%else
--disable-xindy --disable-xindy-docs --disable-xindy-make-rules \
%endif
--disable-rpath --disable-rpath
# disable rpath # disable rpath
@ -6863,17 +6863,6 @@ cp -R %{buildroot}%{_texdir}/texmf-dist/doc/man %{buildroot}%{_datadir}/
find %{buildroot}%{_texdir}/texmf-dist/doc/man -type f | xargs rm -f find %{buildroot}%{_texdir}/texmf-dist/doc/man -type f | xargs rm -f
mv %{buildroot}%{_texdir}/texmf-dist/doc/info/* %{buildroot}%{_infodir}/ mv %{buildroot}%{_texdir}/texmf-dist/doc/info/* %{buildroot}%{_infodir}/
%ifarch %{xindy_arches}
# nothing to do here
%else
rm -rf %{buildroot}%{_mandir}/man1/xindy.1*
rm -rf %{buildroot}%{_mandir}/man1/texindy.1*
rm -rf %{buildroot}%{_mandir}/man1/tex2xindy.1*
rm -rf %{buildroot}%{_texdir}/texmf-dist/scripts/xindy
rm -rf %{buildroot}%{_texdir}/texmf-dist/xindy
rm -rf %{buildroot}%{_texdir}/texmf-dist/doc/xindy
%endif
# Remove cjk-gs-integrate files # Remove cjk-gs-integrate files
# Yes, we probably should remove the source, but there is a possibility that we will # Yes, we probably should remove the source, but there is a possibility that we will
# re-add this subpackage at some point. # re-add this subpackage at some point.
@ -9015,7 +9004,6 @@ done <<< "$list"
%{_texdir}/texmf-dist/tex/lualatex/xindex/ %{_texdir}/texmf-dist/tex/lualatex/xindex/
%doc %{_texdir}/texmf-dist/doc/lualatex/xindex/ %doc %{_texdir}/texmf-dist/doc/lualatex/xindex/
%ifarch %{xindy_arches}
%files -n %{shortname}-xindy %files -n %{shortname}-xindy
%license gpl.txt %license gpl.txt
%{_bindir}/tex2xindy %{_bindir}/tex2xindy
@ -9028,7 +9016,6 @@ done <<< "$list"
%{_texdir}/texmf-dist/scripts/xindy/ %{_texdir}/texmf-dist/scripts/xindy/
%{_texdir}/texmf-dist/xindy/ %{_texdir}/texmf-dist/xindy/
%doc %{_texdir}/texmf-dist/doc/xindy/ %doc %{_texdir}/texmf-dist/doc/xindy/
%endif
%files -n %{shortname}-xmltex %files -n %{shortname}-xmltex
%license lppl1.txt %license lppl1.txt