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-100221: Fix creating dirs in make sharedinstall #100329

Merged
merged 1 commit into from
Feb 8, 2023

Conversation

mgorny
Copy link
Contributor

@mgorny mgorny commented Dec 18, 2022

Fix creating install directories in make sharedinstall if they exist already outside DESTDIR. The previous make rules assumed that the directories would be created via a dependency on a rule for $(DESTSHARED) that did not fire if the directory did exist outside $(DESTDIR).

While technically $(DESTDIR) could be prepended to the rule name, moving the rules for creating directories straight into the sharedinstall rule seems to fit the common practices better. Since the rule explicitly checks whether the individual directories exist anyway, there seems to be no reason to rely on make determining that implicitly as well.

Automerge-Triggered-By: GH:zware

Fix creating install directories in `make sharedinstall` if they exist
already outside `DESTDIR`.  The previous make rules assumed that
the directories would be created via a dependency on a rule
for `$(DESTSHARED)` that did not fire if the directory did exist outside
`$(DESTDIR)`.

While technically `$(DESTDIR)` could be prepended to the rule name,
moving the rules for creating directories straight into
the `sharedinstall` rule seems to fit the common practices better.
Since the rule explicitly checks whether the individual directories
exist anyway, there seems to be no reason to rely on make determining
that implicitly as well.
@thesamesam
Copy link
Contributor

@Yhg1s Could you take a look please? This is one of a few issues which has popped up during our testing in Gentoo since the early alphas.

(There's #100328 and #98643 too but both of those seem to be moving now.)

@zware zware added 🤖 automerge build The build process and cross-build labels Feb 8, 2023
@miss-islington miss-islington merged commit 2a8bf25 into python:main Feb 8, 2023
@miss-islington
Copy link
Contributor

Sorry, I can't merge this PR. Reason: Pull Request is not mergeable.

@mgorny
Copy link
Contributor Author

mgorny commented Feb 8, 2023

Thanks!

carljm added a commit to carljm/cpython that referenced this pull request Feb 9, 2023
* main: (82 commits)
  pythongh-101670: typo fix in PyImport_ExtendInittab() (python#101723)
  pythonGH-99293: Document that `Py_TPFLAGS_VALID_VERSION_TAG` shouldn't be used. (#pythonGH-101736)
  no-issue: Add Dong-hee Na as the cjkcodecs codeowner (pythongh-101731)
  pythongh-101678: Merge math_1_to_whatever() and math_1() (python#101730)
  pythongh-101678: refactor the math module to use special functions from c11 (pythonGH-101679)
  pythongh-85984: Remove legacy Lib/pty.py code. (python#92365)
  pythongh-98831: Use opcode metadata for stack_effect() (python#101704)
  pythongh-101283: Version was just released, so should be changed in 3.11.3 (pythonGH-101719)
  pythongh-101283: Fix use of unbound variable (pythonGH-101712)
  pythongh-101283: Improved fallback logic for subprocess with shell=True on Windows (pythonGH-101286)
  pythongh-101277: Port more itertools static types to heap types (python#101304)
  pythongh-98831: Modernize CALL and family (python#101508)
  pythonGH-101696: invalidate type version tag in `_PyStaticType_Dealloc` (python#101697)
  pythongh-100221: Fix creating dirs in `make sharedinstall` (pythonGH-100329)
  pythongh-101670: typo fix in PyImport_AppendInittab() (pythonGH-101672)
  pythongh-101196: Make isdir/isfile/exists faster on Windows (pythonGH-101324)
  pythongh-101614: Don't treat python3_d.dll as a Python DLL when checking extension modules for incompatibility (pythonGH-101615)
  pythongh-100933: Improve `check_element` helper in `test_xml_etree` (python#100934)
  pythonGH-101578: Normalize the current exception (pythonGH-101607)
  pythongh-47937: Note that Popen attributes are read-only (python#93070)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
build The build process and cross-build
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants