diff --git a/.gitignore b/.gitignore index 52b0dbb..32a028d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /nauty26r5.tar.gz +/nauty26r7.tar.gz diff --git a/nauty-autotoolization.patch b/nauty-autotoolization.patch index a3fd73e..e25c25b 100644 --- a/nauty-autotoolization.patch +++ b/nauty-autotoolization.patch @@ -39,166 +39,23 @@ Last-Update: 2016-03-19 $2=1 else $2=0 -@@ -58,82 +75,89 @@ +@@ -57,10 +74,15 @@ + dnl Checks for system features AC_CANONICAL_HOST - --dnl Checks for C compiler and sets CFLAGS if not set by user --user_cflags="$CFLAGS" +AC_PATH_PROG([HELP2MAN],[help2man]) + + dnl Checks for C compiler and sets CFLAGS if not set by user + user_cflags="$CFLAGS" AC_PROG_CC --CFLAGS=$user_cflags +AC_PROG_INSTALL +AC_PROG_LN_S +AC_PROG_MAKE_SET +LT_INIT -+ -+dnl dnl Checks for C compiler and sets CFLAGS if not set by user -+dnl user_cflags="$CFLAGS" -+dnl AC_PROG_CC -+dnl CFLAGS=$user_cflags + CFLAGS=$user_cflags MORECFLAGS="" dnl we need AC_SYS_LARGEFILE and AC_FUNC_FSEEKO - AC_SYS_LARGEFILE - AS_IF([test x"$ac_cv_sys_file_offset_bits" = xno],[ac_cv_sys_file_offset_bits=0],[]) - AC_SUBST(ac_cv_sys_file_offset_bits) - --if test x"$user_cflags" = x"" -o x"$user_cflags" = x-m32 ; then -- if test "$CC" = "icc" ; then -- AC_TRY_CFLAGS([-O3],[CFLAGS="$CFLAGS -O3"]); -- if test x"$ac_cv_try_cflags_ok" = x"no"; then -- AC_TRY_CFLAGS([-O2],[CFLAGS="$CFLAGS -O2"],[CFLAGS="$CFLAGS -O"]); -- fi -- else -- AC_TRY_CFLAGS([-O4 -Werror],[CFLAGS="$CFLAGS -O4"]); -- if test x"$ac_cv_try_cflags_ok" = x"no"; then -- AC_TRY_CFLAGS([-O3],[CFLAGS="$CFLAGS -O3"]); -- if test x"$ac_cv_try_cflags_ok" = x"no"; then -- AC_TRY_CFLAGS([-O2],[CFLAGS="$CFLAGS -O2"],[CFLAGS="$CFLAGS -O"]); -- fi -- fi -- fi -- -- if test "$CC" = "gcc" ; then -- gccver=`gcc --version 2>/dev/null || echo 0.0.0` -- else -- gccver=0.0.0 -- fi -- -- case "$host" in -- *i686-apple-darwin*) -- AC_TRY_CFLAGS([-fast],[CFLAGS="$MORECFLAGS -fast"]);; -- *pentium*solaris*) -- ;; -- *pentium4*) -- AC_TRY_CFLAGS([-march=pentium4],[CFLAGS="$CFLAGS -march=pentium4"]);; -- *pentium3*|*i686*|*athlon*) -- AC_TRY_CFLAGS([-march=i686],[CFLAGS="$CFLAGS -march=i686"]);; -- *pentium2*|*i586*) -- AC_TRY_CFLAGS([-march=i586],[CFLAGS="$CFLAGS -march=i586"]);; -- *powerpc*) -- machtype=`/usr/bin/machine 2>/dev/null || echo unknown` -- case "$machtype" in -- ppc740?) -- AC_TRY_CFLAGS([-mcpu=7400],[CFLAGS="$CFLAGS -mcpu=7400"]) -- AC_TRY_CFLAGS([-mtune=7400],[CFLAGS="$CFLAGS -mtune=7400"]);; -- ppc745?) -- AC_TRY_CFLAGS([-mcpu=7450],[CFLAGS="$CFLAGS -mcpu=7450"]) -- AC_TRY_CFLAGS([-mtune=7450],[CFLAGS="$CFLAGS -mtune=7450"]) -- case "$gccver" in -- *\ 4.[[0-9]].[[0-9]]\ *) -- AC_TRY_CFLAGS([$CFLAGS -fast], -- [MORECFLAGS="$MORECFLAGS -fast"]);; -- esac;; -- ppc970) -- AC_TRY_CFLAGS([-mcpu=g5],[CFLAGS="$CFLAGS -mcpu=g5"]) -- AC_TRY_CFLAGS([-mtune=g5],[CFLAGS="$CFLAGS -mtune=g5"]) -- AC_TRY_CFLAGS([-fast],[CFLAGS="$MORECFLAGS -fast"]);; -- *) -- AC_TRY_CFLAGS([-mpowerpc],[CFLAGS="$CFLAGS -mpowerpc"]);; -- esac;; -- *osf*) -- AC_TRY_CFLAGS([-fast],[CFLAGS="$CFLAGS -fast"]);; -- *sparcv8*|*sparcv9*) -- AC_TRY_CFLAGS([-msupersparc],[CFLAGS="$CFLAGS -msupersparc"]) -- if test x"$ac_cv_try_cflags_ok" = x"no"; then -- AC_TRY_CFLAGS([-cg92],[CFLAGS="$CFLAGS -cg92"]) -- if test x"$ac_cv_try_cflags_ok" = x"no"; then -- AC_TRY_CFLAGS([-xcg92],[CFLAGS="$CFLAGS -xcg92"]) -- fi -- fi;; -- esac --fi -+dnl if test x"$user_cflags" = x"" -o x"$user_cflags" = x-m32 ; then -+dnl if test "$CC" = "icc" ; then -+dnl AC_TRY_CFLAGS([-O3],[CFLAGS="$CFLAGS -O3"]); -+dnl if test x"$ac_cv_try_cflags_ok" = x"no"; then -+dnl AC_TRY_CFLAGS([-O2],[CFLAGS="$CFLAGS -O2"],[CFLAGS="$CFLAGS -O"]); -+dnl fi -+dnl else -+dnl AC_TRY_CFLAGS([-O4 -Werror],[CFLAGS="$CFLAGS -O4"]); -+dnl if test x"$ac_cv_try_cflags_ok" = x"no"; then -+dnl AC_TRY_CFLAGS([-O3],[CFLAGS="$CFLAGS -O3"]); -+dnl if test x"$ac_cv_try_cflags_ok" = x"no"; then -+dnl AC_TRY_CFLAGS([-O2],[CFLAGS="$CFLAGS -O2"],[CFLAGS="$CFLAGS -O"]); -+dnl fi -+dnl fi -+dnl fi -+dnl -+dnl if test "$CC" = "gcc" ; then -+dnl gccver=`gcc --version 2>/dev/null || echo 0.0.0` -+dnl else -+dnl gccver=0.0.0 -+dnl fi -+dnl -+dnl case "$host" in -+dnl *i686-apple-darwin*) -+dnl AC_TRY_CFLAGS([-fast],[CFLAGS="$MORECFLAGS -fast"]);; -+dnl *pentium*solaris*) -+dnl ;; -+dnl *pentium4*) -+dnl AC_TRY_CFLAGS([-march=pentium4],[CFLAGS="$CFLAGS -march=pentium4"]);; -+dnl *pentium3*|*i686*|*athlon*) -+dnl AC_TRY_CFLAGS([-march=i686],[CFLAGS="$CFLAGS -march=i686"]);; -+dnl *pentium2*|*i586*) -+dnl AC_TRY_CFLAGS([-march=i586],[CFLAGS="$CFLAGS -march=i586"]);; -+dnl *powerpc*) -+dnl machtype=`/usr/bin/machine 2>/dev/null || echo unknown` -+dnl case "$machtype" in -+dnl ppc740?) -+dnl AC_TRY_CFLAGS([-mcpu=7400],[CFLAGS="$CFLAGS -mcpu=7400"]) -+dnl AC_TRY_CFLAGS([-mtune=7400],[CFLAGS="$CFLAGS -mtune=7400"]);; -+dnl ppc745?) -+dnl AC_TRY_CFLAGS([-mcpu=7450],[CFLAGS="$CFLAGS -mcpu=7450"]) -+dnl AC_TRY_CFLAGS([-mtune=7450],[CFLAGS="$CFLAGS -mtune=7450"]) -+dnl case "$gccver" in -+dnl *\ 4.[[0-9]].[[0-9]]\ *) -+dnl AC_TRY_CFLAGS([$CFLAGS -fast], -+dnl [MORECFLAGS="$MORECFLAGS -fast"]);; -+dnl esac;; -+dnl ppc970) -+dnl AC_TRY_CFLAGS([-mcpu=g5],[CFLAGS="$CFLAGS -mcpu=g5"]) -+dnl AC_TRY_CFLAGS([-mtune=g5],[CFLAGS="$CFLAGS -mtune=g5"]) -+dnl AC_TRY_CFLAGS([-fast],[CFLAGS="$MORECFLAGS -fast"]);; -+dnl *) -+dnl AC_TRY_CFLAGS([-mpowerpc],[CFLAGS="$CFLAGS -mpowerpc"]);; -+dnl esac;; -+dnl *osf*) -+dnl AC_TRY_CFLAGS([-fast],[CFLAGS="$CFLAGS -fast"]);; -+dnl *sparcv8*|*sparcv9*) -+dnl AC_TRY_CFLAGS([-msupersparc],[CFLAGS="$CFLAGS -msupersparc"]) -+dnl if test x"$ac_cv_try_cflags_ok" = x"no"; then -+dnl AC_TRY_CFLAGS([-cg92],[CFLAGS="$CFLAGS -cg92"]) -+dnl if test x"$ac_cv_try_cflags_ok" = x"no"; then -+dnl AC_TRY_CFLAGS([-xcg92],[CFLAGS="$CFLAGS -xcg92"]) -+dnl fi -+dnl fi;; -+dnl esac -+dnl fi - - echo CFLAGS=$CFLAGS - echo MORECFLAGS=$MORECFLAGS -@@ -431,6 +455,26 @@ +@@ -434,6 +456,26 @@ edit_msg="++++++ This file is automatically generated, don't edit it by hand! ++++++" AC_SUBST(edit_msg) @@ -206,7 +63,7 @@ Last-Update: 2016-03-19 - naututil.h:naututil-h.in gtools.h:gtools-h.in) +dnl Checks for linker script support +gl_LD_VERSION_SCRIPT -+ + +dnl Checks for libraries +## pkg-config +PKG_PROG_PKG_CONFIG @@ -225,7 +82,7 @@ Last-Update: 2016-03-19 + naututil.h:naututil-h.in + gtools.h:gtools-h.in + ]) - ++ +AC_OUTPUT --- /dev/null +++ b/Makefile.am @@ -1471,9 +1328,9 @@ Last-Update: 2016-03-19 +]) --- a/traces.h +++ b/traces.h -@@ -22,6 +22,9 @@ - * 28-Jan-16 : version ready for nauty and Traces v.2.6 distribution * - *****************************************************************************/ +@@ -23,6 +23,9 @@ + * 12-Jul-16 : bug correction (reaching degree 2 vertices) * + *****************************************************************************/ +#ifndef _TRACES_H_ /* only process this file once */ +#define _TRACES_H_ @@ -1481,7 +1338,7 @@ Last-Update: 2016-03-19 #include "gtools.h" #include "schreier.h" -@@ -61,3 +64,5 @@ +@@ -62,3 +65,5 @@ extern void Traces(sparsegraph*,int*,int TracesStats*,sparsegraph*); extern void refine_tr(sparsegraph*,int*,int*,int*,int*,TracesOptions*); extern void traces_freedyn(void); diff --git a/nauty-popcnt.patch b/nauty-popcnt.patch index 5235107..5daf3a6 100644 --- a/nauty-popcnt.patch +++ b/nauty-popcnt.patch @@ -101,7 +101,7 @@ Last-Update: 2016-04-20 AS_IF([test "x$popcntarg" = "xnotgiven" -o "x$enable_popcnt" = "xyes"], [ have_hwpopcnt=0 test -e /proc/cpuinfo && grep -i popcnt /proc/cpuinfo >/dev/null && have_hwpopcnt=1 -@@ -329,7 +332,6 @@ AC_LINK_IFELSE([AC_LANG_SOURCE([#include +@@ -329,7 +333,6 @@ AC_LINK_IFELSE([AC_LANG_SOURCE([#include main(){unsigned int x; x = _mm_popcnt_u64(x);}])], [have_mmpop64=1], [have_mmpop64=0]) AC_MSG_RESULT($have_mmpop64) ], [ @@ -109,7 +109,7 @@ Last-Update: 2016-04-20 AC_MSG_CHECKING(if __builtin_popcount() is supported) AC_LINK_IFELSE([AC_LANG_SOURCE([main(){unsigned int x; x = __builtin_popcount(x);}])], [have_popcnt=1], [have_popcnt=0]) AC_MSG_RESULT($have_popcnt) -@@ -348,6 +350,7 @@ AC_SUBST(have_popcntl) +@@ -348,6 +351,7 @@ AC_SUBST(have_popcntl) AC_SUBST(have_popcntll) AC_SUBST(have_mmpop32) AC_SUBST(have_mmpop64) diff --git a/nauty.spec b/nauty.spec index 2d523a8..e058605 100644 --- a/nauty.spec +++ b/nauty.spec @@ -1,4 +1,4 @@ -%global nautybasever 2.6r5 +%global nautybasever 2.6r7 %global nautytarver %(tr -d . <<< %{nautybasever}) Name: nauty @@ -125,6 +125,9 @@ make check %{_libdir}/pkgconfig/%{name}.pc %changelog +* Sat Sep 10 2016 Jerry James - 2.6.7-1 +- New upstream version + * Thu Apr 21 2016 Jerry James - 2.6.5-1 - New upstream version diff --git a/sources b/sources index f996f5c..8a5d108 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -91b03a7b069962e94fc9aac8831ce8d2 nauty26r5.tar.gz +b2b18e03ea7698db3fbe06c5d76ad8fe nauty26r7.tar.gz