diff options
| -rw-r--r-- | Makefile.pre.in | 4 | ||||
| -rw-r--r-- | Misc/NEWS | 2 | ||||
| -rwxr-xr-x | Tools/scripts/h2py.py | 6 | ||||
| -rwxr-xr-x | configure | 4 | ||||
| -rw-r--r-- | configure.ac | 3 |
5 files changed, 19 insertions, 0 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in index 1ce78b2152..519aa26502 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -86,6 +86,9 @@ PY_CFLAGS= $(CFLAGS) $(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@ @@ -980,6 +983,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 @@ -706,6 +706,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 c681e236ba..c64501e604 100755 --- a/Tools/scripts/h2py.py +++ b/Tools/scripts/h2py.py @@ -58,6 +58,12 @@ except KeyError: raise KeyError except KeyError: searchdirs=['/usr/include'] + try: + searchdirs.insert(0, os.path.join('/usr/include', + os.environ['MULTIARCH'])) + except KeyError: + pass + def main(): global filedict @@ -686,6 +686,7 @@ BUILDEXEEXT EGREP GREP CPP +MULTIARCH MAINCC CXX OBJEXT @@ -4281,6 +4282,9 @@ $as_echo "$as_me: WARNING: " >&2;} fi +MULTIARCH=$($CC --print-multiarch 2>/dev/null) + + # checks for UNIX variants that set C preprocessor variables diff --git a/configure.ac b/configure.ac index db6b0b26c5..0c6bba8405 100644 --- a/configure.ac +++ b/configure.ac @@ -603,6 +603,9 @@ then ]) fi +MULTIARCH=$($CC --print-multiarch 2>/dev/null) +AC_SUBST(MULTIARCH) + # checks for UNIX variants that set C preprocessor variables AC_USE_SYSTEM_EXTENSIONS |