Changeset d4f80c in git


Ignore:
Timestamp:
May 3, 2006, 4:59:58 PM (17 years ago)
Author:
Hans Schönemann <hannes@…>
Branches:
(u'spielwiese', '8d54773d6c9e2f1d2593a28bc68b7eeab54ed529')
Children:
59334c07afef60a2bee32f2087a82ca8ae0e3e5e
Parents:
c1c269121f4f2fd68d492b638e0e2419bcbfb2bf
Message:
*hannes: 3-0-2: omalloc for 64bit


git-svn-id: file:///usr/local/Singular/svn/trunk@9095 2c84dea3-7e68-4137-9b89-c4e89433aadc
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • Singular/Makefile.in

    rc1c2691 rd4f80c  
    9191LIBS            = -lm @NEED_LIBS@
    9292else
    93 LIBS            = -lsingfac -lsingcf -lntl  -static -lreadline -lhtmlhelp -Xlinker -Bdynamic -lgmp -lcygncurses6
     93LIBS            = -lsingfac -lsingcf -lntl  -static -lreadline -lhtmlhelp -Xlinker -Bdynamic -lgmp -lomalloc_ndebug -lcygncurses6
    9494## -lpython_module -lpython2.4 /usr/local/lib/libboost_python-gcc-d-1_32.dll
    9595endif
     
    298298          -o Singular${S_EXT} \
    299299          tesths.cc iparith.o mpsr_Tok.o claptmpl.o\
    300           ${OBJS} ${LDFLAGS} ${LIBS} -lomalloc_ndebug ../kernel/mmalloc.o
     300          ${OBJS} ${LDFLAGS} ${LIBS} ../kernel/mmalloc.o
    301301
    302302../modules/python/libpython_module.a:
     
    317317        ${CXX} ${CXXFLAGS} ${CPPFLAGS} ${CXXTEMPLFLAGS} ${DEFS} -DGENTABLE \
    318318             -o gentable claptmpl.o iparith.cc tesths.cc mpsr_Tok.cc \
    319              ${OBJS} ${LDFLAGS} ${LIBS} -lomalloc_ndebug ../kernel/mmalloc.o
     319             ${OBJS} ${LDFLAGS} ${LIBS} ../kernel/mmalloc.o
    320320        ./gentable
    321321        /bin/rm -f gentable gentable.exe
  • Singular/configure

    rc1c2691 rd4f80c  
    603603SINGULAR_MAJOR_VERSION=${SINGULAR_MAJOR_VERSION:-3}
    604604SINGULAR_MINOR_VERSION=${SINGULAR_MINOR_VERSION:-0}
    605 SINGULAR_SUB_VERSION=${SINGULAR_SUB_VERSION:-1}
     605SINGULAR_SUB_VERSION=${SINGULAR_SUB_VERSION:-2}
    606606SINGULAR_VERSION="${SINGULAR_VERSION:-$SINGULAR_MAJOR_VERSION${VERSION_SEP}$SINGULAR_MINOR_VERSION${VERSION_SEP}$SINGULAR_SUB_VERSION}"
    607 VERSION_DATE=${VERSION_DATE:-"October 2005"}
     607VERSION_DATE=${VERSION_DATE:-"May 2006"}
    608608
    609609
     
    48774877fi
    48784878
     4879if test "$ac_cv_sizeof_voidp" != 4; then
     4880  NEED_LIBS="${NEED_LIBS} -lomalloc"
     4881else
     4882  NEED_LIBS="${NEED_LIBS} -lomalloc_ndebug"
     4883fi
     4884
    48794885
    48804886
    48814887
    48824888echo $ac_n "checking whether to have dbm links""... $ac_c" 1>&6
    4883 echo "configure:4884: checking whether to have dbm links" >&5
     4889echo "configure:4890: checking whether to have dbm links" >&5
    48844890if test "$with_dbm" != no; then
    48854891  cat >> confdefs.h <<\EOF
     
    48934899
    48944900echo $ac_n "checking whether to have namespaces""... $ac_c" 1>&6
    4895 echo "configure:4896: checking whether to have namespaces" >&5
     4901echo "configure:4902: checking whether to have namespaces" >&5
    48964902if test "$with_namespaces" != no; then
    48974903  echo "$ac_t""yes" 1>&6
     
    49054911
    49064912echo $ac_n "checking whether to have dynamic modules""... $ac_c" 1>&6
    4907 echo "configure:4908: checking whether to have dynamic modules" >&5
     4913echo "configure:4914: checking whether to have dynamic modules" >&5
    49084914if test "$with_dynamic_modules" = no || test "$ac_have_dl" != yes; then
    49094915  echo "$ac_t""no" 1>&6
     
    49174923
    49184924echo $ac_n "checking whether to have dynamic kernel""... $ac_c" 1>&6
    4919 echo "configure:4920: checking whether to have dynamic kernel" >&5
     4925echo "configure:4926: checking whether to have dynamic kernel" >&5
    49204926if test "$with_dynamic_kernel" != no && test "$ac_lib_dl" = yes; then
    49214927  DL_KERNEL=1
     
    49274933
    49284934echo $ac_n "checking whether to have Plural""... $ac_c" 1>&6
    4929 echo "configure:4930: checking whether to have Plural" >&5
     4935echo "configure:4936: checking whether to have Plural" >&5
    49304936if test "$with_Plural" != yes && test "$enable_Plural" != yes; then
    49314937  echo "$ac_t""no" 1>&6
  • Singular/configure.in

    rc1c2691 rd4f80c  
    4949SINGULAR_MAJOR_VERSION=${SINGULAR_MAJOR_VERSION:-3}
    5050SINGULAR_MINOR_VERSION=${SINGULAR_MINOR_VERSION:-0}
    51 SINGULAR_SUB_VERSION=${SINGULAR_SUB_VERSION:-1}
     51SINGULAR_SUB_VERSION=${SINGULAR_SUB_VERSION:-2}
    5252SINGULAR_VERSION="${SINGULAR_VERSION:-$SINGULAR_MAJOR_VERSION${VERSION_SEP}$SINGULAR_MINOR_VERSION${VERSION_SEP}$SINGULAR_SUB_VERSION}"
    53 VERSION_DATE=${VERSION_DATE:-"October 2005"}
     53VERSION_DATE=${VERSION_DATE:-"May 2006"}
    5454
    5555dnl pass them on into the Makefiles
     
    831831fi
    832832
     833if test "$ac_cv_sizeof_voidp" != 4; then
     834  NEED_LIBS="${NEED_LIBS} -lomalloc"
     835else
     836  NEED_LIBS="${NEED_LIBS} -lomalloc_ndebug"
     837fi
     838
    833839
    834840AC_SUBST(NEED_LIBS)
  • configure

    rc1c2691 rd4f80c  
    594594SINGULAR_MAJOR_VERSION=3
    595595SINGULAR_MINOR_VERSION=0
    596 SINGULAR_SUB_VERSION=1
     596SINGULAR_SUB_VERSION=2
    597597VERSION_SEP="-"
    598598SINGULAR_SHORT_VERSION="${SINGULAR_MAJOR_VERSION}${VERSION_SEP}${SINGULAR_MINOR_VERSION}"
    599599SINGULAR_VERSION="${SINGULAR_SHORT_VERSION}${VERSION_SEP}${SINGULAR_SUB_VERSION}"
    600600SINGULAR_RPM_VERSION="${SINGULAR_MAJOR_VERSION}.${SINGULAR_MINOR_VERSION}.${SINGULAR_SUB_VERSION}"
    601 VERSION_DATE="October 2005"
     601VERSION_DATE="May 2006"
    602602SINGULAR_ROOT_DIR=$pwd
    603603
  • configure.in

    rc1c2691 rd4f80c  
    1111SINGULAR_MAJOR_VERSION=3
    1212SINGULAR_MINOR_VERSION=0
    13 SINGULAR_SUB_VERSION=1
     13SINGULAR_SUB_VERSION=2
    1414VERSION_SEP="-"
    1515SINGULAR_SHORT_VERSION="${SINGULAR_MAJOR_VERSION}${VERSION_SEP}${SINGULAR_MINOR_VERSION}"
    1616SINGULAR_VERSION="${SINGULAR_SHORT_VERSION}${VERSION_SEP}${SINGULAR_SUB_VERSION}"
    1717SINGULAR_RPM_VERSION="${SINGULAR_MAJOR_VERSION}.${SINGULAR_MINOR_VERSION}.${SINGULAR_SUB_VERSION}"
    18 VERSION_DATE="October 2005"
     18VERSION_DATE="May 2006"
    1919SINGULAR_ROOT_DIR=$pwd
    2020
  • kernel/Makefile.in

    rc1c2691 rd4f80c  
    6565else
    6666# for the 2-0-* versions under Windows, we don't need gdbm, readline and ncurses
    67 LIBS            = -lsingfac -lsingcf -lntl -lgmp -lreadline -lncurses
     67LIBS            = -lsingfac -lsingcf -lntl -lgmp -lreadline -lncurses -lomalloc_ndebug
    6868#LIBS           = -lsingfac -lsingcf -lgmp
    6969endif
Note: See TracChangeset for help on using the changeset viewer.