From 9be68e0e3a93c9bc304eb7ac69f22096a3a2db88 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Sat, 26 Jan 2013 15:26:29 -0600
Subject: [PATCH] ntl should explicitly link to libstdc++ (#904348)

---
 ntl.spec | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/ntl.spec b/ntl.spec
index 0bddc64..7a47a37 100644
--- a/ntl.spec
+++ b/ntl.spec
@@ -7,7 +7,7 @@
 Summary: High-performance algorithms for vectors, matrices, and polynomials 
 Name:    ntl 
 Version: 5.5.2
-Release: 8%{?dist}
+Release: 9%{?dist}
 
 License: GPLv2+
 URL:     http://shoup.net/ntl/ 
@@ -57,6 +57,10 @@ Requires: %{name}-devel%{?_isa} = %{version}-%{release}
 %prep
 %setup -q 
 
+# omit for now, fixes arm ftbfs when CC != gcc, but causes regression:
+# http://bugzilla.redhat.com/904348
+# definitely needs more libtool love to get right -- rex
+%if 0
 # Specify tag with mode for libtool.
 sed -i.mode \
   -e 's| --mode=compile| --tag=CC --mode=compile|' \
@@ -64,13 +68,14 @@ sed -i.mode \
   src/def_makefile \
   src/makefile \
   src/mfile 
+%endif
 
 
 %build
 pushd src
 ./configure \
-  CC="%{__cc}" \
-  CXX="%{__cxx}" \
+  CC="${CC-gcc}" \
+  CXX="${CXX-g++}" \
   CFLAGS="%{optflags} -fPIC" \
   CXXFLAGS="%{optflags} -fPIC" \
   PREFIX=%{_prefix} \
@@ -141,6 +146,9 @@ done
 
 
 %changelog
+* Sat Jan 26 2013 Rex Dieter <rdieter@fedoraproject.org> 5.5.2-9
+- ntl should explicitly link to libstdc++ (#904348)
+
 * Thu Aug 16 2012 Jerry James <loganjerry@gmail.com> - 5.5.2-8
 - Build with gf2x support (#848870)
 - Run ldconfig in post and postun