Skip to content

Commit da62937

Browse files
author
Raul E Rangel
committed
save-build-env: Strip out MAKEOPTS
MAKEOPTS contains a host specific value. If the same package is built on a host with different core counts, the binpkgs will have different hashes. This change drops MAKEOPTS after src_install so that it's not included in final environment.gz. Bug: https://bugs.gentoo.org/914441 Signed-off-by: Raul E Rangel <[email protected]>
1 parent b276077 commit da62937

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

Diff for: bin/save-ebuild-env.sh

+5
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,11 @@ __save_ebuild_env() {
1616
unset S __E_DESTTREE __E_INSDESTTREE __E_DOCDESTTREE __E_EXEDESTTREE \
1717
PORTAGE_DOCOMPRESS_SIZE_LIMIT PORTAGE_DOCOMPRESS \
1818
PORTAGE_DOCOMPRESS_SKIP PORTAGE_DOSTRIP PORTAGE_DOSTRIP_SKIP
19+
# This value contains build host specific configuration. We want
20+
# binpkgs generated on different sized hosts to be identical,
21+
# so strip this value from the binpkg. It's also not needed for
22+
# installing / removing a package.
23+
unset MAKEOPTS
1924
if [[ -n ${PYTHONPATH} &&
2025
${PYTHONPATH%%:*} -ef ${PORTAGE_PYM_PATH} ]] ; then
2126
if [[ ${PYTHONPATH} == *:* ]] ; then

0 commit comments

Comments
 (0)