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.

Sign up for GitHub

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

Jump to bottom

Fix some nondeterminism when generating binpkgs #1098

Closed
wants to merge 3 commits into from
Closed

Fix some nondeterminism when generating binpkgs #1098

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
06f1bad
config: Don't directly modify FEATURES
Sep 19, 2023
aa20b8c
bin/phase-functions: Move du stats into subshell
Nov 10, 2022
05e7923
config: Sort USE_EXPAND variables
Oct 11, 2023
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
5 changes: 2 additions & 3 deletions bin/phase-functions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -620,12 +620,11 @@ __dyn_install() {

# record build & installed size in build log
if type -P du &>/dev/null; then
local nsz=( $(du -ks "${WORKDIR}") )
local isz=( $(du -ks "${D}") )

# subshell to avoid polluting the caller env with the helper
# functions below
(
local nsz=( $(du -ks "${WORKDIR}") )
local isz=( $(du -ks "${D}") )
# align $1 to the right to the width of the widest of $1 and $2
padl() {
local s1=$1
Expand Down
4 changes: 2 additions & 2 deletions lib/portage/package/ebuild/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1746,7 +1746,7 @@ def __getitem__(self, key):
# Preserve the order of var_split because it can matter for things
# like LINGUAS.
var_split = [x for x in var_split if x in expand_flags]
var_split.extend(expand_flags.difference(var_split))
var_split.extend(sorted(expand_flags.difference(var_split)))
has_wildcard = "*" in expand_flags
if has_wildcard:
var_split = [x for x in var_split if x != "*"]
Expand Down Expand Up @@ -2204,7 +2204,7 @@ def setcpv(self, mycpv, use_cache=None, mydb=None):
# "test" is in IUSE and USE=test is masked, so execution
# of src_test() probably is not reliable. Therefore,
# temporarily disable FEATURES=test just for this package.
self["FEATURES"] = " ".join(x for x in self.features if x != "test")
self.features.remove("test")
floppym marked this conversation as resolved.
Show resolved Hide resolved

# Allow _* flags from USE_EXPAND wildcards to pass through here.
use.difference_update(
Expand Down
Loading