Ticket #13876: singular-p3.diff

SPKG.txt

@@ -76 +76 @@
    FLINT 2.x.  If a sufficiently recent version of FLINT is ever added
    to Sage, we should make Singular use it
    (configure --with-flint="$SAGE_LOCAL").
- * If the environment variable SINGULAR_XALLOC is set to "yes", then
+ * If the environment variable SINGULAR_DEBUG is set to "yes", then
    omalloc will be replaced by xalloc. The resulting Singular executable
    and libsingular library will be slower than with omalloc, but allow
    for easier debugging of memory corruptions.
 
 == ChangeLog ==
 
+=== singular-3-1-5.p3 (Volker Braun, 28 December 2012) ===
+ * Trac #13876: Rename SINGULAR_XALLOC to SAGE_DEBUG
+ * Build fixes for the Sage library with SAGE_DEBUG=yes
+
 === singular-3-1-5.p2 (Simon King, 03 December 2012) ===
  * Trac #13731
  * Optionally replace omalloc with xalloc (a thin compatibility layer

patches/conditional/singular_xalloc.patch

@@ -447 +447 @@
 diff -ruN a/omalloc/omalloc.h b/omalloc/omalloc.h
 --- a/omalloc/omalloc.h 1970-01-01 01:00:00.000000000 +0100
 +++ b/omalloc/omalloc.h 2012-12-21 11:08:42.137513466 +0100
-@@ -0,0 +1,223 @@
+@@ -0,0 +1,230 @@
 +#ifndef XMEMORY_H
 +#define XMEMORY_H
 +/****************************************
@@ -647 +647 @@
 +#define omTestBinAddrSize(A,B,C)                 (omError_NoError)
 +#define omInitRet_2_Info(argv0)                  ((void) 0)
 +#define omMergeStickyBinIntoBin(A,B)             ((void) 0)
++#define omIsTrackAddr(addr)             0
++#define omIsTrackAddrPage(page)         0
++#define omIsNormalBinPageAddr(addr)     omIsBinPageAddr(addr)
++#define omIsBinAddrTrackAddr(addr)      0
++#define omFreeKeptAddr()            ((void)0)
++#define omPrintUsedAddrs(fd,m)      ((void)0)
++#define omPrintUsedTrackAddrs(fd,m) ((void)0)
 +
 +enum omError_e
 +{

spkg-install

@@ -94 +94 @@
 
     if [ "x$SAGE_DEBUG" = "xyes" ]; then
         mv conditional/sage_debug.patch . || return $?
-    fi
-
-    if [ "x$SINGULAR_XALLOC" = "xyes" ]; then
         # Remove old omalloc files, except for configure
         mv ../src/omalloc/configure configure_omalloc
         rm -r ../src/omalloc/*