From 0df35b0a57fef5276c09e92da9ea7aaf77476f61 Mon Sep 17 00:00:00 2001 From: "doko@ubuntu.com" Date: Thu, 1 Aug 2013 15:32:49 +0200 Subject: - Issue #18257: Fix readlink usage in python-config. Install the python version again on Darwin. --- Makefile.pre.in | 7 +++++++ Misc/NEWS | 3 +++ Misc/python-config.in | 2 ++ Misc/python-config.sh.in | 9 +++++++-- 4 files changed, 19 insertions(+), 2 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in index ad4eb30..8103124 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -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 # 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 + # 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 INCLDIRSTOMAKE=$(INCLUDEDIR) $(CONFINCLUDEDIR) $(INCLUDEPY) $(CONFINCLUDEPY) diff --git a/Misc/NEWS b/Misc/NEWS index 088ad42..41ba1a8 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -737,6 +737,9 @@ IDLE 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 "coverage-report" creates an instrumented Python build, runs unit tests and creates a HTML. The report can be updated with "make coverage-lcov". diff --git a/Misc/python-config.in b/Misc/python-config.in index ac3a2c7..0b9b5dc 100644 --- a/Misc/python-config.in +++ b/Misc/python-config.in @@ -1,6 +1,8 @@ #!@EXENAME@ # -*- python -*- +# Keep this script in sync with python-config.sh.in + import getopt import os import sys diff --git a/Misc/python-config.sh.in b/Misc/python-config.sh.in index 6790bf6..f5a3dbe 100644 --- a/Misc/python-config.sh.in +++ b/Misc/python-config.sh.in @@ -1,5 +1,7 @@ #!/bin/sh +# Keep this script in sync with python-config.in + exit_with_usage () { echo "Usage: $0 --prefix|--exec-prefix|--includes|--libs|--cflags|--ldflags|--extension-suffix|--help|--abiflags|--configdir" @@ -15,7 +17,9 @@ installed_prefix () { RESULT=$(dirname $(cd $(dirname "$1") && pwd -P)) if which readlink >/dev/null 2>&1 ; then - RESULT=$(readlink -f "$RESULT") + if readlink -f "$RESULT" >/dev/null 2>&1; then + RESULT=$(readlink -f "$RESULT") + fi fi echo $RESULT } @@ -23,7 +27,8 @@ installed_prefix () prefix_build="@prefix@" 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#") exec_prefix_build="@exec_prefix@" exec_prefix=$(echo "$exec_prefix_build" | sed "s#$exec_prefix_build#$prefix_real#") -- cgit v0.12