Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv5604
Modified Files:
singular.info
Added Files:
singular.patch
Log Message:
Cleanup, fix for building singular on 10.7
--- NEW FILE: singular.patch ---
diff -ruN Singular-3-1-3/CMakeLists.txt Singular-3-1-3-patched/CMakeLists.txt
--- Singular-3-1-3/CMakeLists.txt 2011-09-29 15:13:38.000000000 +0200
+++ Singular-3-1-3-patched/CMakeLists.txt 2011-09-29 15:44:02.000000000
+0200
@@ -120,12 +120,12 @@
#set(CMAKE_CXX_FLAGS "-W -Wall -Wextra -Wno-non-virtual-dtor")
set(CMAKE_C_FLAGS "-w -pipe ")
- set(CMAKE_CXX_FLAGS "-w -pipe ") #--no-rtti
+ set(CMAKE_CXX_FLAGS "-w -pipe ") #-fno-rtti
# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-implicit-templates")
# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
set(CMAKE_C_FLAGS_RELEASE "-O3 -fomit-frame-pointer")
- set(CMAKE_CXX_FLAGS_RELEASE "-O3 --no-rtti -fomit-frame-pointer")
+ set(CMAKE_CXX_FLAGS_RELEASE "-O3 -fno-rtti -fomit-frame-pointer")
#set(CMAKE_C_FLAGS_RELEASE "-O2 -fomit-frame-pointer -DNDEBUG ")
#set(CMAKE_CXX_FLAGS_RELEASE "-O2 -fomit-frame-pointer -DNDEBUG -DOM_NDEBUG")
diff -ruN Singular-3-1-3/IntegerProgramming/gen_test.cc
Singular-3-1-3-patched/IntegerProgramming/gen_test.cc
--- Singular-3-1-3/IntegerProgramming/gen_test.cc 2011-09-29
15:13:39.000000000 +0200
+++ Singular-3-1-3-patched/IntegerProgramming/gen_test.cc 2011-09-30
08:44:21.000000000 +0200
@@ -8,7 +8,7 @@
#include "testdata.h"
-main()
+int main()
{
ofstream output1("IP/testmatrix1");
random_matrix(3,4,0,5,output1);
diff -ruN Singular-3-1-3/IntegerProgramming/si_gmp.h
Singular-3-1-3-patched/IntegerProgramming/si_gmp.h
--- Singular-3-1-3/IntegerProgramming/si_gmp.h 2011-09-29 15:13:39.000000000
+0200
+++ Singular-3-1-3-patched/IntegerProgramming/si_gmp.h 2011-09-29
17:31:08.000000000 +0200
@@ -4,6 +4,7 @@
#ifndef INCL_CF_GMP_H
#define INCL_CF_GMP_H
+#include <stddef.h>
#if defined(__cplusplus) && defined(__GNUC__)
extern "C" {
#undef __cplusplus
diff -ruN Singular-3-1-3/Singular/configure
Singular-3-1-3-patched/Singular/configure
--- Singular-3-1-3/Singular/configure 2011-09-29 15:13:41.000000000 +0200
+++ Singular-3-1-3-patched/Singular/configure 2011-09-29 15:43:10.000000000
+0200
@@ -1355,10 +1355,10 @@
ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS
conftest.$ac_ext $LIBS 1>&5'
cross_compiling=$ac_cv_prog_cxx_cross
- # check whether gcc accepts --no-rtti
- echo $ac_n "checking whether gcc accepts --no-rtti""... $ac_c" 1>&6
-echo "configure:1361: checking whether gcc accepts --no-rtti" >&5
- CXXFLAGS="${CXXFLAGS} --no-rtti"
+ # check whether gcc accepts -fno-rtti
+ echo $ac_n "checking whether gcc accepts -fno-rtti""... $ac_c" 1>&6
+echo "configure:1361: checking whether gcc accepts -fno-rtti" >&5
+ CXXFLAGS="${CXXFLAGS} -fno-rtti"
if eval "test \"`echo '$''{'ac_cv_cxx_have_rtti'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1387,14 +1387,14 @@
if test "${ac_cv_cxx_have_rtti}" != yes; then
CXXFLAGS="$temp_flags"
else
- CXXFLAGS="${temp_flags} --no-rtti"
+ CXXFLAGS="${temp_flags} -fno-rtti"
temp_flags="${CXXFLAGS}"
fi
-# check whether gcc accepts --no-exceptions
- echo $ac_n "checking whether gcc accepts --no-exceptions""... $ac_c" 1>&6
-echo "configure:1397: checking whether gcc accepts --no-exceptions" >&5
- CXXFLAGS="${CXXFLAGS} --no-exceptions"
+# check whether gcc accepts -fno-exceptions
+ echo $ac_n "checking whether gcc accepts -fno-exceptions""... $ac_c" 1>&6
+echo "configure:1397: checking whether gcc accepts -fno-exceptions" >&5
+ CXXFLAGS="${CXXFLAGS} -fno-exceptions"
if eval "test \"`echo '$''{'ac_cv_cxx_have_exceptions'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1423,7 +1423,7 @@
if test "${ac_cv_cxx_have_exceptions}" != yes; then
CXXFLAGS="$temp_flags"
else
- CXXFLAGS="${temp_flags} --no-exceptions"
+ CXXFLAGS="${temp_flags} -fno-exceptions"
temp_flags="${CXXFLAGS}"
fi
@@ -1522,12 +1522,12 @@
fi
temp_flags="${CXXFLAGS}"
if test "${ac_cv_cxx_have_rtti}" = yes; then
- CXXFLAGS="${temp_flags} --no-rtti"
+ CXXFLAGS="${temp_flags} -fno-rtti"
fi
temp_flags="${CXXFLAGS}"
CXXTEMPLFLAGS="-fno-implicit-templates"
if test "${ac_cv_cxx_have_exceptions}" = yes; then
- CXXTEMPLFLAGS="${CXXTEMPLFLAGS} --no-exceptions"
+ CXXTEMPLFLAGS="${CXXTEMPLFLAGS} -fno-exceptions"
fi
if test "$ac_cv_is_aix" = yes; then
CXXNOOPTFLAGS="-w"
diff -ruN Singular-3-1-3/Singular/libparse.cc
Singular-3-1-3-patched/Singular/libparse.cc
--- Singular-3-1-3/Singular/libparse.cc 2011-09-29 15:13:47.000000000 +0200
+++ Singular-3-1-3-patched/Singular/libparse.cc 2011-09-29 15:15:06.000000000
+0200
@@ -3503,14 +3503,14 @@
}
#ifdef STANDALONE_PARSER
-main( int argc, char *argv[] )
+int main( int argc, char *argv[] )
{
lib_style_types lib_style;
main_init(argc, argv);
if(yyin == NULL)
{
fprintf(stderr, "No library found to parse.\n");
- exit(1);
+ return 1;
}
if (! (texinfo_out || category_out))
{
@@ -3532,7 +3532,7 @@
else if(pi!=NULL) printpi(pi);
if (texinfo_out)
printf("1;");
- exit(0);
+ return 0;
}
#endif /* STANDALONE_PARSER */
diff -ruN Singular-3-1-3/Singular/libparse.l
Singular-3-1-3-patched/Singular/libparse.l
--- Singular-3-1-3/Singular/libparse.l 2011-09-29 15:13:47.000000000 +0200
+++ Singular-3-1-3-patched/Singular/libparse.l 2011-09-29 15:15:19.000000000
+0200
@@ -964,14 +964,14 @@
}
#ifdef STANDALONE_PARSER
-main( int argc, char *argv[] )
+int main( int argc, char *argv[] )
{
lib_style_types lib_style;
main_init(argc, argv);
if(yyin == NULL)
{
fprintf(stderr, "No library found to parse.\n");
- exit(1);
+ return 1;
}
if (! (texinfo_out || category_out))
{
@@ -993,7 +993,7 @@
else if(pi!=NULL) printpi(pi);
if (texinfo_out)
printf("1;");
- exit(0);
+ return 0;
}
#endif /* STANDALONE_PARSER */
diff -ruN Singular-3-1-3/dyn_modules/bigintm/SConstruct
Singular-3-1-3-patched/dyn_modules/bigintm/SConstruct
--- Singular-3-1-3/dyn_modules/bigintm/SConstruct 2011-09-29
15:13:38.000000000 +0200
+++ Singular-3-1-3-patched/dyn_modules/bigintm/SConstruct 2011-09-29
15:43:56.000000000 +0200
@@ -17,7 +17,7 @@
#env.SharedObject(target = 'mod_main.o', source = 'mod_main.cc')
-CXXTEMPLFLAGS = "-fno-implicit-templates --no-exceptions"
+CXXTEMPLFLAGS = "-fno-implicit-templates -fno-exceptions"
if env ['PLATFORM'] == "darwin":
MACOSXMODULEFLAGS = '-twolevel_namespace -weak_reference_mismatches weak
-undefined dynamic_lookup'
@@ -49,7 +49,7 @@
SHLIBSUFFIX = ".so",
CPPPATH = SING_INCLUDES,
CPPDEFINES = ["NDEBUG", "OM_NDEBUG"],
- CXXFLAGS = "-O3 -fomit-frame-pointer --no-rtti " + CXXTEMPLFLAGS,
+ CXXFLAGS = "-O3 -fomit-frame-pointer -fno-rtti " + CXXTEMPLFLAGS,
CCFLAGS="-O3 -fomit-frame-pointer ",
LDMODULEFLAGS = BUNDLETEMPFLAGS,
LIBS=[])
diff -ruN Singular-3-1-3/dyn_modules/modgen/Makefile.in
Singular-3-1-3-patched/dyn_modules/modgen/Makefile.in
--- Singular-3-1-3/dyn_modules/modgen/Makefile.in 2011-09-29
15:13:38.000000000 +0200
+++ Singular-3-1-3-patched/dyn_modules/modgen/Makefile.in 2011-09-29
15:42:29.000000000 +0200
@@ -44,7 +44,7 @@
##
## compiler and linker options
##
-CFLAGS += --no-rtti --no-exceptions -O3 -w -fomit-frame-pointer -pipe
-fno-implicit-templates \
+CFLAGS += -fno-rtti -fno-exceptions -O3 -w -fomit-frame-pointer -pipe
-fno-implicit-templates \
-g -I${includedir} -I../include -I${topsrcdir}/.. -DNDEBUG
-DMODULE_GENERATOR \
-D${SING_UNAME}
LIBS += -L/usr/local/lib
diff -ruN Singular-3-1-3/dyn_modules/syzextra/SConstruct
Singular-3-1-3-patched/dyn_modules/syzextra/SConstruct
--- Singular-3-1-3/dyn_modules/syzextra/SConstruct 2011-09-29
15:13:38.000000000 +0200
+++ Singular-3-1-3-patched/dyn_modules/syzextra/SConstruct 2011-09-29
15:43:53.000000000 +0200
@@ -17,7 +17,7 @@
#env.SharedObject(target = 'mod_main.o', source = 'mod_main.cc')
-CXXTEMPLFLAGS = "-fno-implicit-templates --no-exceptions"
+CXXTEMPLFLAGS = "-fno-implicit-templates -fno-exceptions"
if env ['PLATFORM'] == "darwin":
MACOSXMODULEFLAGS = '-twolevel_namespace -weak_reference_mismatches weak
-undefined dynamic_lookup'
@@ -49,7 +49,7 @@
SHLIBSUFFIX = ".so",
CPPPATH = SING_INCLUDES,
CPPDEFINES = ["NDEBUG", "OM_NDEBUG"],
- CXXFLAGS = "-O3 -fomit-frame-pointer --no-rtti " + CXXTEMPLFLAGS,
+ CXXFLAGS = "-O3 -fomit-frame-pointer -fno-rtti " + CXXTEMPLFLAGS,
CCFLAGS="-O3 -fomit-frame-pointer ",
LDMODULEFLAGS = BUNDLETEMPFLAGS,
LIBS=[])
diff -ruN Singular-3-1-3/factory/CMakeLists.txt
Singular-3-1-3-patched/factory/CMakeLists.txt
--- Singular-3-1-3/factory/CMakeLists.txt 2011-09-29 15:13:39.000000000
+0200
+++ Singular-3-1-3-patched/factory/CMakeLists.txt 2011-09-29
15:43:50.000000000 +0200
@@ -74,7 +74,7 @@
if (${CMAKE_CXX_COMPILER_ID} MATCHES "GNU")
#set(CMAKE_CXX_FLAGS "-W -Wall -Wextra -Wno-non-virtual-dtor")
- set(CMAKE_CXX_FLAGS "-w --no-rtti -pipe ")
+ set(CMAKE_CXX_FLAGS "-w -fno-rtti -pipe ")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-implicit-templates")
#add_definitions(-DNDEBUG -DOM_NDEBUG -Dx86_64_Linux -DHAVE_CONFIG_H)
diff -ruN Singular-3-1-3/kernel/si_gmp.h Singular-3-1-3-patched/kernel/si_gmp.h
--- Singular-3-1-3/kernel/si_gmp.h 2011-09-29 15:13:39.000000000 +0200
+++ Singular-3-1-3-patched/kernel/si_gmp.h 2011-09-29 17:31:31.000000000
+0200
@@ -2,6 +2,8 @@
#ifndef INCL_CF_GMP_H
#define INCL_CF_GMP_H
+
+#include <stddef.h>
#ifdef HAVE_FACTORY
# include <factory/cf_gmp.h>
#else
diff -ruN Singular-3-1-3/libfac/CMakeLists.txt
Singular-3-1-3-patched/libfac/CMakeLists.txt
--- Singular-3-1-3/libfac/CMakeLists.txt 2011-09-29 15:13:39.000000000
+0200
+++ Singular-3-1-3-patched/libfac/CMakeLists.txt 2011-09-29
15:43:48.000000000 +0200
@@ -35,7 +35,7 @@
if (${CMAKE_CXX_COMPILER_ID} MATCHES "GNU")
#set(CMAKE_CXX_FLAGS "-W -Wall -Wextra -Wno-non-virtual-dtor")
- set(CMAKE_CXX_FLAGS "-w --no-rtti -pipe ")
+ set(CMAKE_CXX_FLAGS "-w -fno-rtti -pipe ")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-implicit-templates")
#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
Index: singular.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/singular.info,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- singular.info 29 Sep 2011 08:46:19 -0000 1.16
+++ singular.info 30 Sep 2011 14:13:36 -0000 1.17
@@ -16,25 +16,12 @@
Package: singular
Version: 3.1.3.2
-Revision: 1
+Revision: 2
#
Maintainer: Max Horn <[email protected]>
HomePage: http://www.singular.uni-kl.de
License: GPL
#
-Description: Computer algebra system
-DescDetail: <<
-Singular is a computer algebra system for polynomial computations, with
-special emphasis on commutative and non-commutative algebra, algebraic
-geometry, and singularity theory.
-
-Its main computational objects are ideals, modules and matrices over a
-large number of baserings.
-<<
-DescPackaging: <<
- Previous revisions by Michael Brickenstein.
-<<
-#
Depends: readline5-shlibs (>= 5.0-1004), libncurses5-shlibs (>=
5.4-20041023-1006), gmp5-shlibs, libmpfr4-shlibs
BuildDepends: readline5 (>= 5.0-1004), libncurses5 (>= 5.4-20041023-1006),
gmp5, libmpfr4
BuildConflicts: broken-gcc
@@ -44,6 +31,9 @@
Source-MD5: c4fa20969a1e49b843c32cb95815b05b
SourceDirectory: Singular-3-1-3
#
+PatchFile: %n.patch
+PatchFile-MD5: a9bd3bc4d9566ff6c28e5271b6d1b5c7
+#
ConfigureParams: <<
--disable-doc \
--libdir=%i/lib/Singular \
@@ -63,15 +53,6 @@
#! /bin/sh -ev
rm -rf gmp
rm -rf doc
-#rm -rf ntl/doc
-#echo "#undef PDEBUG" >> Singular/mod2.h.in
-#echo "#undef PDEBUG" >> kernel/mod2.h.in
-#export ac_cv_header_boost_dynamic_bitset_hpp=no
-
-find . -name configure -exec touch "{}" ";"
-find . -name configure -exec sed -i -e "s/-fno-implicit-templates//" "{}" ";"
-find . -name configure -exec sed -i -e "s/--no-exceptions//" "{}" ";"
-find . -name Makefile -exec sed -i -e "s/-fno-implicit-templates//" "{}" ";"
./configure %c
<<
#
@@ -149,3 +130,24 @@
done
<<
DocFiles: COPYING README
+#
+Description: Computer algebra system
+DescDetail: <<
+Singular is a computer algebra system for polynomial computations, with
+special emphasis on commutative and non-commutative algebra, algebraic
+geometry, and singularity theory.
+
+Its main computational objects are ideals, modules and matrices over a
+large number of baserings.
+<<
+DescPackaging: <<
+ Disabling MP on 64 bit as it requires sizeof(long)==4.
+
+ Patching libparse.{l,cc} to avoid error with strict C++ compilers.
+
+ Add explict include for <stddef.h> to work around problems on 10.7
+ caused by singular trying to "trick" GMP into thinking it is being
+ compiled in a C compiler, not a C++ compiler.
+
+ Previous revisions by Michael Brickenstein.
+<<
------------------------------------------------------------------------------
All of the data generated in your IT infrastructure is seriously valuable.
Why? It contains a definitive record of application performance, security
threats, fraudulent activity, and more. Splunk takes this data and makes
sense of it. IT sense. And common sense.
http://p.sf.net/sfu/splunk-d2dcopy2
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
