Attachment 596916 Details for Bug 819264 – Macaulay2-factory.patch

[patch] Macaulay2-factory.patch

Macaulay2-factory.patch (text/plain), 3.98 KB, created by Paulo Andrade on 2012-07-08 19:50:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Paulo Andrade

Created: 2012-07-08 19:50:07 UTC

Size: 3.98 KB

patch

obsolete

>diff -up Macaulay2-1.4-r12617/configure.ac.orig Macaulay2-1.4-r12617/configure.ac
>--- Macaulay2-1.4-r12617/configure.ac.orig	2012-07-08 16:05:56.556989377 -0400
>+++ Macaulay2-1.4-r12617/configure.ac	2012-07-08 16:06:55.394991646 -0400
>@@ -1110,15 +1110,15 @@ else SINGULARLIBS="-lfac -lcf -lcfmem"
> fi
> while test $BUILD_factory = no -o $BUILD_libfac = no
> do AC_LANG(C++)
>-   AC_CHECK_HEADER(factory.h,,BUILD_factory=yes BUILD_libfac=yes ; break)
>+   AC_CHECK_HEADER(factory/factory.h,,BUILD_factory=yes BUILD_libfac=yes ; break)
>    AC_CHECK_HEADER(factor.h,,BUILD_factory=yes BUILD_libfac=yes ; break)
>    SAVELIBS=$LIBS
>    LIBS="$SINGULARLIBS $LIBS"
>    AC_MSG_CHECKING([whether factory library is installed ($SINGULARLIBS)])
>    dnl if -lntl is needed, it's been added to $LIBS above
>    AC_LINK_IFELSE( [[ #undef NOSTREAMIO
>-	              #include <factory.h>
>-		      #include <templates/ftmpl_inst.cc>
>+	              #include <factory/factory.h>
>+		      #include <factory/templates/ftmpl_inst.cc>
> 		      int main () { return 0 ; } ]],
>        AC_MSG_RESULT(yes),
>        AC_MSG_RESULT(no) ; BUILD_factory=yes BUILD_libfac=yes LIBS=$SAVELIBS ; break )
>@@ -1127,14 +1127,14 @@ do AC_LANG(C++)
> 	   #include <stdio.h>
> 	   #include <string.h>
>            #undef NOSTREAMIO
>-	   #include <factory.h>
>+	   #include <factory/factory.h>
> 	   #include <factor.h>
>-	   #include <templates/ftmpl_inst.cc>
>+	   #include <factory/templates/ftmpl_inst.cc>
> 	   extern const char * libfac_version;
> 	   int main () {
> 		FILE *msg = fdopen(]]AS_MESSAGE_FD[[,"w");
>-		static int factoryV[3], fV[3] = {3,1,0}, fOK;
>-		static int  libfacV[3], lV[3] = {3,1,0}, lOK;
>+		static int factoryV[3], fV[3] = {3,1,3}, fOK;
>+		static int  libfacV[3], lV[3] = {3,1,3}, lOK;
> 		sscanf(FACTORYVERSION,"%d.%d.%d", &factoryV[0], &factoryV[1], &factoryV[2]);
> 		sscanf(libfac_version,"%d.%d.%d", &libfacV[0], &libfacV[1], &libfacV[2]);
> 		fOK = factoryV[0] > fV[0] ||
>diff -up Macaulay2-1.4-r12617/Macaulay2/packages/Macaulay2Doc/test/engine/factor.cc.orig Macaulay2-1.4-r12617/Macaulay2/packages/Macaulay2Doc/test/engine/factor.cc
>--- Macaulay2-1.4-r12617/Macaulay2/packages/Macaulay2Doc/test/engine/factor.cc.orig	2012-07-08 16:07:57.044993998 -0400
>+++ Macaulay2-1.4-r12617/Macaulay2/packages/Macaulay2Doc/test/engine/factor.cc	2012-07-08 16:08:20.034994889 -0400
>@@ -6,8 +6,8 @@
> 
> #include "config.h"
> #include <gc/gc.h>
>-#include <factory.h>
>-#include <templates/ftmpl_inst.cc>
>+#include <factory/factory.h>
>+#include <factory/templates/ftmpl_inst.cc>
> 
> extern "C" void factory_setup() { On(SW_USE_NTL); }
> extern "C" void outofmem() { cerr << "out of memory" << endl; exit(1); }
>diff -up Macaulay2-1.4-r12617/Macaulay2/d/version.dd.orig Macaulay2-1.4-r12617/Macaulay2/d/version.dd
>--- Macaulay2-1.4-r12617/Macaulay2/d/version.dd.orig	2012-07-08 16:38:09.758063406 -0400
>+++ Macaulay2-1.4-r12617/Macaulay2/d/version.dd	2012-07-08 16:38:28.803064176 -0400
>@@ -55,7 +55,7 @@ header "
>    extern unsigned int GC_version; /* in libgc.a */
>    #include <gmp.h>
>    #include <NTL/version.h>
>-   #include <factoryconf.h>
>+   #include <factory/factoryconf.h>
>    #undef ASSERT
>    static int32_t endianness_string[2] = {0x61626364,0};
>    #include <readline/readline.h>
>diff -up Macaulay2-1.4-r12617/Macaulay2/d/M2-factory.cpp.orig Macaulay2-1.4-r12617/Macaulay2/d/M2-factory.cpp
>--- Macaulay2-1.4-r12617/Macaulay2/d/M2-factory.cpp.orig	2012-07-08 16:40:29.318068752 -0400
>+++ Macaulay2-1.4-r12617/Macaulay2/d/M2-factory.cpp	2012-07-08 16:40:45.172069426 -0400
>@@ -1,5 +1,5 @@
> #include <M2/config.h>
>-#include <factory.h>		// to get definition of factoryseed()
>+#include <factory/factory.h>		// to get definition of factoryseed()
> 
> // extern "C" void actors5_setFactorySeed(int s) { 
> //   factoryseed(s);
>@@ -12,7 +12,7 @@ void factory_setup_1() {
> #define Matrix MaTrIx
> #include <factor.h>		// from Messollen's libfac
> #undef Matrix
>-#include <templates/ftmpl_list.cc>
>+#include <factory/templates/ftmpl_list.cc>
> 
> // Local Variables:
> // compile-command: "make -C $M2BUILDDIR/Macaulay2/d "

Actions: View | Diff

Attachments on bug 819264: 596916