Changeset 62e51f in git

Timestamp:

Aug 29, 2013, 11:21:02 PM (10 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'f875bbaccd0831e36aaed09ff6adeb3eb45aeb94')

Children:

c43ab090c8ddfd806239f1a22762fa741b0864e7d51d87d0caa9eca085b3c3b0f09205679669ddf1

Parents:

b7f0f6186eab1c696b147ac57fcbd516815f9824

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2013-08-29 23:21:02+02:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2013-08-30 00:24:51+02:00

Message:

Python-related changes / OSX

add: Additional PYTHON flags
fix: Working around wrong python's 'LINKFORSHARED' on OSX

Files:

• Singular/Makefile.am (modified) (1 diff)
• m4/ax_python_devel.m4 (modified) (1 diff)

Singular/Makefile.am

@@ -51 +51 @@
 pyobject_la_SOURCES = pyobject.cc
 
-# pyobject_la_CPPFLAGS   = ${AM_CPPFLAGS} ${NODEBUGDEFS}
-# pyobject_g_la_CPPFLAGS = ${AM_CPPFLAGS}
-
-pyobject_la_CXXFLAGS = @PYTHON_CSPEC@
-pyobject_la_CFLAGS   = @PYTHON_CSPEC@ 
-
-# ${NODEBUGCXXFLAGS} 
-# pyobject_g_la_CXXFLAGS = ${DEBUGCXXFLAGS} @PYTHON_CSPEC@
-
-pyobject_la_LDFLAGS = ${AMLDFLAGS} @PYTHON_LSPEC@ -module -export-dynamic -avoid-version -flat_namespace -weak_reference_mismatches weak -undefined dynamic_lookup
+pyobject_la_CXXFLAGS = $(PYTHON_CSPEC)
+pyobject_la_CPPFLAGS = $(PYTHON_CPPFLAGS)  ${AM_CPPFLAGS}
+
+pyobject_la_LIBS    = $(PYTHON_EXTRA_LIBS)
+pyobject_la_LDFLAGS = ${AMLDFLAGS} $(PYTHON_EXTRA_LDFLAGS) $(PYTHON_LDFLAGS) $(PYTHON_LSPEC) -module -export-dynamic -avoid-version -flat_namespace -weak_reference_mismatches weak -undefined dynamic_lookup
 ###  -export-dynamic -shared -module -avoid-version (add to all DMs?)
 

m4/ax_python_devel.m4

@@ -271 +271 @@
         AC_MSG_RESULT([$PYTHON_EXTRA_LIBS])
         AC_SUBST(PYTHON_EXTRA_LIBS)
-
-        #
-        # linking flags needed when embedding
+        
+        #
+        # linking flags needed when embedding: LINKFORSHARED is buggy  on OSX  see http://bugs.python.org/issue3588 and  http://stackoverflow.com/questions/6490513/vim-failing-to-compile-with-python-on-os-x
         #
         AC_MSG_CHECKING(python extra linking flags)
         if test -z "$PYTHON_EXTRA_LDFLAGS"; then
-                PYTHON_EXTRA_LDFLAGS=`$PYTHON -c "import distutils.sysconfig; \
-                        conf = distutils.sysconfig.get_config_var; \
-                        print (conf('LINKFORSHARED'))"`
+                PYTHON_EXTRA_LDFLAGS=`$PYTHON -c "import distutils.sysconfig;conf=distutils.sysconfig.get_config_var; l=conf('LINKFORSHARED'); \
+print(l if l!='-u _PyMac_Error Python.framework/Versions/2.7/Python' else '-u _PyMac_Error -framework Python -F'+conf('PYTHONFRAMEWORKPREFIX') );"`
         fi
         AC_MSG_RESULT([$PYTHON_EXTRA_LDFLAGS])