Ticket #13876: singular-p3.diff

File singular-p3.diff, 2.5 KB (added by vbraun, 7 years ago)

diff for review only

  • SPKG.txt

    diff -r bf0e6e20391c -r 5518fc960e09 SPKG.txt
    a b  
    7676   FLINT 2.x.  If a sufficiently recent version of FLINT is ever added
    7777   to Sage, we should make Singular use it
    7878   (configure --with-flint="$SAGE_LOCAL").
    79  * If the environment variable SINGULAR_XALLOC is set to "yes", then
     79 * If the environment variable SINGULAR_DEBUG is set to "yes", then
    8080   omalloc will be replaced by xalloc. The resulting Singular executable
    8181   and libsingular library will be slower than with omalloc, but allow
    8282   for easier debugging of memory corruptions.
    8383
    8484== ChangeLog ==
    8585
     86=== singular-3-1-5.p3 (Volker Braun, 28 December 2012) ===
     87 * Trac #13876: Rename SINGULAR_XALLOC to SAGE_DEBUG
     88 * Build fixes for the Sage library with SAGE_DEBUG=yes
     89
    8690=== singular-3-1-5.p2 (Simon King, 03 December 2012) ===
    8791 * Trac #13731
    8892 * Optionally replace omalloc with xalloc (a thin compatibility layer
  • patches/conditional/singular_xalloc.patch

    diff -r bf0e6e20391c -r 5518fc960e09 patches/conditional/singular_xalloc.patch
    a b  
    447447diff -ruN a/omalloc/omalloc.h b/omalloc/omalloc.h
    448448--- a/omalloc/omalloc.h 1970-01-01 01:00:00.000000000 +0100
    449449+++ b/omalloc/omalloc.h 2012-12-21 11:08:42.137513466 +0100
    450 @@ -0,0 +1,223 @@
     450@@ -0,0 +1,230 @@
    451451+#ifndef XMEMORY_H
    452452+#define XMEMORY_H
    453453+/****************************************
     
    647647+#define omTestBinAddrSize(A,B,C)                 (omError_NoError)
    648648+#define omInitRet_2_Info(argv0)                  ((void) 0)
    649649+#define omMergeStickyBinIntoBin(A,B)             ((void) 0)
     650+#define omIsTrackAddr(addr)             0
     651+#define omIsTrackAddrPage(page)         0
     652+#define omIsNormalBinPageAddr(addr)     omIsBinPageAddr(addr)
     653+#define omIsBinAddrTrackAddr(addr)      0
     654+#define omFreeKeptAddr()            ((void)0)
     655+#define omPrintUsedAddrs(fd,m)      ((void)0)
     656+#define omPrintUsedTrackAddrs(fd,m) ((void)0)
    650657+
    651658+enum omError_e
    652659+{
  • spkg-install

    diff -r bf0e6e20391c -r 5518fc960e09 spkg-install
    a b  
    9494
    9595    if [ "x$SAGE_DEBUG" = "xyes" ]; then
    9696        mv conditional/sage_debug.patch . || return $?
    97     fi
    98 
    99     if [ "x$SINGULAR_XALLOC" = "xyes" ]; then
    10097        # Remove old omalloc files, except for configure
    10198        mv ../src/omalloc/configure configure_omalloc
    10299        rm -r ../src/omalloc/*