56 lines
1.9 KiB
Diff
56 lines
1.9 KiB
Diff
diff -up Singular-3-1-7/Singular/Makefile.in.undefined Singular-3-1-7/Singular/Makefile.in
|
|
--- Singular-3-1-7/Singular/Makefile.in.undefined 2016-02-15 21:28:04.755898679 -0700
|
|
+++ Singular-3-1-7/Singular/Makefile.in 2016-02-15 21:31:11.347859890 -0700
|
|
@@ -144,7 +144,7 @@ LIBSINGULAR_LIBS =-lsingfac -lsingcf -ln
|
|
|
|
SO_SUFFIX = so
|
|
|
|
-LIBSINGULAR_FLAGS = -shared
|
|
+LIBSINGULAR_FLAGS = -shared -Wl,--no-undefined
|
|
LIBSINGULAR_LD = $(CXX)
|
|
|
|
# correct suffix for dynamic linking
|
|
diff -up Singular-3-1-7/Singular/misc_ip.cc.undefined Singular-3-1-7/Singular/misc_ip.cc
|
|
--- Singular-3-1-7/Singular/misc_ip.cc.undefined 2014-08-06 09:59:15.000000000 -0600
|
|
+++ Singular-3-1-7/Singular/misc_ip.cc 2016-02-15 21:31:11.349859729 -0700
|
|
@@ -1269,7 +1269,6 @@ void siInit(char *name)
|
|
errorreported = 0;
|
|
}
|
|
|
|
-#ifdef LIBSINGULAR
|
|
#ifdef HAVE_FACTORY
|
|
// the init routines of factory need mmInit
|
|
int mmInit( void )
|
|
@@ -1277,4 +1276,3 @@ int mmInit( void )
|
|
return 1;
|
|
}
|
|
#endif
|
|
-#endif
|
|
diff -up Singular-3-1-7/Singular/tesths.cc.undefined Singular-3-1-7/Singular/tesths.cc
|
|
--- Singular-3-1-7/Singular/tesths.cc.undefined 2014-08-06 09:59:15.000000000 -0600
|
|
+++ Singular-3-1-7/Singular/tesths.cc 2016-02-15 21:32:47.063145511 -0700
|
|
@@ -51,23 +51,6 @@
|
|
extern int siInit(char *);
|
|
|
|
#if ! defined(LIBSINGULAR)
|
|
-static int mmInit2( void )
|
|
-{
|
|
-#if defined(OMALLOC_USES_MALLOC) || defined(X_OMALLOC)
|
|
- /* in mmstd.c, for some architectures freeSize() unconditionally uses the *system* free() */
|
|
- /* sage ticket 5344: http://trac.sagemath.org/sage_trac/ticket/5344 */
|
|
- /* do not rely on the default in Singular as libsingular may be different */
|
|
- mp_set_memory_functions(omMallocFunc,omReallocSizeFunc,omFreeSizeFunc);
|
|
-#else
|
|
- mp_set_memory_functions(malloc,reallocSize,freeSize);
|
|
-#endif
|
|
- return 1;
|
|
-}
|
|
-int mmInit( void )
|
|
-{
|
|
- return mmInit2();
|
|
-}
|
|
-
|
|
/*0 implementation*/
|
|
int main( /* main entry to Singular */
|
|
int argc, /* number of parameter */
|