Files
MINGW-packages/mingw-w64-python3/0002-restore-setup-config.patch

64 lines
2.6 KiB
Diff

diff -Naur Python-3.7.0-orig/configure.ac Python-3.7.0/configure.ac
--- Python-3.7.0-orig/configure.ac 2018-06-27 06:07:35.000000000 +0300
+++ Python-3.7.0/configure.ac 2018-07-12 10:20:42.122284700 +0300
@@ -5619,7 +5619,7 @@
# generate output files
-AC_CONFIG_FILES(Makefile.pre Misc/python.pc Misc/python-config.sh)
+AC_CONFIG_FILES(Makefile.pre Modules/Setup.config Misc/python.pc Misc/python-config.sh)
AC_CONFIG_FILES([Modules/ld_so_aix], [chmod +x Modules/ld_so_aix])
AC_OUTPUT
@@ -5637,7 +5637,7 @@
echo "creating Makefile" >&AS_MESSAGE_FD
$SHELL $srcdir/Modules/makesetup -c $srcdir/Modules/config.c.in \
- -s Modules \
+ -s Modules Modules/Setup.config \
Modules/Setup.local Modules/Setup
mv config.c Modules
diff -Naur Python-3.7.0-orig/Makefile.pre.in Python-3.7.0/Makefile.pre.in
--- Python-3.7.0-orig/Makefile.pre.in 2018-06-27 06:07:35.000000000 +0300
+++ Python-3.7.0/Makefile.pre.in 2018-07-12 10:20:42.122284700 +0300
@@ -687,10 +687,12 @@
Makefile Modules/config.c: Makefile.pre \
$(srcdir)/Modules/config.c.in \
$(MAKESETUP) \
+ Modules/Setup.config \
Modules/Setup \
Modules/Setup.local
$(SHELL) $(MAKESETUP) -c $(srcdir)/Modules/config.c.in \
-s Modules \
+ Modules/Setup.config \
Modules/Setup.local \
Modules/Setup
@mv config.c Modules
@@ -1482,6 +1484,7 @@
$(INSTALL_DATA) Makefile $(DESTDIR)$(LIBPL)/Makefile
$(INSTALL_DATA) Modules/Setup $(DESTDIR)$(LIBPL)/Setup
$(INSTALL_DATA) Modules/Setup.local $(DESTDIR)$(LIBPL)/Setup.local
+ $(INSTALL_DATA) Modules/Setup.config $(DESTDIR)$(LIBPL)/Setup.config
$(INSTALL_DATA) Misc/python.pc $(DESTDIR)$(LIBPC)/python-$(VERSION).pc
$(INSTALL_SCRIPT) $(srcdir)/Modules/makesetup $(DESTDIR)$(LIBPL)/makesetup
$(INSTALL_SCRIPT) $(srcdir)/install-sh $(DESTDIR)$(LIBPL)/install-sh
@@ -1704,7 +1707,7 @@
if test "$$file" != "$(srcdir)/Lib/test/data/README"; then rm "$$file"; fi; \
done
-rm -f core Makefile Makefile.pre config.status \
- Modules/Setup Modules/Setup.local \
+ Modules/Setup Modules/Setup.local Modules/Setup.config \
Modules/ld_so_aix Modules/python.exp Misc/python.pc \
Misc/python-config.sh
-rm -f python*-gdb.py
diff -Naur Python-3.7.0-orig/Modules/Setup.config.in Python-3.7.0/Modules/Setup.config.in
--- Python-3.7.0-orig/Modules/Setup.config.in 1970-01-01 03:00:00.000000000 +0300
+++ Python-3.7.0/Modules/Setup.config.in 2018-07-12 10:20:42.122284700 +0300
@@ -0,0 +1,5 @@
+# This file is transmogrified into Setup.config by config.status.
+
+# The purpose of this file is to conditionally enable certain modules
+# based on configure-time options.
+