Changeset 1684c3 in git
- Timestamp:
- Nov 15, 2013, 5:09:41 PM (9 years ago)
- Branches:
- (u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'ad2543eab51733612ba7d118afc77edca719600e')
- Children:
- bbeddf73180e5a0b82609d4054f2cf3d3de40a27
- Parents:
- c6f0451f6fc744c2dac1401c4d9346c784f6b28b
- git-author:
- Oleksandr Motsak <motsak@mathematik.uni-kl.de>2013-11-15 17:09:41+01:00
- git-committer:
- Oleksandr Motsak <motsak@mathematik.uni-kl.de>2013-11-15 17:17:40+01:00
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
Singular/Makefile.am
rc6f0451 r1684c3 19 19 GIT_VERSION := $(shell $(top_srcdir)/git-version-gen $(top_srcdir)/.tarball-git-version) 20 20 21 AM_CPPFLAGS = -I${top_srcdir} -I${top_builddir} -I${top_srcdir}/numeric -I${top_builddir}/numeric -I${top_srcdir}/kernel -I${top_builddir}/kernel -I${top_srcdir}/libpolys -I${top_builddir}/libpolys $(GMP_CFLAGS) -I${top_srcdir}/factory/include -I${top_builddir}/factory/include $(FACTORY_CFLAGS) $(NTL_CFLAGS) $(FLINT_CFLAGS) -DHAVE_CONFIG_H -DGIT_VERSION='"$(GIT_VERSION)"' 22 21 23 if ENABLE_FACTORY 22 24 USE_FACTORY = -L${top_builddir}/factory … … 25 27 endif 26 28 27 AM_CPPFLAGS = -I${top_srcdir} -I${top_builddir} -I${top_srcdir}/numeric -I${top_builddir}/numeric -I${top_srcdir}/kernel -I${top_builddir}/kernel -I${top_srcdir}/libpolys -I${top_builddir}/libpolys $(GMP_CFLAGS) -I${top_srcdir}/factory/include -I${top_builddir}/factory/include $(FACTORY_CFLAGS) $(NTL_CFLAGS) $(FLINT_CFLAGS) -DHAVE_CONFIG_H -DGIT_VERSION='"$(GIT_VERSION)"' 29 if HAVE_GFANLIB 30 USE_GFANLIB = ${top_builddir}/dyn_modules/callgfanlib/gfanlib.la ${abs_top_builddir}/gfanlib/libgfan.la ${CDDGMPLDFLAGS} 31 else 32 USE_GFANLIB = 33 endif 34 28 35 AM_LDFLAGS = -L${top_builddir}/Singular -L${top_builddir}/numeric -L${top_builddir}/kernel -L${top_builddir}/libpolys/polys -L${top_builddir}/libpolys/coeffs -L${top_builddir}/libpolys/reporter -L${top_builddir}/libpolys/misc $(USE_FACTORY) -L${top_builddir}/omalloc -L${top_builddir}/resources 29 36 … … 35 42 endif !ENABLE_P_PROCS_DYNAMIC 36 43 44 ########################################################################## 45 module_LTLIBRARIES = pyobject.la 46 47 pyobject_la_SOURCES = pyobject.cc 48 49 pyobject_la_CXXFLAGS = $(PYTHON_CSPEC) 50 pyobject_la_CPPFLAGS = $(PYTHON_CPPFLAGS) ${AM_CPPFLAGS} 51 52 pyobject_la_LDFLAGS = $(PYTHON_EXTRA_LIBS) $(PYTHON_LSPEC) ${AM_LDFLAGS} $(PYTHON_EXTRA_LDFLAGS) $(PYTHON_LDFLAGS) -module -export-dynamic -avoid-version -flat_namespace -weak_reference_mismatches weak -undefined dynamic_lookup 53 ### -export-dynamic -shared -module -avoid-version (add to all DMs?) 54 55 ########################################################################## 37 56 if PYTHON_USE 38 PY=pyobject.la 57 PY=pyobject.la $(PYTHON_EXTRA_LIBS) $(PYTHON_LSPEC) ${AM_LDFLAGS} $(PYTHON_EXTRA_LDFLAGS) $(PYTHON_LDFLAGS) 39 58 else !PYTHON_USE 40 59 PY= … … 42 61 43 62 if SI_EMBED_PYTHON 44 EMBED_PYOBJECT = ${PY} ${top_builddir}/dyn_modules/syzextra/syzextra.la63 EMBED_PYOBJECT = ${PY} ${top_builddir}/dyn_modules/syzextra/syzextra.la ${USE_GFANLIB} 45 64 else !SI_EMBED_PYTHON 46 65 EMBED_PYOBJECT = 47 66 endif !SI_EMBED_PYTHON 48 49 ##########################################################################50 module_LTLIBRARIES = pyobject.la51 52 pyobject_la_SOURCES = pyobject.cc53 54 pyobject_la_CXXFLAGS = $(PYTHON_CSPEC)55 pyobject_la_CPPFLAGS = $(PYTHON_CPPFLAGS) ${AM_CPPFLAGS}56 57 pyobject_la_LIBS = $(PYTHON_EXTRA_LIBS)58 pyobject_la_LDFLAGS = ${AM_LDFLAGS} $(PYTHON_EXTRA_LDFLAGS) $(PYTHON_LDFLAGS) $(PYTHON_LSPEC) -module -export-dynamic -avoid-version -flat_namespace -weak_reference_mismatches weak -undefined dynamic_lookup59 ### -export-dynamic -shared -module -avoid-version (add to all DMs?)60 61 62 ########################### libSingular* #########################63 67 64 68 # if WANT_DEBUG … … 206 210 207 211 # plural_cmd.inc 208 nodist_libSingular_la_SOURCES = feOpt.inc iparith.inc ${EMBED_PYOBJECT} 209 # nodist_libSingular_g_la_SOURCES = iparith.inc 212 nodist_libSingular_la_SOURCES = feOpt.inc iparith.inc 210 213 211 214 # -release ${PACKAGE_VERSION} … … 279 282 # Singularg_SOURCES = tesths.cc fegetopt.c fegetopt.h utils.cc utils.h 280 283 281 Singular_LDADD = libSingular.la 282 284 Singular_LDADD = libSingular.la ${EMBED_PYOBJECT} 285 286 Singular_LDFLAGS = -static ${AM_LDFLAGS} ${EMBED_PYOBJECT} 283 287 # Singularg_LDADD = libSingular_g.la ${top_builddir}/numeric/libnumeric_g.la ${top_builddir}/kernel/libkernel_g.la ${top_builddir}/libpolys/polys/libpolys_g.la -lcoeffs_g -lreporter_g -lmisc_g $(FACTORY_LIBS) -lomalloc_g -lresources_g $(FLINT_LIBS) $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD} ${EMBED_PYOBJECT_LDFLAGS} 284 288 … … 288 292 # Singular_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H 289 293 290 Singular_LDFLAGS = -static ${AM_LDFLAGS}291 294 # Singularg_LDFLAGS = -static ${AM_LDFLAGS} 292 295 … … 305 308 306 309 # ${EMBED_PYOBJECT_LDFLAGS} ${EMBED_PYOBJECT_LDFLAGS} 307 Singulard_LDADD = libSingular.la 308 310 Singulard_LDADD = libSingular.la ${EMBED_PYOBJECT} 309 311 # Singulardg_LDADD = libSingular_g.la -lnumeric_g -lkernel_g -lpolys_g -lcoeffs_g -lreporter_g -lmisc_g $(FACTORY_LIBS) -lomalloc_g -lresources_g $(FLINT_LIBS) $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD} ${EMBED_PYOBJECT_LDFLAGS} 310 312 … … 315 317 # Singulard_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H 316 318 317 Singulard_LDFLAGS = ${AM_LDFLAGS} 318 # Singulardg_LDFLAGS = ${AM_LDFLAGS} 319 Singulard_LDFLAGS = ${AM_LDFLAGS} ${EMBED_PYOBJECT} 319 320 320 321 -
configure.ac
rc6f0451 r1684c3 66 66 AC_CONFIG_GOOGLE_PERFTOOLS() 67 67 68 AX_PYTHON_DEFAULT()68 ## AX_PYTHON_DEFAULT() 69 69 AX_PYTHON_WITH_VERSION([2.4]) 70 70 -
m4/ax_python.m4
rc6f0451 r1684c3 57 57 [AC_MSG_CHECKING(for python build information) 58 58 AC_MSG_RESULT([]) 59 for python in python2. 6 python2.5 python2.4 python2.3 python2.2 python2.1python; do59 for python in python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2 python; do 60 60 AC_CHECK_PROGS(PYTHON_BIN, [$python]) 61 61 ax_python_bin=$PYTHON_BIN -
m4/ax_python_embed.m4
rc6f0451 r1684c3 224 224 if test -n "$PYTHON" 225 225 then 226 ax_python_prefix=`${PYTHON} -c "import sys; print sys.prefix"`226 ax_python_prefix=`${PYTHON}-config --prefix` 227 227 if test -z "$ax_python_prefix" 228 228 then 229 229 AC_MSG_ERROR([Python Prefix is not known]) 230 230 fi 231 ax_python_execprefix=`${PYTHON} -c "import sys; print sys.exec_prefix"` 232 ax_python_version=`$PYTHON -c "import sys; print sys.version[[:3]]"` 233 ax_python_includespec="-I${ax_python_prefix}/include/python${ax_python_version}" 234 if test x"$python_prefix" != x"$python_execprefix"; then 235 ax_python_execspec="-I${ax_python_execprefix}/include/python${ax_python_version}" 236 ax_python_includespec="${ax_python_includespec} $ax_python_execspec" 237 fi 238 ax_python_ccshared=`${PYTHON} -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('CFLAGSFORSHARED')"` 239 ax_python_cspec="${ax_python_ccshared} ${ax_python_includespec}" 231 # ax_python_execprefix=`${PYTHON}-config --exec-prefix` 232 # ax_python_version=`$PYTHON -c "import sys; print sys.version[[:3]]"` 233 # ax_python_includespec="-I${ax_python_prefix}/include/python${ax_python_version}" 234 # if test x"$python_prefix" != x"$python_execprefix"; then 235 # ax_python_execspec="-I${ax_python_execprefix}/include/python${ax_python_version}" 236 # ax_python_includespec="${ax_python_includespec} $ax_python_execspec" 237 # fi 238 ax_python_cspec=`${PYTHON}-config --cflags | sed -e "s@ -arch i386@@" -e "s@ -arch x86_64@@" -e 's@ -g@@g' -e 's@ -mno-fused-madd@@g'` 239 # or -Qunused-arguments / clang :( 240 # ax_python_cspec="${ax_python_ccshared} ${ax_python_includespec}" 240 241 AC_SUBST([PYTHON_CSPEC], [${ax_python_cspec}]) 241 242 AC_MSG_NOTICE([PYTHON_CSPEC=${ax_python_cspec}]) … … 269 270 AC_DEFUN([AX_PYTHON_LSPEC], 270 271 [ 272 271 273 AC_ARG_VAR( [PYTHON], [Python Executable Path] ) 272 274 if test -n "$PYTHON" 273 275 then 276 274 277 AX_PYTHON_RUN([ 275 278 import sys … … 308 311 print strLinkSpec 309 312 ]) 310 AC_SUBST([PYTHON_LSPEC], [${ax_python_output}]) 311 AC_MSG_NOTICE([PYTHON_LSPEC=${ax_python_output}]) 313 314 # AC_SUBST([PYTHON_LSPEC], [${ax_python_output}]) 315 # AC_MSG_NOTICE([PYTHON_LSPEC=${ax_python_output}]) 316 317 ax_python_lspec=`${PYTHON}-config --ldflags | sed -e "s@ -arch i386@@" -e "s@ -arch x86_64@@" -e 's@ -g@@g'` 318 AC_SUBST([PYTHON_LSPEC], [${ax_python_lspec}]) 319 AC_MSG_NOTICE([PYTHON_LSPEC=${ax_python_lspec}]) 320 312 321 fi 313 322 ]) -
m4/ax_python_with_version.m4
rc6f0451 r1684c3 68 68 AC_PATH_PROGS( 69 69 [PYTHON], 70 [python2 python],70 [python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2 python], 71 71 [], 72 72 $2 -
m4/flags.m4
rc6f0451 r1684c3 105 105 AX_APPEND_LINK_FLAGS(${DBGFLAGS}) 106 106 fi 107 107 108 ## for clang: -Wunneeded-internal-declaration 109 108 110 if test "x${ENABLE_OPTIMIZATION}" != xno; then 109 111 OPTFLAGS="-DOM_NDEBUG -DNDEBUG -O3 -Wno-unused-function -Wno-trigraphs -Wno-unused-parameter -Wno-unused-variable -fomit-frame-pointer -fwrapv -fvisibility=default -finline-functions -fno-exceptions -fno-rtti -fno-threadsafe-statics -fno-enforce-eh-specs -fconserve-space -funroll-loops" 110 112 # -O3 - crashes gcc???!!! 111 # -fpermissive 113 # -fpermissive 112 114 AC_LANG_PUSH([C]) 113 115 AX_APPEND_COMPILE_FLAGS(${OPTFLAGS}, [CFLAGS]) … … 124 126 fi 125 127 128 FLAGS2="-Qunused-arguments" 129 AC_LANG_PUSH([C]) 130 AX_APPEND_COMPILE_FLAGS(${FLAGS2}, [CFLAGS]) 131 AC_LANG_POP([C]) 132 133 AC_LANG_PUSH([C++]) 134 AX_APPEND_COMPILE_FLAGS(${FLAGS2}, [CXXFLAGS]) 135 AC_LANG_POP([C++]) 136 137 AX_APPEND_LINK_FLAGS(${FLAGS2}) 138 126 139 # SING_SHOW_FLAGS([before PROG_C_CC]) 127 140
Note: See TracChangeset
for help on using the changeset viewer.