- Unbreak the build after the recent lang/python27 update.

PR:		192348
Submitted by:	peter@
This commit is contained in:
Marcus von Appen 2014-08-03 08:07:20 +00:00
parent 5064d58e75
commit ff1a29fe19
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=363855
2 changed files with 13 additions and 12 deletions

View file

@ -3,7 +3,7 @@
PORTNAME= mod_python
PORTVERSION= 3.3.1
PORTREVISION= 6
PORTREVISION= 7
CATEGORIES= www python
MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD}
MASTER_SITE_SUBDIR= modpython

View file

@ -1,11 +1,12 @@
--- configure.orig Sat Aug 5 09:51:23 2006
+++ configure Sat Aug 5 09:57:47 2006
@@ -2899,7 +2899,7 @@
PyLIBP=${PY_STD_LIB}
PyLIBPL=${PyLIBP}/config
PyPYTHONLIBS=${PyLIBPL}/libpython${PyVERSION}.a
-PyLIBS=`grep "^LIB[SMC]=" ${PyLIBPL}/Makefile | cut -f2 -d= | tr '\011\012\015' ' '`
+PyLIBS=`ldd $PYTHON_BIN | sed -n 's,^.* => [^ ]*/lib\(.*\)\.so[^ ]* \((.*)\),-l\1,p' | grep -v '^-lc$' | xargs echo`
PyMODLIBS=`grep "^LOCALMODLIBS=" ${PyLIBPL}/Makefile | cut -f2 -d= | tr '\011\012\015' ' '`
PyFRAMEWORK=`grep "^PYTHONFRAMEWORK=" ${PyLIBPL}/Makefile | cut -f2 -d= | tr '\011\012\015' ' '`
PyFRAMEWORKDIR=`grep "^PYTHONFRAMEWORKDIR=" ${PyLIBPL}/Makefile | cut -f2 -d= | tr '\011\012\015' ' ' | awk '{print $1}'`
--- ./configure.orig 2006-03-11 03:46:52.000000000 +0000
+++ ./configure 2014-08-02 22:49:33.000000000 +0000
@@ -3013,7 +3013,7 @@
echo $ECHO_N "checking linker flags used to link Python... $ECHO_C" >&6
PyLFS=`grep "^LINKFORSHARED=" ${PyLIBPL}/Makefile | cut -f2 -d= | tr '\011\012\015' ' '`
-PyLDFLAGS=`grep "^LDFLAGS=" ${PyLIBPL}/Makefile | cut -f2 -d= | tr '\011\012\015' ' '`
+PyLDFLAGS=`grep "^LDFLAGS=" ${PyLIBPL}/Makefile | sed 's,^LDFLAGS=,,' | tr '\011\012\015' ' '`
LDFLAGS="${LDFLAGS} ${PyLFS} ${PyLDFLAGS}"
LDFLAGS="${LDFLAGS} ${PY_LDFLAGS}"
echo "$as_me:$LINENO: result: $PY_LDFLAGS" >&5