Skip to content

Simplify removing versioned variables #371

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.

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

Conversation

jcfr
Copy link
Contributor

@jcfr jcfr commented May 5, 2025

Remove the following variables from cmake/python/CMakeLists.txt:

  • subdir_3

Remove the following variables from cmake/extensions/CMakeLists.txt:

  • crypt3_NAME
  • datetime3_NAME and datetime3_SOURCES
  • time_SOURCES
  • thread3_NAME and thread3_SOURCES
  • winreg3_NAME
  • bz2_3_NAME
  • dbm3_SOURCES and dbm_name
  • gdbm3_SOURCES and gdbm_name

Rename the following variables in cmake/libpython/CMakeLists.txt:

  • init_return_type_3 -> init_return_type
  • init_prefix_3 -> init_prefix

Also fix extension_time source by associating _time.c if Python is 3.2: Follow-up of 7b6b8fa ("datetime, time: Fix build conditionally including _time.c or timemodule.c", 2022-01-18)

jcfr added 2 commits May 2, 2025 00:32
Follow-up of 7b6b8fa ("datetime, time: Fix build conditionally including _time.c or timemodule.c", 2022-01-18)
Remove the following variables from `cmake/python/CMakeLists.txt`:
* `subdir_3`

Remove the following variables from `cmake/extensions/CMakeLists.txt`:
* `crypt3_NAME`
* `datetime3_NAME` and `datetime3_SOURCES`
* `time_SOURCES`
* `thread3_NAME` and `thread3_SOURCES`
* `winreg3_NAME`
* `bz2_3_NAME`
* `dbm3_SOURCES` and `dbm_name`
* `gdbm3_SOURCES` and `gdbm_name`

Rename the following variables in `cmake/libpython/CMakeLists.txt`:
* `init_return_type_3` -> `init_return_type`
* `init_prefix_3` -> `init_prefix`
@jcfr
Copy link
Contributor Author

jcfr commented May 5, 2025

Working toward addressing:

@jcfr jcfr enabled auto-merge (rebase) May 5, 2025 14:51
@jcfr jcfr merged commit 39e9d3d into python-cmake-buildsystem:master May 5, 2025
15 checks passed
@jcfr jcfr deleted the simplify-removing-versionned-variables branch May 5, 2025 15:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

1 participant