FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

bpo-45723: Add helpers for save/restore env (GH-29637) by erlend-aasland · Pull Request #29637 · python/cpython · GitHub

  1. python
  2. cpython

Repository navigation

bpo-45723: Add helpers for save/restore env (GH-29637) - #29637

Merged
tiran merged 6 commits into
python:mainfrom
erlend-aasland:ac-save-env
Nov 22, 2021
ConversationCommits (6)ChecksFiles changed
Merged

bpo-45723: Add helpers for save/restore env (GH-29637)#29637
tiran merged 6 commits into
python:mainfrom
erlend-aasland:ac-save-env

Conversation

erlend-aasland commented Nov 19, 2021 •
edited by bedevere-bot
Loading

Copy link
Copy Markdown
Contributor

erlend-aasland requested a review from tiran November 19, 2021 12:33

erlend-aasland commented Nov 19, 2021

Copy link
Copy Markdown
Contributor Author

@tiran: there might be a smoother way to do this, but this should do the trick.

erlend-aasland mentioned this pull request Nov 19, 2021
Merged

erlend-aasland commented Nov 19, 2021

Copy link
Copy Markdown
Contributor Author

Another option is to patch the built-in macros, but I prefer this explicit approach.

erlend-aasland commented Nov 19, 2021

Copy link
Copy Markdown
Contributor Author

Possible improvement: minimise future configure diffs further, for improved review experience.

Proposed patch 
diff --git a/configure.ac b/configure.ac
index 02463ae717..90507e206b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,21 +32,21 @@ dnl - WITH_SAVE_ENV([SCRIPT])  Runs SCRIPT wrapped with SAVE_ENV/RESTORE_ENV
 AC_DEFUN([_SAVE_VAR], [AS_VAR_COPY([save_][$1], [$1])])dnl
 AC_DEFUN([_RESTORE_VAR], [AS_VAR_COPY([$1], [save_][$1])])dnl
 AC_DEFUN([SAVE_ENV],
-  [_SAVE_VAR([CFLAGS])]
-  [_SAVE_VAR([CPPFLAGS])]
-  [_SAVE_VAR([LDFLAGS])]
-  [_SAVE_VAR([LIBS])]
+[_SAVE_VAR([CFLAGS])]
+[_SAVE_VAR([CPPFLAGS])]
+[_SAVE_VAR([LDFLAGS])]
+[_SAVE_VAR([LIBS])]
 )dnl
 AC_DEFUN([RESTORE_ENV],
-  [_RESTORE_VAR([CFLAGS])]
-  [_RESTORE_VAR([CPPFLAGS])]
-  [_RESTORE_VAR([LDFLAGS])]
-  [_RESTORE_VAR([LIBS])]
+[_RESTORE_VAR([CFLAGS])]
+[_RESTORE_VAR([CPPFLAGS])]
+[_RESTORE_VAR([LDFLAGS])]
+[_RESTORE_VAR([LIBS])]
 )dnl
 AC_DEFUN([WITH_SAVE_ENV],
-  [SAVE_ENV]
-  [$1]
-  [RESTORE_ENV]
+[SAVE_ENV]
+m4_strip([$1])
+[RESTORE_ENV]
 )dnl
 
 AC_SUBST(BASECPPFLAGS)

tiran reviewed Nov 19, 2021
View reviewed changes
Comment thread configure.ac Outdated
Comment on lines +35 to +38
[_SAVE_VAR([CFLAGS])]
[_SAVE_VAR([CPPFLAGS])]
[_SAVE_VAR([LDFLAGS])]
[_SAVE_VAR([LIBS])]

tiran Nov 19, 2021

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

It looks like the indention adds some extra space to the output:

save_CFLAGS=$CFLAGS
  save_CPPFLAGS=$CPPFLAGS
  save_LDFLAGS=$LDFLAGS
  save_LIBS=$LIBS

erlend-aasland Nov 19, 2021

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

Yeah. We can tweak the new macros to further minimise configure diffs. I think that could be worth it, as it would be easier to review future PRs.

erlend-aasland Nov 19, 2021

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

Does it look better with dcc2ba9 applied?

erlend-aasland requested a review from tiran November 21, 2021 16:35
tiran approved these changes Nov 22, 2021
View reviewed changes

tiran left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

Excellent!

tiran changed the title bpo-45723: Add helpers for save/restore env bpo-45723: Add helpers for save/restore env (GH-29637) Nov 22, 2021
tiran merged commit db2277a into python:main Nov 22, 2021
erlend-aasland deleted the ac-save-env branch November 22, 2021 08:17
remykarem pushed a commit to remykarem/cpython that referenced this pull request Dec 7, 2021
bpo-45723: Add helpers for save/restore env (pythonGH-29637)
949a0a0
tiran mentioned this pull request Apr 22, 2022
Closed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

tiran tiran approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

Back | FazBrowse Home | New Git URL