Allow stable API extensions to include a multiarch tuple in the filename

stefanor · stefanor · commit 5e380a1fdeb0 · 2024-08-12T09:23:28.000+02:00
This permits stable ABI extensions for multiple architectures to be
co-installed into the same directory, without clashing with each other.
diff --git a/Makefile.pre.in b/Makefile.pre.in
@@ -1729,6 +1729,7 @@ Python/interpconfig.o: $(srcdir)/Python/interpconfig.c $(srcdir)/Python/config_c
 Python/dynload_shlib.o: $(srcdir)/Python/dynload_shlib.c Makefile
 	$(CC) -c $(PY_CORE_CFLAGS) \
 		-DSOABI='"$(SOABI)"' \
+		$(MULTIARCH_CPPFLAGS) \
 		-o $@ $(srcdir)/Python/dynload_shlib.c
 
 Python/dynload_hpux.o: $(srcdir)/Python/dynload_hpux.c Makefile
diff --git a/Python/dynload_shlib.c b/Python/dynload_shlib.c
@@ -41,6 +41,9 @@ const char *_PyImport_DynLoadFiletab[] = {
     "." SOABI ".so",
 #ifdef ALT_SOABI
     "." ALT_SOABI ".so",
+#endif
+#ifdef MULTIARCH
+    ".abi" PYTHON_ABI_STRING "-" MULTIARCH ".so",
 #endif
     ".abi" PYTHON_ABI_STRING ".so",
     ".so",
