Related: rhbz#1119709 disable EOT support on rhel

f41
David Tardon 11 years ago
parent 99e059b908
commit e4df9b8ee2

@ -102,10 +102,9 @@ Source35: %{external_url}/libfreehand-0.1.0.tar.bz2
Source36: %{external_url}/libe-book-0.1.1.tar.bz2 Source36: %{external_url}/libe-book-0.1.1.tar.bz2
Source37: %{external_url}/libabw-0.1.0.tar.bz2 Source37: %{external_url}/libabw-0.1.0.tar.bz2
Source38: %{external_url}/libatomic_ops-7_2d.zip Source38: %{external_url}/libatomic_ops-7_2d.zip
Source39: %{external_url}/libeot-0.01.tar.bz2 Source39: %{external_url}/language-subtag-registry-2014-04-10.tar.bz2
Source40: %{external_url}/language-subtag-registry-2014-04-10.tar.bz2 Source40: %{external_url}/librevenge-0.0.1.tar.bz2
Source41: %{external_url}/librevenge-0.0.1.tar.bz2 %global bundling_options %{?bundling_options} --without-system-libcdr --without-system-libwpg --without-system-libwpd --without-system-libwps --without-system-libvisio --without-system-libmspub --without-system-libcmis --without-system-libodfgen --without-system-libmwaw --without-system-libetonyek --without-system-libfreehand --without-system-libebook --without-system-libabw --without-system-libatomic_ops --without-system-librevenge
%global bundling_options %{?bundling_options} --without-system-libcdr --without-system-libwpg --without-system-libwpd --without-system-libwps --without-system-libvisio --without-system-libmspub --without-system-libcmis --without-system-libodfgen --without-system-libmwaw --without-system-libetonyek --without-system-libfreehand --without-system-libebook --without-system-libabw --without-system-libatomic_ops --without-system-libeot --without-system-librevenge
%endif %endif
# build tools # build tools
@ -1201,16 +1200,16 @@ export CXXFLAGS=$ARCH_FLAGS
%if 0%{?rhel} %if 0%{?rhel}
%if 0%{?rhel} < 7 %if 0%{?rhel} < 7
# make segfaults on parallel build # make segfaults on parallel build
%define distrooptions --disable-firebird-sdbc --disable-gio --disable-graphite --without-junit --enable-gstreamer-0-10 --disable-gstreamer --disable-postgresql-sdbc --enable-python=system --with-system-hsqldb --without-doxygen --with-parallelism=-j1 %define distrooptions --disable-eot --disable-firebird-sdbc --disable-gio --disable-graphite --without-junit --enable-gstreamer-0-10 --disable-gstreamer --disable-postgresql-sdbc --enable-python=system --with-system-hsqldb --without-doxygen --with-parallelism=-j1
%ifarch s390 s390x %ifarch s390 s390x
%define archoptions --disable-sdremote-bluetooth %define archoptions --disable-sdremote-bluetooth
%endif %endif
%else # rhel7 %else # rhel7
%define distrooptions --disable-firebird-sdbc --disable-gstreamer-0-10 --enable-gstreamer --with-system-mythes --enable-python=system %{?_smp_mflags:--with-parallelism=%{_smp_mflags}} %define distrooptions --disable-eot --disable-firebird-sdbc --disable-gstreamer-0-10 --enable-gstreamer --with-system-mythes --enable-python=system %{?_smp_mflags:--with-parallelism=%{_smp_mflags}}
%endif %endif
%else # fedora %else # fedora
%define distrooptions --enable-kde4 --disable-gstreamer-0-10 --enable-gstreamer --with-system-mythes %{?_smp_mflags:--with-parallelism=%{_smp_mflags}} %define distrooptions --enable-eot --enable-kde4 --disable-gstreamer-0-10 --enable-gstreamer --with-system-mythes %{?_smp_mflags:--with-parallelism=%{_smp_mflags}}
%endif %endif
%if %{with langpacks} %if %{with langpacks}
@ -1246,7 +1245,6 @@ touch autogen.lastrun
--disable-gnome-vfs \ --disable-gnome-vfs \
--disable-openssl \ --disable-openssl \
--enable-dbus \ --enable-dbus \
--enable-eot \
--enable-evolution2 \ --enable-evolution2 \
--enable-ext-nlpsolver \ --enable-ext-nlpsolver \
--enable-ext-wiki-publisher \ --enable-ext-wiki-publisher \

Loading…
Cancel
Save