Permalink
Browse files

Better setting of LDFLAGS.

PR pkg/49021
  • Loading branch information...
1 parent 016243a commit 2c59a0bee4f3be07904c501c7f1b68fe76b5eef5 obache committed Jul 20, 2014
Showing with 23 additions and 13 deletions.
  1. +3 −3 www/ap2-python/distinfo
  2. +10 −5 www/ap2-python/patches/patch-configure
  3. +10 −5 www/ap2-python/patches/patch-configure.in
View
6 www/ap2-python/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.7 2014/07/20 03:07:05 obache Exp $
+$NetBSD: distinfo,v 1.8 2014/07/20 12:39:48 obache Exp $
SHA1 (mod_python-3.5.0.tgz) = 9208bb813172ab51d601d78e439ea552f676d2d1
RMD160 (mod_python-3.5.0.tgz) = 03315af0843892059a11758209f350c82164acc3
Size (mod_python-3.5.0.tgz) = 571403 bytes
-SHA1 (patch-configure) = 98dae04eaf0762c89190d3afd0f49c580e1f5039
-SHA1 (patch-configure.in) = 5ce62332d1381ef671e5ff1e3858b81d4d8eca01
+SHA1 (patch-configure) = 721dc5200205889106c502247a4b4a4a6995b4e2
+SHA1 (patch-configure.in) = 1c77f43224f3c9ae555f91ac4479c60121ad950b
SHA1 (patch-dist_version.sh) = 9f3dbf596238aa106e06ec1c8b27a90619ef4978
View
15 www/ap2-python/patches/patch-configure
@@ -1,15 +1,20 @@
-$NetBSD: patch-configure,v 1.1 2014/07/20 03:07:05 obache Exp $
+$NetBSD: patch-configure,v 1.2 2014/07/20 12:39:48 obache Exp $
* Set RPATH if supported.
--- configure.orig 2013-11-12 03:21:34.000000000 +0000
+++ configure
-@@ -3389,6 +3389,9 @@ if test "${PYTHONFRAMEWORKDIR}" = "no-fr
+@@ -3387,8 +3387,12 @@ PYTHONFRAMEWORK=`${PYTHON_BIN} -c 'from
+
+ if test "${PYTHONFRAMEWORKDIR}" = "no-framework"; then
# this directory may contain the .so library, our preference, list 1st
- LDFLAGS1=`${PYTHON_BIN} -c 'import distutils.sysconfig; \
- print("-L" + distutils.sysconfig.get_config_var("LIBDIR"))'`
+- LDFLAGS1=`${PYTHON_BIN} -c 'import distutils.sysconfig; \
+- print("-L" + distutils.sysconfig.get_config_var("LIBDIR"))'`
++ PyLIBDIR=`${PYTHON_BIN} -c 'import distutils.sysconfig; \
++ print(distutils.sysconfig.get_config_var("LIBDIR"))'`
++ LDFLAGS1="-L${PyLIBDIR}"
+ if test -n "${COMPILER_RPATH_FLAG}"; then
-+ LDFLAGS1="${LDFLAGS1} ${COMPILER_RPATH_FLAG}${LDFLAGS1}"
++ LDFLAGS1="${LDFLAGS1} ${COMPILER_RPATH_FLAG}${PyLIBDIR}"
+ fi
LDFLAGS2=`${PYTHON_BIN} -c 'import distutils.sysconfig; \
print("-L" + distutils.sysconfig.get_python_lib(plat_specific=1, \
View
15 www/ap2-python/patches/patch-configure.in
@@ -1,15 +1,20 @@
-$NetBSD: patch-configure.in,v 1.1 2014/07/20 03:07:05 obache Exp $
+$NetBSD: patch-configure.in,v 1.2 2014/07/20 12:39:48 obache Exp $
* Set RPATH if supported.
--- configure.in.orig 2013-11-12 03:21:34.000000000 +0000
+++ configure.in
-@@ -212,6 +212,9 @@ if test "${PYTHONFRAMEWORKDIR}" = "no-fr
+@@ -210,8 +210,12 @@ PYTHONFRAMEWORK=`${PYTHON_BIN} -c 'from
+
+ if test "${PYTHONFRAMEWORKDIR}" = "no-framework"; then
# this directory may contain the .so library, our preference, list 1st
- LDFLAGS1=`${PYTHON_BIN} -c 'import distutils.sysconfig; \
- print("-L" + distutils.sysconfig.get_config_var("LIBDIR"))'`
+- LDFLAGS1=`${PYTHON_BIN} -c 'import distutils.sysconfig; \
+- print("-L" + distutils.sysconfig.get_config_var("LIBDIR"))'`
++ PyLIBDIR=`${PYTHON_BIN} -c 'import distutils.sysconfig; \
++ print(distutils.sysconfig.get_config_var("LIBDIR"))'`
++ LDFLAGS1="-L${PyLIBDIR}"
+ if test -n "${COMPILER_RPATH_FLAG}"; then
-+ LDFLAGS1="${LDFLAGS1} ${COMPILER_RPATH_FLAG}${LDFLAGS1}"
++ LDFLAGS1="${LDFLAGS1} ${COMPILER_RPATH_FLAG}${PyLIBDIR}"
+ fi
LDFLAGS2=`${PYTHON_BIN} -c 'import distutils.sysconfig; \
print("-L" + distutils.sysconfig.get_python_lib(plat_specific=1, \

0 comments on commit 2c59a0b

Please sign in to comment.