- Issue #17029: Let h2py search the multiarch system include directory.

This commit is contained in:
doko@python.org 2013-01-25 13:20:46 +01:00
commit 6951fea3ab
5 changed files with 18 additions and 0 deletions

View File

@ -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

View File

@ -746,6 +746,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.

View File

@ -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

4
configure vendored
View File

@ -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

View File

@ -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)