[latte-integrale] Build with _GNU_SOURCE defined to get long options, too. Remove test timeouts so tests don't die spu

Jerry James jjames at fedoraproject.org
Wed Jan 23 14:53:08 UTC 2013


commit 515ef5236ea6f6259cb7df7f0e9b2d29f3a55da3
Author: Jerry James <jamesjer at betterlinux.com>
Date:   Wed Jan 23 07:52:48 2013 -0700

    Build with _GNU_SOURCE defined to get long options, too.
    Remove test timeouts so tests don't die spuriously on ARM (bz 893158).

 latte-integrale.spec |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 deletions(-)
---
diff --git a/latte-integrale.spec b/latte-integrale.spec
index cdab42b..8a264bb 100644
--- a/latte-integrale.spec
+++ b/latte-integrale.spec
@@ -4,7 +4,7 @@
 
 Name:           latte-integrale
 Version:        1.5.3
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Lattice point enumeration
 
 License:        GPLv2+
@@ -109,10 +109,15 @@ if [ %{__isa_bits} = "64" ]; then
   sed -i "s|{FORTYTWO_HOME}/lib|&64|" configure
 fi
 
+# Some tests fail because they timeout on slower processors.  Eliminate the
+# timeouts and let koji kill us if a test infloops.
+sed -i 's/ulimit -t $MAXRUNTIME; //' code/test-suite/test.pl.in
+
 %build
 # Build 4ti2 first
 cd 4ti2-%{ver4ti2}
-%configure --enable-shared --disable-static LIBS="-lgmpxx -lgmp"
+%configure --enable-shared --disable-static LIBS="-lgmpxx -lgmp" \
+  CPPFLAGS="-D_GNU_SOURCE=1"
 
 # Get rid of undesirable hardcoded rpaths; workaround libtool reordering
 # -Wl,--as-needed after all the libraries; also fix a typo.
@@ -132,7 +137,7 @@ make install DESTDIR=$PWD/../local
 # Now build latte-integrale itself
 cd ../latte-int-%{version}
 %configure --enable-DATABASE --with-4ti2=$PWD/../local/%{_prefix} \
-  CPPFLAGS="-I%{_includedir}/cddlib"
+  CPPFLAGS="-I%{_includedir}/cddlib -D_GNU_SOURCE=1"
 make %{?_smp_mflags}
 
 %install
@@ -203,6 +208,10 @@ make check
 %{_libdir}/libzsolve*.so.*
 
 %changelog
+* Tue Jan 22 2013 Jerry James <loganjerry at gmail.com> - 1.5.3-6
+- Build with _GNU_SOURCE defined to get long options, too
+- Remove test timeouts so tests don't die spuriously on ARM (bz 893158)
+
 * Mon Dec 10 2012 Jerry James <loganjerry at gmail.com> - 1.5.3-5
 - Fix the name of the private bin directory too (bz 882574)
 


More information about the scm-commits mailing list