1berry/cpython
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- Issue #18257: Fix readlink usage in python-config. Install the python

Browse Source 
version again on Darwin.
This commit is contained in:
doko@ubuntu.com 2013-08-01 15:32:49 +02:00
parent b2fcebb018
commit 0df35b0a57
4 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile.pre.in
View File

@ -1201,6 +1201,13 @@ python-config: $(srcdir)/Misc/python-config.in Misc/python-config.sh
sed -e "s,@EXENAME@,$(BINDIR)/python$(LDVERSION)$(EXE)," < $(srcdir)/Misc/python-config.in >python-config.py sed -e "s,@EXENAME@,$(BINDIR)/python$(LDVERSION)$(EXE)," < $(srcdir)/Misc/python-config.in >python-config.py
# Replace makefile compat. variable references with shell script compat. ones; $(VAR) -> ${VAR} # Replace makefile compat. variable references with shell script compat. ones; $(VAR) -> ${VAR}
sed -e 's,\$$(\([A-Za-z0-9_]*\)),\$$\{\1\},g' < Misc/python-config.sh >python-config sed -e 's,\$$(\([A-Za-z0-9_]*\)),\$$\{\1\},g' < Misc/python-config.sh >python-config
# On Darwin, always use the python version of the script, the shell
# version doesn't use the compiler customizations that are provided
# in python (_osx_support.py).
if test `uname -s` = Darwin; then \
cp python-config.py python-config; \
fi
# Install the include files # Install the include files
INCLDIRSTOMAKE=$(INCLUDEDIR) $(CONFINCLUDEDIR) $(INCLUDEPY) $(CONFINCLUDEPY) INCLDIRSTOMAKE=$(INCLUDEDIR) $(CONFINCLUDEDIR) $(INCLUDEPY) $(CONFINCLUDEPY)

3
Misc/NEWS
View File

@ -737,6 +737,9 @@ IDLE
Build Build
----- -----
- Issue #18257: Fix readlink usage in python-config. Install the python
version again on Darwin.
- Issue #18481: Add C coverage reporting with gcov and lcov. A new make target - Issue #18481: Add C coverage reporting with gcov and lcov. A new make target
"coverage-report" creates an instrumented Python build, runs unit tests "coverage-report" creates an instrumented Python build, runs unit tests
and creates a HTML. The report can be updated with "make coverage-lcov". and creates a HTML. The report can be updated with "make coverage-lcov".

2
Misc/python-config.in
View File

@ -1,6 +1,8 @@
#!@EXENAME@ #!@EXENAME@
# -*- python -*- # -*- python -*-
# Keep this script in sync with python-config.sh.in
import getopt import getopt
import os import os
import sys import sys

7
Misc/python-config.sh.in
View File

@ -1,5 +1,7 @@
#!/bin/sh #!/bin/sh
# Keep this script in sync with python-config.in
exit_with_usage () exit_with_usage ()
{ {
echo "Usage: $0 --prefix|--exec-prefix|--includes|--libs|--cflags|--ldflags|--extension-suffix|--help|--abiflags|--configdir" echo "Usage: $0 --prefix|--exec-prefix|--includes|--libs|--cflags|--ldflags|--extension-suffix|--help|--abiflags|--configdir"
@ -15,15 +17,18 @@ installed_prefix ()
{ {
RESULT=$(dirname $(cd $(dirname "$1") && pwd -P)) RESULT=$(dirname $(cd $(dirname "$1") && pwd -P))
if which readlink >/dev/null 2>&1 ; then if which readlink >/dev/null 2>&1 ; then
if readlink -f "$RESULT" >/dev/null 2>&1; then
RESULT=$(readlink -f "$RESULT") RESULT=$(readlink -f "$RESULT")
fi fi
fi
echo $RESULT echo $RESULT
} }
prefix_build="@prefix@" prefix_build="@prefix@"
prefix_real=$(installed_prefix "$0") prefix_real=$(installed_prefix "$0")
# Use sed to fix paths from their built to locations to their installed to locations. # Use sed to fix paths from their built-to locations to their installed-to
# locations.
prefix=$(echo "$prefix_build" | sed "s#$prefix_build#$prefix_real#") prefix=$(echo "$prefix_build" | sed "s#$prefix_build#$prefix_real#")
exec_prefix_build="@exec_prefix@" exec_prefix_build="@exec_prefix@"
exec_prefix=$(echo "$exec_prefix_build" | sed "s#$exec_prefix_build#$prefix_real#") exec_prefix=$(echo "$exec_prefix_build" | sed "s#$exec_prefix_build#$prefix_real#")