diff options
| author |   Paul Varner <fuzzyray@gentoo.org> | 2013-01-14 16:12:29 -0600 |
|---|---|---|
| committer | Paul Varner <fuzzyray@gentoo.org> | 2013-01-14 16:49:22 -0600 |
| commit | 7bc679e4d730543f31cc928d66d3ceeb98f686e6 (patch) | |
| tree | 8afaee6f75ac3663de6f890be10474c67b28af00 /bin | |
| parent | Fix regular expression queries to work properly. (Bug 447406) (diff) | |
| download | gentoolkit-7bc679e4d730543f31cc928d66d3ceeb98f686e6.tar.gz gentoolkit-7bc679e4d730543f31cc928d66d3ceeb98f686e6.tar.bz2 gentoolkit-7bc679e4d730543f31cc928d66d3ceeb98f686e6.zip | |
Add REVDEP_DEFAULT_OPTS variable to allow overriding of EMERGE_DEFAULT_OPTS for revdep-rebuild.
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/revdep-rebuild.sh | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/bin/revdep-rebuild.sh b/bin/revdep-rebuild.sh index 75c5767..6b32ae4 100755 --- a/bin/revdep-rebuild.sh +++ b/bin/revdep-rebuild.sh @@ -61,6 +61,7 @@ declare EMERGE_DEFAULT_OPTS # String of options portage assumes to be set declare EMERGE_OPTIONS # Array of options to pass to portage declare PORTAGE_NICENESS # Renice to this value declare PORTAGE_ROOT # The root path for portage +declare REVDEP_DEFAULT_OPTS # String of default emerge options for revdep-rebuild # Customizable incremental variables: # These variables can be prepended to either by setting the variable in @@ -441,6 +442,12 @@ get_opts() { SONAME="not found" SEARCH_BROKEN=1 FULL_LD_PATH=1 + + # Add the revdep-rebuild default options + if [[ -n ${REVDEP_DEFAULT_OPTS} ]]; then + EMERGE_OPTIONS+=("$REVDEP_DEFAULT_OPTS") + fi + while [[ $1 ]]; do case $1 in --) shift @@ -1032,16 +1039,19 @@ portage_settings() { local ORIG_SEARCH_DIRS="$SEARCH_DIRS" local ORIG_SEARCH_DIRS_MASK="$SEARCH_DIRS_MASK" local ORIG_LD_LIBRARY_MASK="$LD_LIBRARY_MASK" + local ORIG_REVDEP_DEFAULT_OPTS="$REVDEP_DEFAULT_OPTS" unset SEARCH_DIRS unset SEARCH_DIRS_MASK unset LD_LIBRARY_MASK + unset REVDEP_DEFAULT_OPTS - eval $(portageq envvar -v PORTAGE_ROOT PORTAGE_NICENESS EMERGE_DEFAULT_OPTS NOCOLOR SEARCH_DIRS SEARCH_DIRS_MASK LD_LIBRARY_MASK) + eval $(portageq envvar -v PORTAGE_ROOT PORTAGE_NICENESS EMERGE_DEFAULT_OPTS NOCOLOR SEARCH_DIRS SEARCH_DIRS_MASK LD_LIBRARY_MASK REVDEP_DEFAULT_OPTS) export NOCOLOR SEARCH_DIRS="$ORIG_SEARCH_DIRS $SEARCH_DIRS" SEARCH_DIRS_MASK="$ORIG_SEARCH_DIRS_MASK $SEARCH_DIRS_MASK" LD_LIBRARY_MASK="$ORIG_LD_LIBRARY_MASK $LD_LIBRARY_MASK" + REVDEP_DEFAULT_OPTS="$ORIG_REVDEP_DEFAULT_OPTS $REVDEP_DEFAULT_OPTS" } ## |