Uh oh!
There was an error while loading.Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork32k
bpo-45723: Add helpers for save/restore env (GH-29637)#29637
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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Uh oh!
There was an error while loading.Please reload this page.
Conversation
@tiran: there might be a smoother way to do this, but this should do the trick. |
PoC: Apply to SQLite check.
8316e5f to6579627CompareAnother option is to patch the built-in macros, but I prefer this explicit approach. |
Possible improvement: minimise future Proposed patchdiff --git a/configure.ac b/configure.acindex 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) |
configure.ac Outdated
| [_SAVE_VAR([CFLAGS])] | ||
| [_SAVE_VAR([CPPFLAGS])] | ||
| [_SAVE_VAR([LDFLAGS])] | ||
| [_SAVE_VAR([LIBS])] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
It looks like the indention adds some extra space to the output:
save_CFLAGS=$CFLAGS save_CPPFLAGS=$CPPFLAGS save_LDFLAGS=$LDFLAGS save_LIBS=$LIBSThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
Does it look better withdcc2ba9 applied?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
Excellent!
Uh oh!
There was an error while loading.Please reload this page.
https://bugs.python.org/issue45723