diff options
| author | obache <obache@pkgsrc.org> | 2014-07-20 12:39:48 +0000 |
|---|---|---|
| committer | obache <obache@pkgsrc.org> | 2014-07-20 12:39:48 +0000 |
| commit | cc79c03892faa86271a7fa3ca0c643be7107d992 (patch) | |
| tree | b4922d1ac7ce63f185305e98caf18f54e0c688b2 /www/ap2-python | |
| parent | 19356d716d3564ee0683708be66693fe2c57ae94 (diff) | |
| download | pkgsrc-cc79c03892faa86271a7fa3ca0c643be7107d992.tar.gz | |
Better setting of LDFLAGS.
PR pkg/49021
Diffstat (limited to 'www/ap2-python')
| -rw-r--r-- | www/ap2-python/distinfo | 6 | ||||
| -rw-r--r-- | www/ap2-python/patches/patch-configure | 15 | ||||
| -rw-r--r-- | www/ap2-python/patches/patch-configure.in | 15 |
3 files changed, 23 insertions, 13 deletions
diff --git a/www/ap2-python/distinfo b/www/ap2-python/distinfo index e8e968000fd..47892c94954 100644 --- a/www/ap2-python/distinfo +++ b/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 diff --git a/www/ap2-python/patches/patch-configure b/www/ap2-python/patches/patch-configure index 6eff72bc85f..431f11b9c29 100644 --- a/www/ap2-python/patches/patch-configure +++ b/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, \ diff --git a/www/ap2-python/patches/patch-configure.in b/www/ap2-python/patches/patch-configure.in index 6059680dd0b..f6301b10894 100644 --- a/www/ap2-python/patches/patch-configure.in +++ b/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, \ |