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.

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

gh-99108: Add missing md5/sha1 defines to Modules/Setup #102308

Merged
merged 1 commit into from
Feb 28, 2023

Conversation

asottile
Copy link
Contributor

@asottile asottile commented Feb 28, 2023

@asottile
Copy link
Contributor Author

cc @msprotz @erlend-aasland

looks like these were missed too (copied them from Modules/Setup.stdlib.in)

this fixes the deadsnakes builds -- still not sure why this file doesn't get tested in cpython itself or how it differs from Setup.stdlib.in 🤷

@erlend-aasland
Copy link
Contributor

As GPS noted on the related PR, this file is really not used anymore. We should tear it out.

@asottile
Copy link
Contributor Author

As GPS noted on the related PR, this file is really not used anymore. We should tear it out.

debian still uses it -- is there a guide on what to replace it with?

$ wget -q http://deb.debian.org/debian/pool/main/p/python3.11/python3.11_3.11.2-4.debian.tar.xz
$ tar --to-stdout -xf * debian/rules | grep -nC3 Modules/Setup
537-define __post_configure
538-	egrep \
539-	  "^#($$(awk -v ORS='|' '$$2 ~ /^extension$$/ {print $$1}' debian/PVER-minimal.README.Debian.in)XX)" \
540:	  Modules/Setup \
541-	    | sed -e 's/^#//' -e 's/-Wl,-Bdynamic//;s/-Wl,-Bstatic//' \
542:	    >> $(1)/Modules/Setup.local
543-
544-	: # unconditionally run makesetup
545-	cd $(1) && \
546-	  ../Modules/makesetup -c ../Modules/config.c.in -s Modules \
547:	    Modules/Setup.local Modules/Setup.bootstrap Modules/Setup.stdlib ../Modules/Setup
548-	mv $(1)/config.c $(1)/Modules/
549-
550-	: # and fix the timestamps

@erlend-aasland
Copy link
Contributor

Is there even a guide on how to use Modules/Setup? ;) The link you provided is for 3.11; main is 3.12.

@erlend-aasland erlend-aasland changed the title fix defines in Modules/Setup for md5 / sha1 gh-99108: Add missing md5/sha1 defines to Modules/Setup Feb 28, 2023
@asottile
Copy link
Contributor Author

Is there even a guide on how to use Modules/Setup? ;) The link you provided is for 3.11; main is 3.12.

sorry here's the link for 3.12: https://salsa.debian.org/cpython-team/python3/-/blob/db3395e789613c8d01502da8a1be68a976337022/debian/rules#L544

I'm not sure, but it's been using this file for years as far as I know

@erlend-aasland
Copy link
Contributor

It seem that Modules/Setup is still tied to the build system, including fairly recent changes by Christian. IIRC, he has a long term goal of getting rid of it, but as long as the file is here (and being used in the wild), we should of course keep it up to date.

Thanks for noticing, and thanks for the patch!

@erlend-aasland erlend-aasland merged commit 360ef84 into python:main Feb 28, 2023
@erlend-aasland
Copy link
Contributor

I'm not sure, but it's been using this file for years as far as I know

Correct, Modules/Setup has been in use for many years.

@asottile asottile deleted the md5-sha1-defines branch February 28, 2023 21:38
carljm added a commit to carljm/cpython that referenced this pull request Feb 28, 2023
* main: (67 commits)
  pythongh-99108: Add missing md5/sha1 defines to Modules/Setup (python#102308)
  pythongh-100227: Move _str_replace_inf to PyInterpreterState (pythongh-102333)
  pythongh-100227: Move the dtoa State to PyInterpreterState (pythongh-102331)
  pythonGH-102305: Expand some macros in generated_cases.c.h (python#102309)
  Migrate to new PSF mailgun account (python#102284)
  pythongh-102192: Replace PyErr_Fetch/Restore etc by more efficient alternatives (in Python/) (python#102193)
  pythonGH-90744: Fix erroneous doc links in the sys module (python#101319)
  pythongh-87092: Make jump target label equal to the offset of the target in the instructions sequence (python#102093)
  pythongh-101101: Unstable C API tier (PEP 689) (pythonGH-101102)
  IDLE: Simplify DynOptionsMenu __init__code (python#101371)
  pythongh-101561: Add typing.override decorator (python#101564)
  pythongh-101825: Clarify that as_integer_ratio() output is always normalized (python#101843)
  pythongh-101773: Optimize creation of Fractions in private methods (python#101780)
  pythongh-102251: Updates to test_imp Toward Fixing Some Refleaks (pythongh-102254)
  pythongh-102296 Document that inspect.Parameter kinds support ordering (pythonGH-102297)
  pythongh-102250: Fix double-decref in COMPARE_AND_BRANCH error case (pythonGH-102287)
  pythongh-101100: Fix sphinx warnings in `types` module (python#102274)
  pythongh-91038: Change default argument value to `False` instead of `0` (python#31621)
  pythongh-101765: unicodeobject: use Py_XDECREF correctly (python#102283)
  [doc] Improve grammar/fix missing word (pythonGH-102060)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants