Hello community, here is the log from the commit of package flint for openSUSE:Factory checked in at 2015-02-20 12:01:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/flint (Old) and /work/SRC/openSUSE:Factory/.flint.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "flint" Changes: -------- --- /work/SRC/openSUSE:Factory/flint/flint.changes 2014-10-22 16:22:59.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.flint.new/flint.changes 2015-02-20 12:01:40.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Feb 19 12:41:41 UTC 2015 - [email protected] + +- Add 0002-compile-fixes.diff to fend off improper usage of NTL + headers. + +------------------------------------------------------------------- New: ---- 0002-compile-fixes.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ flint.spec ++++++ --- /var/tmp/diff_new_pack.I4Pz0T/_old 2015-02-20 12:01:41.000000000 +0100 +++ /var/tmp/diff_new_pack.I4Pz0T/_new 2015-02-20 12:01:41.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package flint # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -29,6 +29,7 @@ #Git-Clone: git://git.inai.de/flint master ec03518870f1aff8bf351ba2c83a0e2a8ba3f7b0 [patch1] Source: http://flintlib.org/%name-%version.tar.gz Patch1: 0001-build-provide-autotools-files.patch +Patch2: 0002-compile-fixes.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf BuildRequires: automake @@ -71,20 +72,23 @@ %prep %setup -q -%patch -P 1 -p1 +%patch -P 1 -P 2 -p1 %build chmod a+x *.sh ./autogen.sh +export CFLAGS="%optflags" +export CXXFLAGS="%optflags -std=gnu++11" %ifarch x86_64 %ix86 -export CFLAGS="%optflags -mno-popcnt" +export CFLAGS="$CFLAGS -mno-popcnt" +export CXXFLAGS="$CXXFLAGS -mno-popcnt" %endif %configure --disable-static --with-ntl --enable-reentrant --enable-silent-rules make %{?_smp_mflags} %install b="%buildroot"; -make install DESTDIR="$b" +%make_install DESTDIR="$b" rm -f "$b/%_libdir"/*.la %fdupes %buildroot/%_prefix ++++++ 0001-build-provide-autotools-files.patch ++++++ --- /var/tmp/diff_new_pack.I4Pz0T/_old 2015-02-20 12:01:41.000000000 +0100 +++ /var/tmp/diff_new_pack.I4Pz0T/_new 2015-02-20 12:01:41.000000000 +0100 @@ -4,23 +4,23 @@ Subject: [PATCH] build: provide autotools files --- - .gitignore | 34 ++++++---- - Makefile.am | 37 +++++++++++ - autofiles.sh | 43 +++++++++++++ - autogen.sh | 5 ++ - configure.ac | 141 ++++++++++++++++++++++++++++++++++++++++++ - fft_tuning.h | 9 +++ - fft_tuning32.h | 19 ++++++ - fft_tuning32.in | 19 ------ - fft_tuning64.h | 19 ++++++ - fft_tuning64.in | 19 ------ - fmpz-conversions-reentrant.h | 10 +++ - fmpz-conversions-reentrant.in | 10 --- - fmpz-conversions-single.h | 10 +++ - fmpz-conversions-single.in | 10 --- - fmpz-conversions.h | 6 ++ - m4/.gitignore | 2 + - 16 files changed, 323 insertions(+), 70 deletions(-) + .gitignore | 34 +++++++---- + Makefile.am | 37 ++++++++++++ + autofiles.sh | 43 ++++++++++++++ + autogen.sh | 5 + + configure.ac | 129 ++++++++++++++++++++++++++++++++++++++++++ + fft_tuning.h | 9 ++ + fft_tuning32.h | 19 ++++++ + fft_tuning32.in | 19 ------ + fft_tuning64.h | 19 ++++++ + fft_tuning64.in | 19 ------ + fmpz-conversions-reentrant.h | 10 +++ + fmpz-conversions-reentrant.in | 10 --- + fmpz-conversions-single.h | 10 +++ + fmpz-conversions-single.in | 10 --- + fmpz-conversions.h | 6 + + m4/.gitignore | 2 + 16 files changed, 311 insertions(+), 70 deletions(-) create mode 100644 Makefile.am create mode 100755 autofiles.sh create mode 100755 autogen.sh @@ -37,10 +37,10 @@ create mode 100644 fmpz-conversions.h create mode 100644 m4/.gitignore -diff --git a/.gitignore b/.gitignore -index d25e84d..8f3cbd1 100644 ---- a/.gitignore -+++ b/.gitignore +Index: flint-2.4.4/.gitignore +=================================================================== +--- flint-2.4.4.orig/.gitignore ++++ flint-2.4.4/.gitignore @@ -1,19 +1,29 @@ *~ *.orig @@ -84,11 +84,10 @@ +/Mkinclude.am + +/flint-config.h -diff --git a/Makefile.am b/Makefile.am -new file mode 100644 -index 0000000..8050fa5 +Index: flint-2.4.4/Makefile.am +=================================================================== --- /dev/null -+++ b/Makefile.am ++++ flint-2.4.4/Makefile.am @@ -0,0 +1,37 @@ +# -*- Makefile -*- + @@ -127,11 +126,10 @@ + +flint-config.h: config.h + grep FLINT <$< >$@ -diff --git a/autofiles.sh b/autofiles.sh -new file mode 100755 -index 0000000..de278d7 +Index: flint-2.4.4/autofiles.sh +=================================================================== --- /dev/null -+++ b/autofiles.sh ++++ flint-2.4.4/autofiles.sh @@ -0,0 +1,43 @@ +#!/bin/sh +# @@ -176,23 +174,21 @@ +wcdir exmp_sources examples; +wcdir test_sources test; +wcdir prof_sources profile; -diff --git a/autogen.sh b/autogen.sh -new file mode 100755 -index 0000000..82cf41a +Index: flint-2.4.4/autogen.sh +=================================================================== --- /dev/null -+++ b/autogen.sh ++++ flint-2.4.4/autogen.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +./autofiles.sh; +autoreconf -fi; +rm -Rf autom4te.cache; -diff --git a/configure.ac b/configure.ac -new file mode 100644 -index 0000000..d8d10d6 +Index: flint-2.4.4/configure.ac +=================================================================== --- /dev/null -+++ b/configure.ac -@@ -0,0 +1,141 @@ ++++ flint-2.4.4/configure.ac +@@ -0,0 +1,129 @@ +AC_INIT([flint], [2.3]) +AC_CONFIG_AUX_DIR([build-aux]) +AC_CONFIG_HEADERS([config.h]) @@ -220,10 +216,10 @@ + # + ia64-*) FLINT_TUNE="";; + *) FLINT_TUNE="-funroll-loops";; -+esac; ++esac +AC_MSG_RESULT([$FLINT_TUNE]) +AC_SUBST([FLINT_TUNE]) -+ ++ +AH_TEMPLATE([FLINT_REENTRANT], [Set to 1 if reentrant flint is desired]) +AC_ARG_ENABLE([reentrant], + [AS_HELP_STRING([--enable-reentrant], [Enable reentrant code])], @@ -274,25 +270,13 @@ +dnl +dnl NTL interface +dnl -+AC_MSG_CHECKING([whether to enable NTL]) +AC_ARG_WITH([ntl], + [AS_HELP_STRING([--with-ntl], [Use NTL [[no]]])], + [with_ntl="$withval"], + [with_ntl="no"]) -+AS_IF([test "x$with_ntl" = "xno"], -+ [ -+ AM_CONDITIONAL([WITH_NTL], [false]) -+ AC_MSG_RESULT([no]) -+ ], -+ [ -+ AC_MSG_RESULT([yes]) -+ saved_LIBS="$LIBS"; LIBS=""; -+ AC_SEARCH_LIBS([_ntl_gsetlength], [ntl], [], -+ [AC_MSG_ERROR([NTL not found.])]) -+ ntl_LIBS="-lntl"; -+ LIBS="$saved_LIBS"; -+ AM_CONDITIONAL([WITH_NTL], [true]) -+ ]) ++AM_CONDITIONAL([WITH_NTL], [test "$with_ntl" = yes]) ++ntl_LIBS="" ++AS_IF([test "$with_ntl" = yes], [ntl_LIBS="-lntl"]) +AC_SUBST([ntl_LIBS]) + + @@ -334,11 +318,10 @@ + +AC_CONFIG_FILES([Makefile]) +AC_OUTPUT -diff --git a/fft_tuning.h b/fft_tuning.h -new file mode 100644 -index 0000000..988226e +Index: flint-2.4.4/fft_tuning.h +=================================================================== --- /dev/null -+++ b/fft_tuning.h ++++ flint-2.4.4/fft_tuning.h @@ -0,0 +1,9 @@ +/* + * Checking for "64-bit" must not depend on uname at all. @@ -349,11 +332,10 @@ +#else +# include "fft_tuning32.h" +#endif -diff --git a/fft_tuning32.h b/fft_tuning32.h -new file mode 100644 -index 0000000..27ff431 +Index: flint-2.4.4/fft_tuning32.h +=================================================================== --- /dev/null -+++ b/fft_tuning32.h ++++ flint-2.4.4/fft_tuning32.h @@ -0,0 +1,19 @@ +/* fft_tuning.h -- autogenerated by tune-fft */ + @@ -374,10 +356,9 @@ + +#endif + -diff --git a/fft_tuning32.in b/fft_tuning32.in -deleted file mode 100644 -index 27ff431..0000000 ---- a/fft_tuning32.in +Index: flint-2.4.4/fft_tuning32.in +=================================================================== +--- flint-2.4.4.orig/fft_tuning32.in +++ /dev/null @@ -1,19 +0,0 @@ -/* fft_tuning.h -- autogenerated by tune-fft */ @@ -399,11 +380,10 @@ - -#endif - -diff --git a/fft_tuning64.h b/fft_tuning64.h -new file mode 100644 -index 0000000..f7f94da +Index: flint-2.4.4/fft_tuning64.h +=================================================================== --- /dev/null -+++ b/fft_tuning64.h ++++ flint-2.4.4/fft_tuning64.h @@ -0,0 +1,19 @@ +/* fft_tuning.h -- autogenerated by tune-fft */ + @@ -424,10 +404,9 @@ + +#endif + -diff --git a/fft_tuning64.in b/fft_tuning64.in -deleted file mode 100644 -index f7f94da..0000000 ---- a/fft_tuning64.in +Index: flint-2.4.4/fft_tuning64.in +=================================================================== +--- flint-2.4.4.orig/fft_tuning64.in +++ /dev/null @@ -1,19 +0,0 @@ -/* fft_tuning.h -- autogenerated by tune-fft */ @@ -449,11 +428,10 @@ - -#endif - -diff --git a/fmpz-conversions-reentrant.h b/fmpz-conversions-reentrant.h -new file mode 100644 -index 0000000..a0d9cbd +Index: flint-2.4.4/fmpz-conversions-reentrant.h +=================================================================== --- /dev/null -+++ b/fmpz-conversions-reentrant.h ++++ flint-2.4.4/fmpz-conversions-reentrant.h @@ -0,0 +1,10 @@ +#ifndef FMPZ_CONVERSIONS_H +#define FMPZ_CONVERSIONS_H @@ -465,10 +443,9 @@ +#define COEFF_TO_PTR(x) ((__mpz_struct *) ((x) << 2)) + +#endif /* FMPZ_CONVERSIONS_H */ -diff --git a/fmpz-conversions-reentrant.in b/fmpz-conversions-reentrant.in -deleted file mode 100644 -index a0d9cbd..0000000 ---- a/fmpz-conversions-reentrant.in +Index: flint-2.4.4/fmpz-conversions-reentrant.in +=================================================================== +--- flint-2.4.4.orig/fmpz-conversions-reentrant.in +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef FMPZ_CONVERSIONS_H @@ -481,11 +458,10 @@ -#define COEFF_TO_PTR(x) ((__mpz_struct *) ((x) << 2)) - -#endif /* FMPZ_CONVERSIONS_H */ -diff --git a/fmpz-conversions-single.h b/fmpz-conversions-single.h -new file mode 100644 -index 0000000..a0d9cbd +Index: flint-2.4.4/fmpz-conversions-single.h +=================================================================== --- /dev/null -+++ b/fmpz-conversions-single.h ++++ flint-2.4.4/fmpz-conversions-single.h @@ -0,0 +1,10 @@ +#ifndef FMPZ_CONVERSIONS_H +#define FMPZ_CONVERSIONS_H @@ -497,10 +473,9 @@ +#define COEFF_TO_PTR(x) ((__mpz_struct *) ((x) << 2)) + +#endif /* FMPZ_CONVERSIONS_H */ -diff --git a/fmpz-conversions-single.in b/fmpz-conversions-single.in -deleted file mode 100644 -index a0d9cbd..0000000 ---- a/fmpz-conversions-single.in +Index: flint-2.4.4/fmpz-conversions-single.in +=================================================================== +--- flint-2.4.4.orig/fmpz-conversions-single.in +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef FMPZ_CONVERSIONS_H @@ -513,11 +488,10 @@ -#define COEFF_TO_PTR(x) ((__mpz_struct *) ((x) << 2)) - -#endif /* FMPZ_CONVERSIONS_H */ -diff --git a/fmpz-conversions.h b/fmpz-conversions.h -new file mode 100644 -index 0000000..a0289ec +Index: flint-2.4.4/fmpz-conversions.h +=================================================================== --- /dev/null -+++ b/fmpz-conversions.h ++++ flint-2.4.4/fmpz-conversions.h @@ -0,0 +1,6 @@ +#include "flint-config.h" +#ifdef FLINT_REENTRANT @@ -525,14 +499,10 @@ +#else +# include "fmpz-conversions-single.h" +#endif -diff --git a/m4/.gitignore b/m4/.gitignore -new file mode 100644 -index 0000000..64d9bbc +Index: flint-2.4.4/m4/.gitignore +=================================================================== --- /dev/null -+++ b/m4/.gitignore ++++ flint-2.4.4/m4/.gitignore @@ -0,0 +1,2 @@ +/libtool.m4 +/lt*.m4 --- -2.0.0 - ++++++ 0002-compile-fixes.diff ++++++ From: Jan Engelhardt <[email protected]> Date: 2015-02-19 10:22:23.618673974 +0100 build: remove inclusion of private header file NTL/g_lip.h has no header guards and apparently is not meant to be included directly; instead, NTL/lip.h is needed (this is already present - hence the compile error saying double definition). [ 64s] CXX interfaces/NTL-interface.lo [ 65s] In file included from interfaces/NTL-interface.cpp:37:0: [ 65s] /usr/include/NTL/g_lip.h: In function 'long int _ntl_gmaxalloc(_ntl_gbigint)': [ 65s] /usr/include/NTL/g_lip.h:403:10: error: redefinition of 'long int _ntl_gmaxalloc(_ntl_gbigint)' [ 65s] long _ntl_gmaxalloc(_ntl_gbigint x) [ 65s] ^ [ 65s] In file included from /usr/include/NTL/lip.h:12:0, [ 65s] from /usr/include/NTL/ZZ.h:18, [ 65s] from interfaces/NTL-interface.cpp:32: [ 65s] /usr/include/NTL/g_lip.h:403:10: error: 'long int _ntl_gmaxalloc(_ntl_gbigint)' previously defined here [ 65s] long _ntl_gmaxalloc(_ntl_gbigint x) [ 65s] ^ --- interfaces/NTL-interface.cpp | 1 - 1 file changed, 1 deletion(-) Index: flint-2.4.4/interfaces/NTL-interface.cpp =================================================================== --- flint-2.4.4.orig/interfaces/NTL-interface.cpp +++ flint-2.4.4/interfaces/NTL-interface.cpp @@ -34,7 +34,6 @@ #include <NTL/mat_ZZ.h> #include <NTL/lip.h> #include <NTL/ctools.h> -#include <NTL/g_lip.h> #include <gmp.h> #include "flint.h" -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
