Skip to content
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

Jump to bottom

pkg-config files (.pc) conflict between default and free-threaded build #119729

Closed
colesbury opened this issue May 29, 2024 · 1 comment
Closed

pkg-config files (.pc) conflict between default and free-threaded build #119729

colesbury opened this issue May 29, 2024 · 1 comment
Labels
3.13 bugs and security fixes 3.14 new features, bugs and security fixes build The build process and cross-build topic-free-threading type-bug An unexpected behavior, bug, or error

Comments

@colesbury
Copy link
Contributor

colesbury commented May 29, 2024 •
edited by bedevere-app bot
Loading

Bug report

If you install the default and free-threaded build to the same prefix, some files conflict and will get overwritten by the most recent install:

	modified:   bin/idle3.13
	modified:   bin/pydoc3.13
	modified:   bin/python3.13
	typechange: bin/python3.13-config
	modified:   lib/pkgconfig/python-3.13-embed.pc
	modified:   lib/pkgconfig/python-3.13.pc

The most problematic of these are the pkg-config files:

diff --git a/lib/pkgconfig/python-3.13-embed.pc b/lib/pkgconfig/python-3.13-embed.pc
index 9bc6ab5..5fc2548 100644
--- a/lib/pkgconfig/python-3.13-embed.pc
+++ b/lib/pkgconfig/python-3.13-embed.pc
@@ -9,5 +9,5 @@ Description: Embed Python into an application
 Requires:
 Version: 3.13
 Libs.private: -ldl  -framework CoreFoundation
-Libs: -L${libdir} -lpython3.13
-Cflags: -I${includedir}/python3.13
+Libs: -L${libdir} -lpython3.13t
+Cflags: -I${includedir}/python3.13t
diff --git a/lib/pkgconfig/python-3.13.pc b/lib/pkgconfig/python-3.13.pc
index c206220..519f20f 100644
--- a/lib/pkgconfig/python-3.13.pc
+++ b/lib/pkgconfig/python-3.13.pc
@@ -10,4 +10,4 @@ Requires:
 Version: 3.13
 Libs.private: -ldl  -framework CoreFoundation
 Libs: -L${libdir}
-Cflags: -I${includedir}/python3.13
+Cflags: -I${includedir}/python3.13t

Maybe the pkg-config files for the free-threaded build should be called python-3.13t.pc and python-3.13t-embed.pc?

Linked PRs
@colesbury colesbury added type-bug An unexpected behavior, bug, or error build The build process and cross-build 3.13 bugs and security fixes topic-free-threading 3.14 new features, bugs and security fixes labels May 29, 2024
@erlend-aasland
Copy link
Contributor

Maybe the pkg-config files for the free-threaded build should be called python-3.13t.pc and python-3.13t-embed.pc?

Gut reaction: yes

colesbury added a commit to colesbury/cpython that referenced this issue May 29, 2024
@colesbury
pythongh-119729: Generate distinct pkg-config files for free-threaded…
b73ce88 
… and default build
colesbury added a commit to colesbury/cpython that referenced this issue May 29, 2024
@colesbury
pythongh-119729: Use 't' in pkg-config file name for free-threaded build
1b74154 
For example, the free-threaded build now generates
`lib/pkgconfig/python-3.13t.pc`.
@bedevere-app bedevere-app bot mentioned this issue May 29, 2024
Merged
colesbury added a commit that referenced this issue May 30, 2024
@colesbury
gh-119729: Use 't' in pkg-config file name for free-threaded build (#…
1c04c63 
…119738)

For example, the free-threaded build now generates
`lib/pkgconfig/python-3.13t.pc` and the debug build generates
`lib/pkgconfig/python-3.13d.pc`.
miss-islington pushed a commit to miss-islington/cpython that referenced this issue May 30, 2024
@colesbury @miss-islington
pythongh-119729: Use 't' in pkg-config file name for free-threaded bu…
eb1cf86 
…ild (pythonGH-119738)

For example, the free-threaded build now generates
`lib/pkgconfig/python-3.13t.pc` and the debug build generates
`lib/pkgconfig/python-3.13d.pc`.
(cherry picked from commit 1c04c63)

Co-authored-by: Sam Gross <colesbury@gmail.com>
@bedevere-app bedevere-app bot mentioned this issue May 30, 2024
Merged
colesbury added a commit that referenced this issue May 30, 2024
@miss-islington @colesbury
[3.13] gh-119729: Use 't' in pkg-config file name for free-threaded b…
608cfb8 
…uild (GH-119738) (#119797)

For example, the free-threaded build now generates
`lib/pkgconfig/python-3.13t.pc` and the debug build generates
`lib/pkgconfig/python-3.13d.pc`.
(cherry picked from commit 1c04c63)

Co-authored-by: Sam Gross <colesbury@gmail.com>
noahbkim pushed a commit to hudson-trading/cpython that referenced this issue Jul 11, 2024
@colesbury @noahbkim
pythongh-119729: Use 't' in pkg-config file name for free-threaded bu…
ea782ff 
…ild (python#119738)

For example, the free-threaded build now generates
`lib/pkgconfig/python-3.13t.pc` and the debug build generates
`lib/pkgconfig/python-3.13d.pc`.
estyxx pushed a commit to estyxx/cpython that referenced this issue Jul 17, 2024
@colesbury @estyxx
pythongh-119729: Use 't' in pkg-config file name for free-threaded bu…
31390ee 
…ild (python#119738)

For example, the free-threaded build now generates
`lib/pkgconfig/python-3.13t.pc` and the debug build generates
`lib/pkgconfig/python-3.13d.pc`.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
3.13 bugs and security fixes 3.14 new features, bugs and security fixes build The build process and cross-build topic-free-threading type-bug An unexpected behavior, bug, or error
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
2 participants
@colesbury @erlend-aasland