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

save-build-env: Strip out MAKEOPTS #1311

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions bin/save-ebuild-env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,16 @@ __save_ebuild_env() {
unset PYTHONPATH
fi
fi

# These variables contains build host specific configuration. We
# want binpkgs generated on different sized hosts to be
# identical, so strip them from the binpkg. It's also not needed
# for installing / removing a package.
unset MAKEOPTS NINJAOPTS

# These variables are constantly changing. Strip them so we
# don't introduce non-reproducible data into the binpkg.
unset EPOCHREALTIME EPOCHSECONDS SRANDOM
fi

# misc variables inherited from the calling environment
Expand Down
2 changes: 2 additions & 0 deletions lib/portage/package/ebuild/_config/special_env_vars.py
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,9 @@
"FEATURES",
"FILESDIR",
"HOME",
"MAKEOPTS",
"MERGE_TYPE",
"NINJAOPTS",
"NOCOLOR",
"NO_COLOR",
"P",
Expand Down