From 1843df9975e96cf714cf39e94bdc59592b976d4f Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Aug 01 2012 15:04:39 +0000 Subject: Add tag to mode options for libtool (fixes FTBFS on ARM) --- diff --git a/ntl.spec b/ntl.spec index 7c5a51d..54bfa12 100644 --- a/ntl.spec +++ b/ntl.spec @@ -7,14 +7,13 @@ Summary: High-performance algorithms for vectors, matrices, and polynomials Name: ntl Version: 5.5.2 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2+ URL: http://shoup.net/ntl/ -Source0: http://shoup.net/ntl/ntl-%{version}.tar.gz Group: System Environment/Libraries -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Source0: http://shoup.net/ntl/ntl-%{version}.tar.gz Source1: multilib_template.h BuildRequires: gmp-devel @@ -57,6 +56,13 @@ Requires: %{name}-devel%{?_isa} = %{version}-%{release} %prep %setup -q +# Specify tag with mode for libtool. +sed -i.mode 's/ --mode=compile/ --tag=CC --mode=compile/' src/def_makefile +sed -i.mode 's/ --mode=compile/ --tag=CC --mode=compile/' src/makefile +sed -i.mode 's/ --mode=compile/ --tag=CC --mode=compile/' src/mfile +sed -i.mode 's/ --mode=link/ --tag=LD --mode=link/' src/def_makefile +sed -i.mode 's/ --mode=link/ --tag=LD --mode=link/' src/makefile +sed -i.mode 's/ --mode=link/ --tag=LD --mode=link/' src/mfile %build pushd src @@ -74,7 +80,7 @@ pushd src popd # not smp-safe -make -C src +make -C src V=1 %check @@ -83,8 +89,6 @@ make -C src %install -rm -rf %{buildroot} - make -C src install \ PREFIX=%{buildroot}%{_prefix} \ DOCDIR=%{buildroot}%{_docdir} \ @@ -112,10 +116,6 @@ done %endif -%clean -rm -rf %{buildroot} - - %files %defattr(-,root,root,-) %doc README doc/copying.txt @@ -135,6 +135,9 @@ rm -rf %{buildroot} %changelog +* Wed Aug 1 2012 Peter Robinson - 5.5.2-6 +- Add tag to mode options for libtool (fixes FTBFS on ARM) + * Tue Jul 31 2012 Rex Dieter - 5.5.2-5 - better multilib conflict handling (%%{__isa_bits}) - tighten subpkg deps (%%{?_isa})