attachment:singular-3-0-4-4-20080711.p4.patch of freebsd/sage-3.4

   1 --- singular-3-0-4-4-20080711.p4/src/singuname.sh~	2007-10-11 19:46:37.000000000 +1000
   2 +++ singular-3-0-4-4-20080711.p4/src/singuname.sh	2009-03-17 20:45:24.617985525 +1100
   3 @@ -93,6 +93,17 @@
   4          exit 1
   5      fi
   6  # AMD-Opteron ########################################################
   7 +elif (echo $uname_a | $egrep "amd64" > $devnull)
   8 +then
   9 +    prefix=x86_64
  10 +    if (echo $uname_a | $egrep "FreeBSD" > $devnull)
  11 +    then
  12 +        echo ${prefix}-freebsd
  13 +        exit 0
  14 +    else
  15 +        echo ${prefix}-Unknown
  16 +        exit 1
  17 +    fi
  18  elif (echo $uname_m | $egrep "x86_64" > $devnull)
  19  then
  20      prefix=x86_64
  21 --- singular-3-0-4-4-20080711.p4/src/factory/cf_gmp.h~	2006-06-15 01:28:06.000000000 +1000
  22 +++ singular-3-0-4-4-20080711.p4/src/factory/cf_gmp.h	2009-03-20 04:49:46.474047718 +1100
  23 @@ -4,7 +4,7 @@
  24  #ifndef INCL_CF_GMP_H
  25  #define INCL_CF_GMP_H
  26  
  27 -#if defined(__cplusplus) && defined(__GNUC__)
  28 +#if 0 /* defined(__cplusplus) && defined(__GNUC__) */
  29  extern "C" {
  30  #undef __cplusplus
  31  #define _WCHAR_T_DECLARED
  32 --- singular-3-0-4-4-20080711.p4/spkg-install~	2009-02-24 06:25:57.000000000 +1100
  33 +++ singular-3-0-4-4-20080711.p4/spkg-install	2009-03-17 20:50:18.000575294 +1100
  34 @@ -98,6 +98,9 @@
  35  config()
  36  {
  37      cd $SRC
  38 +    cd Singular
  39 +    autoconf
  40 +    cd ..
  41      ./configure --prefix="$SAGE_LOCAL" \
  42                  --exec-prefix="$SAGE_LOCAL" \
  43                  --bindir="$SAGE_LOCAL"/bin \
  44 --- singular-3-0-4-4-20080711.p4/src/Singular/configure.in~	2008-06-11 02:12:28.000000000 +1000
  45 +++ singular-3-0-4-4-20080711.p4/src/Singular/configure.in	2009-03-17 20:43:35.040887242 +1100
  46 @@ -51,6 +51,11 @@
  47    AC_SUBST(SI_CPU_X86_64)
  48    AC_MSG_RESULT(SI_CPU_X86_64)
  49  fi
  50 +if test "$ac_cv_singuname" = x86_64-FreeBSD; then
  51 +  AC_DEFINE(SI_CPU_X86_64)
  52 +  AC_SUBST(SI_CPU_X86_64)
  53 +  AC_MSG_RESULT(SI_CPU_X86_64)
  54 +fi
  55  if test "$ac_cv_singuname" = ix86-Linux; then
  56    AC_DEFINE(SI_CPU_I386)
  57    AC_SUBST(SI_CPU_I386)
  58 @@ -435,7 +440,7 @@
  59  	        ac_lib_dl=yes
  60  	  fi
  61  	;;
  62 -	ix86-freebsd)
  63 +	*-freebsd)
  64  	  AC_CHECK_LIB(c, dlopen)
  65            if test "$ac_cv_lib_c_dlopen" = yes; then
  66  	  	LD_DYN_FLAGS="-Xlinker -E"
  67 --- singular-3-0-4-4-20080711.p4/src/kernel/mod_raw.cc~	2008-03-20 04:44:10.000000000 +1100
  68 +++ singular-3-0-4-4-20080711.p4/src/kernel/mod_raw.cc	2009-03-17 20:45:24.575985644 +1100
  69 @@ -204,6 +204,10 @@
  70  #define HAVE_ELF_SYSTEM
  71  #endif
  72  
  73 +#ifdef x86_64_freebsd
  74 +#define HAVE_ELF_SYSTEM
  75 +#endif
  76 +
  77  #ifdef sparc64_Linux
  78  #define HAVE_ELF_SYSTEM
  79  #endif