aboutsummaryrefslogtreecommitdiff
path: root/lang/python32/files
diff options
context:
space:
mode:
authorKubilay Kocak <koobs@FreeBSD.org>2015-10-18 09:50:39 +0000
committerKubilay Kocak <koobs@FreeBSD.org>2015-10-18 09:50:39 +0000
commit479c987464c4f48bc456de87ba34b140ad091667 (patch)
tree687b7837a2668d73d5e540a8658aefe1801b6ced /lang/python32/files
parentd83ea17acdf04356283e50270ad6f24ec19ce84c (diff)
downloadports-479c987464c4f48bc456de87ba34b140ad091667.tar.gz
ports-479c987464c4f48bc456de87ba34b140ad091667.zip
lang/python{27,32,33}: Fix missing shlib path in python-config
In Python 3.4+, upstream added and switched to using a shell implementation of the python-config script [1]. The Python implementation (python-config.py) remained used by all versions < 3.4. While the shell implementation returns the path to the Python shared library when using the --ldflags script argument, the Python implementation of the script does not. The bug has been reported, but has not yet been merged [2]. The Python ports currently default to including ${LOCALBASE}/lib in LIBS when the NLS option is enabled (which it is by default). When built *with* NLS (gettext) support, the flags added to LIBS are returned in `pythonX.Y-config --ldflags` output, which happens to match the path to the Python shared library. If the NLS option is disabled, ${LOCALBASE}/lib is not added to LIBS, and are therefore not returned in --ldflags output. This results in potential linking errors for software that uses python-config to obtain the correct library path, when the NLS option is disabled: $ make WITH=PYTHON -C audio/alsa-lib [...] --- smixer-python.la --- CCLD smixer-python.la /usr/bin/ld: cannot find -lpython2.7 This change modifies the python-config.in script to match the shell implementation, outputting the library path in --ldflags output. While I'm here: for Python 3.2 and Python 3.3 ports, backport a library order change [3]. This could affect linking with static libraries. Use standard length lines and reduce diffs in pkg-message [1] https://bugs.python.org/issue16235 [2] https://bugs.python.org/issue7352 [2] https://bugs.python.org/issue18096 PR: 197757 Submitted by: jbeich MFH: 2015Q4
Notes
Notes: svn path=/head/; revision=399611
Diffstat (limited to 'lang/python32/files')
-rw-r--r--lang/python32/files/patch-Misc_python-config.in32
1 files changed, 32 insertions, 0 deletions
diff --git a/lang/python32/files/patch-Misc_python-config.in b/lang/python32/files/patch-Misc_python-config.in
new file mode 100644
index 000000000000..c71439d4df66
--- /dev/null
+++ b/lang/python32/files/patch-Misc_python-config.in
@@ -0,0 +1,32 @@
+# pythonx.y-config --ldflags out of /usr and missing -L<install_lib_dir>
+# https://bugs.python.org/issue7352
+
+# Fix library order returned by python-config. [#18096]
+# bugs.python.org/18096
+
+--- Misc/python-config.in.orig 2013-05-15 16:33:52 UTC
++++ Misc/python-config.in
+@@ -22,6 +22,7 @@ except getopt.error:
+ if not opts:
+ exit_with_usage()
+
++libdir = sysconfig.get_config_var('exec_prefix') + '/lib'
+ pyver = sysconfig.get_config_var('VERSION')
+ getvar = sysconfig.get_config_var
+
+@@ -45,11 +46,13 @@ for opt in opt_flags:
+ print(' '.join(flags))
+
+ elif opt in ('--libs', '--ldflags'):
+- libs = getvar('LIBS').split() + getvar('SYSLIBS').split()
+- libs.append('-lpython' + pyver + sys.abiflags)
++ libs = ['-lpython' + pyver + sys.abiflags]
++ libs += getvar('LIBS').split()
++ libs += getvar('SYSLIBS').split()
+ # add the prefix/lib/pythonX.Y/config dir, but only if there is no
+ # shared library in prefix/lib/.
+ if opt == '--ldflags':
++ libs.insert(0, '-L' + libdir)
+ if not getvar('Py_ENABLE_SHARED'):
+ libs.insert(0, '-L' + getvar('LIBPL'))
+ if not getvar('PYTHONFRAMEWORK'):