- fix build failure on s390*

- fix to use system gmp and system mpfr
This commit is contained in:
Than Ngo 2015-10-08 18:01:27 +02:00
parent f14f4ac42e
commit 57abb90433
2 changed files with 58 additions and 3 deletions

View File

@ -1,6 +1,6 @@
%global source_date 20150728_r37987
%global tl_version 2015
%global tl_rel 11
%global tl_rel 12
%global tl_release %{tl_rel}.%{source_date}%{?dist}
%global tl_noarch_release %{tl_rel}%{?dist}
%global source_name texlive-%{source_date}-source
@ -34,6 +34,7 @@ BuildRequires: xz libXaw-devel libXi-devel ncurses-devel bison flex file perl(Di
BuildRequires: gd-devel teckit-devel freetype-devel libpng-devel t1lib-devel zlib-devel poppler-devel t1utils
BuildRequires: zziplib-devel libicu-devel cairo-devel harfbuzz-devel pixman-devel graphite2-devel ghostscript-devel
BuildRequires: libpaper-devel potrace-devel autoconf automake libtool
BuildRequires: gmp-devel mpfr-devel
Requires: texlive-scheme-basic
Requires: texlive-collection-latexrecommended
Requires: tex-kpathsea, tex-tetex
@ -280898,7 +280899,7 @@ cd source
PREF=`pwd`/inst
mkdir -p work
cd work
../configure --prefix=$PREF --datadir=$PREF --libdir=$PREF/lib --with-system-zlib --with-system-libpng --with-system-xpdf --with-system-gd --with-system-t1lib --with-system-teckit --with-system-freetype2 --with-system-poppler --with-system-zziplib --with-system-cairo --with-system-icu --with-system-harfbuzz --with-system-graphite2 --with-system-libgs --with-system-pixman --with-system-libpaper --with-system-potrace --with-pic --with-xdvi-x-toolkit=xaw --disable-xindy --disable-xindy-docs --disable-xindy-make-rules --enable-shared --enable-compiler-warnings=max --without-cxx-runtime-hack --disable-native-texlive-build --disable-t1utils --disable-psutils --disable-biber --disable-ptexenc --disable-largefile \
../configure --prefix=$PREF --datadir=$PREF --libdir=$PREF/lib --with-system-zlib --with-system-libpng --with-system-xpdf --with-system-gd --with-system-t1lib --with-system-teckit --with-system-freetype2 --with-system-poppler --with-system-zziplib --with-system-cairo --with-system-icu --with-system-harfbuzz --with-system-graphite2 --with-system-libgs --with-system-pixman --with-system-libpaper --with-system-potrace --with-pic --with-xdvi-x-toolkit=xaw --with-system-mpfr --with-system-gmp --disable-xindy --disable-xindy-docs --disable-xindy-make-rules --enable-shared --enable-compiler-warnings=max --without-cxx-runtime-hack --disable-native-texlive-build --disable-t1utils --disable-psutils --disable-biber --disable-ptexenc --disable-largefile \
%ifarch ppc %{power64} s390 s390x aarch64
--disable-luajittex --disable-mfluajit \
%endif
@ -443377,6 +443378,10 @@ fi
%{_libdir}/pkgconfig/*.pc
%changelog
* Thu Oct 08 2015 Than Ngo <than@redhat.com> - 5:2015-12.20150724
- fix build failure on s390*
- fix to use system gmp and system mpfr
* Wed Oct 7 2015 Peter Robinson <pbrobinson@fedoraproject.org> 5:2015-11.20150724
- Fix lua builds on secondary arches again

View File

@ -1,6 +1,6 @@
%global source_date 20150728_r37987
%global tl_version 2015
%global tl_rel 7
%global tl_rel 12
%global tl_release %{tl_rel}.%{source_date}%{?dist}
%global tl_noarch_release %{tl_rel}%{?dist}
%global source_name texlive-%{source_date}-source
@ -34,6 +34,7 @@ BuildRequires: xz libXaw-devel libXi-devel ncurses-devel bison flex file perl(Di
BuildRequires: gd-devel teckit-devel freetype-devel libpng-devel t1lib-devel zlib-devel poppler-devel t1utils
BuildRequires: zziplib-devel libicu-devel cairo-devel harfbuzz-devel pixman-devel graphite2-devel ghostscript-devel
BuildRequires: libpaper-devel potrace-devel autoconf automake libtool
BuildRequires: gmp-devel mpfr-devel
Requires: texlive-scheme-basic
Requires: texlive-collection-latexrecommended
Requires: tex-kpathsea, tex-tetex
@ -160,6 +161,8 @@ cd work
--with-system-potrace \
--with-pic \
--with-xdvi-x-toolkit=xaw \
--with-system-mpfr \
--with-system-gmp \
--disable-xindy --disable-xindy-docs --disable-xindy-make-rules \
--enable-shared \
--enable-compiler-warnings=max \
@ -407,6 +410,53 @@ fi
%{_libdir}/pkgconfig/*.pc
%changelog
* Thu Oct 08 2015 Than Ngo <than@redhat.com> - 5:2015-12.20150724
- fix build failure on s390*
- fix to use system gmp and system mpfr
* Wed Oct 7 2015 Peter Robinson <pbrobinson@fedoraproject.org> 5:2015-11.20150724
- Fix lua builds on secondary arches again
* Thu Oct 1 2015 Tom Callaway <spot@fedoraproject.org> - 5:2015-10.20150724
- fix rpm macros so that the right file is copied
* Mon Sep 28 2015 Tom Callaway <spot@fedoraproject.org> - 5:2015-9.20150724
- add Requires: tex(titlesec.sty) to savetrees (bz1266801)
* Fri Sep 25 2015 Tom Callaway <spot@fedoraproject.org> - 5:2015-8.20150724
- add Provides: tex-beamer-FUBerlin and texlive-beamer-FUBerlin to the beamer-FUBerlin-doc package
... the upstream beamer-FUBerlin tarball is empty of useful content.
* Wed Sep 16 2015 Tom Callaway <spot@fedoraproject.org> - 5:2015-7.20150724
- fix newline issue in pgf (bz1241458)
- do not require: ghostscript-devel for texlive-pdfcrop-bin (bz1229407)
- do not provide: tex(ifluatex.sty) in texlive-oberdiek (bz1146684)
... but do require: tex(ifluatex.sty) in texlive-oberdiek to ensure complete bundle
- add Requires: texlive-metafont-bin to texlive-kpathsea-bin (bz1123096)
- add Provides/Obsoletes texlive-tlwg to texlive-fonts-tlwg (bz1100984)
- add Requires: texlive-greek-fontenc and Requires: texlive-cbfonts-fd to textgreek (bz1064051)
- apply patch from Edgar Hoch to fix etex.src to permit \addlanguage to have empty params 4 & 5 (bz1215257)
- replace visible references to oriya to odia, add odia as equiv lang to oriya (bz1040337)
- use macros.texlive file as source10, add and cleanup macros (bz1054317)
- add Requires: biber to texlive-biblatex-apa (bz1048193)
- new subpackage sync
- add scriptlets for -doc subpackages so that texdoc just works
- removed yfonts-t1 subpackage due to non-free license
- fix license tags (no more Freely distributable...)
- add Requires: tex(ltxkeys.sty) to xwatermark (bz1197494)
- add Requires: tex(ifnextok.sty) to titlecaps (bz1186688)
- add Requires: tex(xetex.def) to xetex (bz1155267)
- add Requires: texlive-texconfig-bin to latex-bin-bin (bz995752)
- add Provides/Obsoletes bibexport to texlive-bibexport
add bibexport.sh symlink in /usr/bin (bz979448)
- drop incorrect versioning on Requires: texlive-metafont-bin for texlive-kpathsea-bin
* Tue Sep 15 2015 Tom Callaway <spot@fedoraproject.org> - 5:2015-6.20150724
- increment epoch to force upgrade (i hate versioning)
* Wed Sep 9 2015 Tom Callaway <spot@fedoraproject.org> - 4:2015-5.20150724
- fix incorrect Obsoletes: texlive-kpathsea-lib
* Wed Aug 26 2015 Than Ngo <than@redhat.com> - 4:2015-4.20150724
- disable luajittex on secondary arch