Skip to content

bpo-45573: Use pkg-config for Modules/Setup #29164

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
tiran wants to merge 6 commits into from
Closed

bpo-45573: Use pkg-config for Modules/Setup #29164

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3d0e2e8
bpo-45548: Link shared Setup extensions to pybuilddir
tiran Oct 25, 2021
afcd74b
bpo-45573: Use pkg-config for Modules/Setup
tiran Oct 21, 2021
75b3935
Add Modules subdirs to SRCDIRS
tiran Oct 26, 2021
32583fa
Convert Modules/Setup into a template file
tiran Oct 26, 2021
310c4e3
Use AM_CONDITIONALs in Modules/Setup.in
tiran Oct 26, 2021
1ba9652
Add makefile vars
tiran Nov 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Convert Modules/Setup into a template file
  • Loading branch information
@tiran
tiran committed Oct 26, 2021
commit 32583fa1c313c1f06bb594f0171c7ddc06bf62ea
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ Misc/python-embed.pc
Misc/python-config.sh
Modules/Setup.config
Modules/Setup.local
Modules/Setup
Modules/config.c
Modules/ld_so_aix
Programs/_freeze_module
Expand Down
5 changes: 3 additions & 2 deletions Makefile.pre.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -749,12 +749,13 @@ oldsharedmods: $(SHAREDMODS) pybuilddir.txt
fi; \
done


Modules/Setup: $(srcdir)/Modules/Setup.in
./config.status --file=$@

Makefile Modules/config.c: Makefile.pre \
$(srcdir)/Modules/config.c.in \
$(MAKESETUP) \
$(srcdir)/Modules/Setup \
Modules/Setup \
Modules/Setup.local
$(SHELL) $(MAKESETUP) -c $(srcdir)/Modules/config.c.in \
-s Modules \
Expand Down
0 Modules/Setup → Modules/Setup.in
View file
Open in desktop
File renamed without changes.
3 changes: 2 additions & 1 deletion configure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21350,7 +21350,7 @@ fi


# generate output files
ac_config_files="$ac_config_files Makefile.pre Misc/python.pc Misc/python-embed.pc Misc/python-config.sh"
ac_config_files="$ac_config_files Makefile.pre Misc/python.pc Misc/python-embed.pc Misc/python-config.sh Modules/Setup"

ac_config_files="$ac_config_files Modules/ld_so_aix"

Expand Down Expand Up @@ -22139,6 +22139,7 @@ do
"Misc/python.pc") CONFIG_FILES="$CONFIG_FILES Misc/python.pc" ;;
"Misc/python-embed.pc") CONFIG_FILES="$CONFIG_FILES Misc/python-embed.pc" ;;
"Misc/python-config.sh") CONFIG_FILES="$CONFIG_FILES Misc/python-config.sh" ;;
"Modules/Setup") CONFIG_FILES="$CONFIG_FILES Modules/Setup" ;;
"Modules/ld_so_aix") CONFIG_FILES="$CONFIG_FILES Modules/ld_so_aix" ;;

*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6147,7 +6147,7 @@ fi
AC_SUBST(TEST_MODULES)

# generate output files
AC_CONFIG_FILES(Makefile.pre Misc/python.pc Misc/python-embed.pc Misc/python-config.sh)
AC_CONFIG_FILES(Makefile.pre Misc/python.pc Misc/python-embed.pc Misc/python-config.sh Modules/Setup)
AC_CONFIG_FILES([Modules/ld_so_aix], [chmod +x Modules/ld_so_aix])
AC_OUTPUT

Expand Down