diff options
| author | doko@python.org <doko@python.org> | 2013-01-25 12:19:35 (GMT) |
|---|---|---|
| committer | doko@python.org <doko@python.org> | 2013-01-25 12:19:35 (GMT) |
| commit | 0c77bf757f94945b9e11a3d1f44ee47466866fd0 (patch) | |
| tree | 5515c7434c0a8425cf80bcc130b93526ff3eaf96 | |
| parent | d269b5e73d831b5cd870c859741f248cb8b1bc09 (diff) | |
| parent | 3e6e2ac31d8b847f65240f333e54322880adc914 (diff) | |
| download | cpython-0c77bf757f94945b9e11a3d1f44ee47466866fd0.zip cpython-0c77bf757f94945b9e11a3d1f44ee47466866fd0.tar.gz cpython-0c77bf757f94945b9e11a3d1f44ee47466866fd0.tar.bz2 | |
- Issue #17029: Let h2py search the multiarch system include directory.
| -rw-r--r-- | Makefile.pre.in | 4 | ||||
| -rw-r--r-- | Misc/NEWS | 2 | ||||
| -rwxr-xr-x | Tools/scripts/h2py.py | 5 | ||||
| -rwxr-xr-x | configure | 4 | ||||
| -rw-r--r-- | configure.ac | 3 |
5 files changed, 18 insertions, 0 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in index 084ff9f..8883461 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -97,6 +97,9 @@ PY_CORE_CFLAGS= $(PY_CFLAGS) $(PY_CPPFLAGS) $(CFLAGSFORSHARED) -DPy_BUILD_CORE # Machine-dependent subdirectories MACHDEP= @MACHDEP@ +# Multiarch directory (may be empty) +MULTIARCH= @MULTIARCH@ + # Install prefix for architecture-independent files prefix= @prefix@ @@ -1119,6 +1122,7 @@ $(srcdir)/Lib/$(PLATDIR): export PYTHONPATH; PYTHONPATH="`pwd`/Lib"; \ export DYLD_FRAMEWORK_PATH; DYLD_FRAMEWORK_PATH="`pwd`"; \ export EXE; EXE="$(BUILDEXE)"; \ + if [ -n "$(MULTIARCH)" ]; then export MULTIARCH; MULTIARCH=$(MULTIARCH); fi; \ cd $(srcdir)/Lib/$(PLATDIR); $(RUNSHARED) ./regen python-config: $(srcdir)/Misc/python-config.in @@ -533,6 +533,8 @@ Tests Build ----- +- Issue #17029: Let h2py search the multiarch system include directory. + - Issue #16953: Fix socket module compilation on platforms with HAVE_BROKEN_POLL. Patch by Jeffrey Armstrong. diff --git a/Tools/scripts/h2py.py b/Tools/scripts/h2py.py index 45aa439..4f871d9 100755 --- a/Tools/scripts/h2py.py +++ b/Tools/scripts/h2py.py @@ -50,6 +50,11 @@ except KeyError: searchdirs=os.environ['INCLUDE'].split(';') except KeyError: searchdirs=['/usr/include'] + try: + searchdirs.insert(0, os.path.join('/usr/include', + os.environ['MULTIARCH'])) + except KeyError: + pass def main(): global filedict @@ -684,6 +684,7 @@ BLDLIBRARY DLLLIBRARY LDLIBRARY LIBRARY +MULTIARCH BUILDEXEEXT EGREP GREP @@ -5351,6 +5352,9 @@ hp*|HP*) esac;; esac +MULTIARCH=$($CC --print-multiarch 2>/dev/null) + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBRARY" >&5 diff --git a/configure.ac b/configure.ac index fe37419..71bf871c 100644 --- a/configure.ac +++ b/configure.ac @@ -764,6 +764,9 @@ hp*|HP*) esac;; esac +MULTIARCH=$($CC --print-multiarch 2>/dev/null) +AC_SUBST(MULTIARCH) + AC_SUBST(LIBRARY) AC_MSG_CHECKING(LIBRARY) |