83 lines
3.0 KiB
Diff
83 lines
3.0 KiB
Diff
From 2a25da9a573828b206180522b02633a1a128a2dd Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
|
|
<alexey.pawlow@gmail.com>
|
|
Date: Thu, 17 Jun 2021 18:51:12 +0530
|
|
Subject: [PATCH 002/N] restore setup config
|
|
|
|
---
|
|
Makefile.pre.in | 4 ++++
|
|
Modules/Setup.config.in | 5 +++++
|
|
configure.ac | 4 ++--
|
|
3 files changed, 11 insertions(+), 2 deletions(-)
|
|
create mode 100644 Modules/Setup.config.in
|
|
|
|
diff --git a/Makefile.pre.in b/Makefile.pre.in
|
|
index 6ce7a61..e8e8e71 100644
|
|
--- a/Makefile.pre.in
|
|
+++ b/Makefile.pre.in
|
|
@@ -714,10 +714,12 @@ oldsharedmods: $(SHAREDMODS)
|
|
Makefile Modules/config.c: Makefile.pre \
|
|
$(srcdir)/Modules/config.c.in \
|
|
$(MAKESETUP) \
|
|
+ Modules/Setup.config \
|
|
$(srcdir)/Modules/Setup \
|
|
Modules/Setup.local
|
|
$(SHELL) $(MAKESETUP) -c $(srcdir)/Modules/config.c.in \
|
|
-s Modules \
|
|
+ Modules/Setup.config \
|
|
Modules/Setup.local \
|
|
$(srcdir)/Modules/Setup
|
|
@mv config.c Modules
|
|
@@ -1669,6 +1671,7 @@ libainstall: @DEF_MAKE_RULE@ python-config
|
|
$(INSTALL_DATA) Makefile $(DESTDIR)$(LIBPL)/Makefile
|
|
$(INSTALL_DATA) $(srcdir)/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_DATA) Misc/python-embed.pc $(DESTDIR)$(LIBPC)/python-$(VERSION)-embed.pc
|
|
$(INSTALL_SCRIPT) $(srcdir)/Modules/makesetup $(DESTDIR)$(LIBPL)/makesetup
|
|
@@ -1895,6 +1898,7 @@ distclean: clobber
|
|
if test "$$file" != "$(srcdir)/Lib/test/data/README"; then rm "$$file"; fi; \
|
|
done
|
|
-rm -f core Makefile Makefile.pre config.status Modules/Setup.local \
|
|
+ Modules/Setup.config \
|
|
Modules/ld_so_aix Modules/python.exp Misc/python.pc \
|
|
Misc/python-embed.pc Misc/python-config.sh
|
|
-rm -f python*-gdb.py
|
|
diff --git a/Modules/Setup.config.in b/Modules/Setup.config.in
|
|
new file mode 100644
|
|
index 0000000..5c1299d
|
|
--- /dev/null
|
|
+++ b/Modules/Setup.config.in
|
|
@@ -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.
|
|
+
|
|
diff --git a/configure.ac b/configure.ac
|
|
index 8fe5fa5..6ae56e1 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -5844,7 +5844,7 @@ AC_DEFINE_UNQUOTED(PY_BUILTIN_HASHLIB_HASHES, "$default_hashlib_hashes")
|
|
])
|
|
|
|
# generate output files
|
|
-AC_CONFIG_FILES(Makefile.pre Misc/python.pc Misc/python-embed.pc Misc/python-config.sh)
|
|
+AC_CONFIG_FILES(Makefile.pre Modules/Setup.config Misc/python.pc Misc/python-embed.pc Misc/python-config.sh)
|
|
AC_CONFIG_FILES([Modules/ld_so_aix], [chmod +x Modules/ld_so_aix])
|
|
AC_OUTPUT
|
|
|
|
@@ -5856,7 +5856,7 @@ fi
|
|
|
|
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 $srcdir/Modules/Setup
|
|
mv config.c Modules
|
|
|
|
--
|
|
2.33.0
|
|
|