multiarch

Gbp-Pq: Name multiarch.diff

diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py
index 6e7ddaa9b3093e4286d5cb5a91588f87277c6ece..551fbe969136839af36c2e6e3d04961070eb4c9c 100644 (file)
--- a/Lib/distutils/sysconfig.py
+++ b/Lib/distutils/sysconfig.py
@@ -110,6 +110,9 @@ def get_python_inc(plat_specific=0, prefix=None):
                 incdir = os.path.join(get_config_var('srcdir'), 'Include')
                 return os.path.normpath(incdir)
         python_dir = 'python' + get_python_version() + build_flags
+        if not python_build and plat_specific:
+            import sysconfig
+            return sysconfig.get_path('platinclude')
         return os.path.join(prefix, "include", python_dir)
     elif os.name == "nt":
         if python_build:

diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py
index bf04ac541e6b027f3be0a96f874088c3ea6626f7..b0f72a17cd1ab6f852b39fa179b828658fd53e53 100644 (file)
--- a/Lib/sysconfig.py
+++ b/Lib/sysconfig.py
@@ -558,6 +558,12 @@ def get_config_vars(*args):
         # the init-function.
         _CONFIG_VARS['userbase'] = _getuserbase()
 
+        multiarch = get_config_var('MULTIARCH')
+        if multiarch:
+            _CONFIG_VARS['multiarchsubdir'] = '/' + multiarch
+        else:
+            _CONFIG_VARS['multiarchsubdir'] = ''
+
         # Always convert srcdir to an absolute path
         srcdir = _CONFIG_VARS.get('srcdir', _PROJECT_BASE)
         if os.name == 'posix':

diff --git a/Makefile.pre.in b/Makefile.pre.in
index 10e99bdf89a233f68e8ceadde3835eeda00dbfa6..5544b20fa9af35f65500e06e4601c774d08d393f 100644 (file)
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -813,6 +813,7 @@ Modules/signalmodule.o: $(srcdir)/Modules/signalmodule.c $(srcdir)/Modules/posix
 
 Python/dynload_shlib.o: $(srcdir)/Python/dynload_shlib.c Makefile
        $(CC) -c $(PY_CORE_CFLAGS) \
+               $(if $(MULTIARCH),-DMULTIARCH='"$(MULTIARCH)"') \
                -DSOABI='"$(SOABI)"' \
                -o $@ $(srcdir)/Python/dynload_shlib.c
 
@@ -1630,7 +1631,7 @@ inclinstall:
 LIBPL=         @LIBPL@
 
 # pkgconfig directory
-LIBPC=         $(LIBDIR)/pkgconfig
+LIBPC=         $(LIBDIR)/$(MULTIARCH)/pkgconfig
 
 libainstall:   @DEF_MAKE_RULE@ python-config
        @for i in $(LIBDIR) $(LIBPL) $(LIBPC); \