Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 550432
Collapse All | Expand All

(-)revdep-rebuild.orig (-1 / +13 lines)
Lines 54-59 declare ORDER_PKGS # ...sort Link Here
54
declare PACKAGE_NAMES          # ...emerge by slot, not by versionated atom
54
declare PACKAGE_NAMES          # ...emerge by slot, not by versionated atom
55
declare RM_OLD_TEMPFILES       # ...remove tempfiles from prior runs
55
declare RM_OLD_TEMPFILES       # ...remove tempfiles from prior runs
56
declare SEARCH_BROKEN          # ...search for broken libraries and binaries
56
declare SEARCH_BROKEN          # ...search for broken libraries and binaries
57
declare UPGRADE_CXX            # ...find references to older C++ library functions
57
declare VERBOSE                # ...give verbose output
58
declare VERBOSE                # ...give verbose output
58
59
59
# Globals that impact portage directly:
60
# Globals that impact portage directly:
Lines 191-196 Broken reverse dependency rebuilder. Link Here
191
                       (also passed to emerge command)
192
                       (also passed to emerge command)
192
  -P, --no-progress    Turn off the progress meter
193
  -P, --no-progress    Turn off the progress meter
193
  -q, --quiet          Be less verbose (also passed to emerge command)
194
  -q, --quiet          Be less verbose (also passed to emerge command)
195
  -u, --upgrade-c++    Upgrade packages referencing older C++ library functions
194
  -v, --verbose        Be more verbose (also passed to emerge command)
196
  -v, --verbose        Be more verbose (also passed to emerge command)
195
197
196
Calls emerge, options after -- are ignored by $APP_NAME
198
Calls emerge, options after -- are ignored by $APP_NAME
Lines 400-405 get_longopts() { Link Here
400
		                                          # backwards compatibility.
402
		                                          # backwards compatibility.
401
		                                          warn_deprecated_opt "$1"
403
		                                          warn_deprecated_opt "$1"
402
		                                          PACKAGE_NAMES=1;;
404
		                                          PACKAGE_NAMES=1;;
405
					   --upgrade-c++) unset SEARCH_BROKEN
406
					   		  UPGRADE_CXX=1;;
403
		                                       *) die_invalid_option $1;;
407
		                                       *) die_invalid_option $1;;
404
	esac
408
	esac
405
}
409
}
Lines 408-414 get_longopts() { Link Here
408
# Get single-letter commandline options preceded by a single dash.
412
# Get single-letter commandline options preceded by a single dash.
409
get_shortopts() {
413
get_shortopts() {
410
	local OPT OPTSTRING OPTARG OPTIND
414
	local OPT OPTSTRING OPTARG OPTIND
411
	while getopts ":CdehikL:loPpqu:vX" OPT; do
415
	while getopts ":CdehikL:loPpquvX" OPT; do
412
		case "$OPT" in
416
		case "$OPT" in
413
			C) # TODO: Match syntax with the rest of gentoolkit
417
			C) # TODO: Match syntax with the rest of gentoolkit
414
			   export NOCOLOR="yes";;
418
			   export NOCOLOR="yes";;
Lines 429-434 get_shortopts() { Link Here
429
			q) progress() { :; }
433
			q) progress() { :; }
430
			   QUIET=1
434
			   QUIET=1
431
			   EMERGE_OPTIONS+=("--quiet");;
435
			   EMERGE_OPTIONS+=("--quiet");;
436
			u) unset SEARCH_BROKEN
437
			   UPGRADE_CXX=1;;
432
			v) VERBOSE=1
438
			v) VERBOSE=1
433
			   EMERGE_OPTIONS+=("--verbose");;
439
			   EMERGE_OPTIONS+=("--verbose");;
434
			X) # No longer used, since it is the default.
440
			X) # No longer used, since it is the default.
Lines 794-799 main_checks() { Link Here
794
						fi
800
						fi
795
					fi
801
					fi
796
				fi
802
				fi
803
				if [[ $UPGRADE_CXX ]]; then
804
					if nm -C "$target_file" 2>/dev/null | grep -q std::basic_string; then
805
						echo "obj $target_file" >> "$BROKEN_FILE"
806
						echo_v "  found reference(s) to basic_string in $target_file"
807
					fi
808
				fi
797
			elif [[ $SEARCH_BROKEN ]]; then
809
			elif [[ $SEARCH_BROKEN ]]; then
798
				# Look for broken .la files
810
				# Look for broken .la files
799
				la_SEARCH_DIRS="$(parse_ld_so_conf)"
811
				la_SEARCH_DIRS="$(parse_ld_so_conf)"

Return to bug 550432