Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 278081 | Differences between
and this patch

Collapse All | Expand All

(-)/opt/gentoo/home/../usr/bin/revdep-rebuild (-46 / +108 lines)
Lines 83-89 declare RC_NOCOLOR # Hack to Link Here
83
declare REBUILD_LIST           # Array of atoms to emerge
83
declare REBUILD_LIST           # Array of atoms to emerge
84
declare SKIP_LIST              # Array of atoms that cannot be emerged (masked?)
84
declare SKIP_LIST              # Array of atoms that cannot be emerged (masked?)
85
declare SONAME                 # Soname/soname path pattern given on commandline
85
declare SONAME                 # Soname/soname path pattern given on commandline
86
declare SONAME_SEARCH          # Value of SONAME modified to match ldd's output
86
declare SONAME_SEARCH          # Value of SONAME modified to match ldd's output #'# vim-syntax
87
declare WORKING_TEXT           # Feedback about the search
87
declare WORKING_TEXT           # Feedback about the search
88
declare WORKING_DIR            # Working directory where cache files are kept
88
declare WORKING_DIR            # Working directory where cache files are kept
89
89
Lines 241-247 die() { Link Here
241
clean_exit() {
241
clean_exit() {
242
	if [[ ! $KEEP_TEMP ]]; then
242
	if [[ ! $KEEP_TEMP ]]; then
243
		rm -f "${FILES[@]}"
243
		rm -f "${FILES[@]}"
244
		if [[ "$WORKING_DIR" != "/var/cache/${APP_NAME}" ]]; then
244
		if [[ "$WORKING_DIR" != "$EPREFIX/var/cache/${APP_NAME}" ]]; then
245
			# Remove the working directory
245
			# Remove the working directory
246
			builtin cd; rmdir "$WORKING_DIR"
246
			builtin cd; rmdir "$WORKING_DIR"
247
		fi
247
		fi
Lines 256-264 get_file_owner() { Link Here
256
	local IFS=$'\n'
256
	local IFS=$'\n'
257
	# ${*/%/ } adds a space to the end of each object name to prevent false
257
	# ${*/%/ } adds a space to the end of each object name to prevent false
258
	# matches, for example /usr/bin/dia matching /usr/bin/dialog (bug #196460).
258
	# matches, for example /usr/bin/dia matching /usr/bin/dialog (bug #196460).
259
	find -L /var/db/pkg -name CONTENTS -print0 |
259
	find -L $EPREFIX/var/db/pkg -name CONTENTS -print0 |
260
		xargs -0 grep -Fl "${*/%/ }" |
260
		xargs -0 grep -Fl "${*/%/ }" |
261
		sed 's:/var/db/pkg/\(.*\)/CONTENTS:\1:'
261
		sed 's:^.*/var/db/pkg/\(.*\)/CONTENTS:\1:'
262
}
262
}
263
##
263
##
264
# Normalize some EMERGE_OPTIONS
264
# Normalize some EMERGE_OPTIONS
Lines 275-281 setup_color() { Link Here
275
	# environment.
275
	# environment.
276
	export NOCOLOR=$(portageq envvar NOCOLOR)
276
	export NOCOLOR=$(portageq envvar NOCOLOR)
277
	[[ $NOCOLOR = yes || $NOCOLOR = true ]] && export RC_NOCOLOR=yes # HACK! (grr)
277
	[[ $NOCOLOR = yes || $NOCOLOR = true ]] && export RC_NOCOLOR=yes # HACK! (grr)
278
	. /etc/init.d/functions.sh
278
	. $EPREFIX/etc/init.d/functions.sh
279
}
279
}
280
##
280
##
281
# Die if an argument is missing.
281
# Die if an argument is missing.
Lines 432-441 get_opts() { Link Here
432
	normalize_emerge_opts
432
	normalize_emerge_opts
433
433
434
	# If the user is not super, add --pretend to EMERGE_OPTIONS
434
	# If the user is not super, add --pretend to EMERGE_OPTIONS
435
	if [[ ${EMERGE_OPTIONS[@]} != *--pretend* && $UID -ne 0 ]]; then
435
#	if [[ ${EMERGE_OPTIONS[@]} != *--pretend* && $UID -ne 0 ]]; then
436
		ewarn "You are not superuser. Adding --pretend to emerge options."
436
#		ewarn "You are not superuser. Adding --pretend to emerge options."
437
		EMERGE_OPTIONS+=(--pretend)
437
#		EMERGE_OPTIONS+=(--pretend)
438
	fi
438
#	fi
439
}
439
}
440
##
440
##
441
# Is there a --pretend or --fetchonly flag in the EMERGE_OPTIONS array?
441
# Is there a --pretend or --fetchonly flag in the EMERGE_OPTIONS array?
Lines 470-476 cd() { Link Here
470
	if builtin cd -P "$@"; then
470
	if builtin cd -P "$@"; then
471
		if [[ $1 != $PWD ]]; then
471
		if [[ $1 != $PWD ]]; then
472
			# Some symlink malfeasance is going on
472
			# Some symlink malfeasance is going on
473
			die 1 "Working directory expected to be $1, but it is $PWD"
473
			#die 1 "Working directory expected to be $1, but it is $PWD"
474
			ewarn "Working directory expected to be $1, but it is $PWD"
474
		fi
475
		fi
475
	else
476
	else
476
		die 1 "Unable to change working directory to '$@'"
477
		die 1 "Unable to change working directory to '$@'"
Lines 523-529 get_search_env() { Link Here
523
	local uid=$(python -c 'import os; import pwd; print pwd.getpwuid(os.getuid())[0]')
524
	local uid=$(python -c 'import os; import pwd; print pwd.getpwuid(os.getuid())[0]')
524
	# Find a place to put temporary files
525
	# Find a place to put temporary files
525
	if [[ "$uid" == "root" ]]; then
526
	if [[ "$uid" == "root" ]]; then
526
		local tmp_target="/var/cache/${APP_NAME}"
527
		local tmp_target="$EPREFIX/var/cache/${APP_NAME}"
527
	else
528
	else
528
		local tmp_target="$(mktemp -d -t revdep-rebuild.XXXXXXXXXX)"
529
		local tmp_target="$(mktemp -d -t revdep-rebuild.XXXXXXXXXX)"
529
	fi
530
	fi
Lines 646-654 get_ldpath() { Link Here
646
		clean_trap "$LDPATH_FILE"
647
		clean_trap "$LDPATH_FILE"
647
		# Ensure that the "trusted" lib directories are at the start of the path
648
		# Ensure that the "trusted" lib directories are at the start of the path
648
		COMPLETE_LD_LIBRARY_PATH=(
649
		COMPLETE_LD_LIBRARY_PATH=(
649
			/lib*
650
			$EPREFIX/lib*
650
			/usr/lib*
651
			$EPREFIX/usr/lib*
651
			$(sed '/^#/d;s/#.*$//' < /etc/ld.so.conf)
652
			$(sed '/^#/d;s/#.*$//' < $EPREFIX/etc/ld.so.conf)
652
			$(sed 's:/[^/]*$::' < "$FILES_FILE" | sort -ru)
653
			$(sed 's:/[^/]*$::' < "$FILES_FILE" | sort -ru)
653
		)
654
		)
654
		IFS=':'
655
		IFS=':'
Lines 666-671 main_checks() { Link Here
666
	local ldd_status
667
	local ldd_status
667
	local numFiles
668
	local numFiles
668
	local COMPLETE_LD_LIBRARY_PATH
669
	local COMPLETE_LD_LIBRARY_PATH
670
	local running_on_irix old_RLD_ARGS old_LD_LIBRARYN32_PATH old_LD_LIBRARY64_PATH
671
	running_on_irix="$(uname -s)"
672
	if [[ $running_on_irix == IRIX || $running_on_irix == IRIX64 ]]; then
673
		running_on_irix=1
674
	else
675
		running_on_irix=0
676
	fi
677
	export running_on_irix
669
	if [[ $SEARCH_BROKEN && $FULL_LD_PATH ]]; then
678
	if [[ $SEARCH_BROKEN && $FULL_LD_PATH ]]; then
670
		[[ -r "$LDPATH_FILE" && -s "$LDPATH_FILE" ]] ||
679
		[[ -r "$LDPATH_FILE" && -s "$LDPATH_FILE" ]] ||
671
			die 1 "Unable to find $LDPATH_FILE"
680
			die 1 "Unable to find $LDPATH_FILE"
Lines 682-733 main_checks() { Link Here
682
			if [[ $target_file != *.la ]]; then
691
			if [[ $target_file != *.la ]]; then
683
				# Note: double checking seems to be faster than single with complete path
692
				# Note: double checking seems to be faster than single with complete path
684
				# (special add ons are rare).
693
				# (special add ons are rare).
694
				if (( $running_on_irix )); then
695
					# By default, IRIX' rld writes errors to /dev/tty :(
696
					old_RLD_ARGS="$_RLD_ARGS"
697
					export _RLD_ARGS="-log /dev/stdout"
698
				fi
685
				ldd_output=$(ldd "$target_file" 2>> "$ERRORS_FILE" | sort -u)
699
				ldd_output=$(ldd "$target_file" 2>> "$ERRORS_FILE" | sort -u)
686
				ldd_status=$? # TODO: Check this for problems with sort
700
				ldd_status=$? # TODO: Check this for problems with sort
701
				if (( $running_on_irix )); then
702
					export _RLD_ARGS="$old_RLD_ARGS"
703
				fi
687
				# HACK: if LD_LIBRARY_MASK is null or undefined grep -vF doesn't work
704
				# HACK: if LD_LIBRARY_MASK is null or undefined grep -vF doesn't work
688
				if grep -vF "${LD_LIBRARY_MASK:=$'\a'}" <<< "$ldd_output" |
705
				#if grep -vF "${LD_LIBRARY_MASK:=$'\a'}" <<< "$ldd_output" |
689
					grep -q "$SONAME_SEARCH"; then
706
					#grep -q "$SONAME_SEARCH"; then
690
					if [[ $SEARCH_BROKEN && $FULL_LD_PATH ]]; then
707
					if [[ $SEARCH_BROKEN && $FULL_LD_PATH ]]; then
691
						if LD_LIBRARY_PATH="$COMPLETE_LD_LIBRARY_PATH" ldd "$target_file" 2>/dev/null |
708
						#if ((running_on_irix)); then
692
							grep -vF "$LD_LIBRARY_MASK" | grep -q "$SONAME_SEARCH"; then
709
						#	old_LD_LIBRARY64_PATH="$LD_LIBRARY64_PATH"
710
						#	old_LD_LIBRARYN32_PATH="$LD_LIBRARYN32_PATH"
711
						#	old_RLD_ARGS="$_RLD_ARGS"
712
						#	export _RLD_ARGS="-log /dev/stdout"
713
						#	# If either of these is set, LD_LIBRARY_PATH is ignored
714
						#	unset LD_LIBRARYN32_PATH
715
						#	unset LD_LIBRARY64_PATH
716
						#fi
717
						#if LD_LIBRARY_PATH="$COMPLETE_LD_LIBRARY_PATH" ldd "$target_file" 2>/dev/null |
718
						#	grep -vF "$LD_LIBRARY_MASK" | grep -q "$SONAME_SEARCH"; then
719
						#	if (( $running_on_irix )); then
720
						#		LD_LIBRARY64_PATH="$old_LD_LIBRARY64_PATH"
721
						#		LD_LIBRARYN32_PATH="$old_LD_LIBRARYN32_PATH"
722
						#		export _RLD_ARGS="$old_RLD_ARGS"
723
						#	fi
693
							# FIXME: I hate duplicating code
724
							# FIXME: I hate duplicating code
694
							# Only build missing direct dependencies
725
							# Only build missing direct dependencies
695
							MISSING_LIBS=$(
726
							if (( $running_on_irix )); then
696
								expr='s/[[:space:]]*\([^[:space:]]*\) => not found/\1/p'
727
								MISSING_LIBS=$(
697
								sed -n "$expr" <<< "$ldd_output"
728
									expr="s/^.*Cannot Successfully map soname '\([^[:space:]]*\)' under any of the filenames.*$/\1/p";
698
							)
729
									sed -n "$expr" <<< "$ldd_output"
730
								)
731
							else
732
								MISSING_LIBS=$(
733
									expr='s/[[:space:]]*\([^[:space:]]*\) => not found/\1/p';
734
									sed -n "$expr" <<< "$ldd_output"
735
								)
736
							fi
699
							REQUIRED_LIBS=$(
737
							REQUIRED_LIBS=$(
700
								expr='s/^[[:space:]]*NEEDED[[:space:]]*\([^[:space:]]*\).*/\1/p';
738
								expr='s/^[[:space:]]*NEEDED[[:space:]]*\([^[:space:]]*\).*/\1/p';
701
								objdump -x "$target_file" | grep NEEDED | sed "$expr" | sort -u
739
								objdump -x "$target_file" 2>/dev/null | grep NEEDED | sed "$expr" | sort -u
702
							)
740
							)
703
							MISSING_LIBS=$(grep -F "$REQUIRED_LIBS" <<< "$MISSING_LIBS")
741
							MISSING_LIBS=$(grep -F "$REQUIRED_LIBS" <<< "$MISSING_LIBS")
704
							if [[ $MISSING_LIBS ]]; then
742
							if [[ $MISSING_LIBS ]]; then
705
								echo "obj $target_file" >> "$BROKEN_FILE"
743
								echo "obj $target_file" >> "$BROKEN_FILE"
706
								echo_v "  broken $target_file (requires $MISSING_LIBS)"
744
								echo_v "  broken $target_file ( requires $( for LIB in $( sort <<< "$MISSING_LIBS" | uniq ); do echo -n "$LIB "; done ))"
707
							fi
745
							fi
708
						fi
746
						#else
747
						#	if (( $running_on_irix )); then
748
						#		LD_LIBRARY64_PATH="$old_LD_LIBRARY64_PATH"
749
						#		LD_LIBRARYN32_PATH="$old_LD_LIBRARYN32_PATH"
750
						#		export _RLD_ARGS="$old_RLD_ARGS"
751
						#	fi
752
						#fi
709
					else
753
					else
710
						# FIXME: I hate duplicating code
754
						# FIXME: I hate duplicating code
711
						# Only rebuild for direct dependencies
755
						# Only rebuild for direct dependencies
712
						MISSING_LIBS=$(
756
						if (( $running_on_irix )); then
713
							expr="/$SONAME_SEARCH/s/^[[:space:]]*\([^[:space:]]*\).*$/\1/p"
757
							MISSING_LIBS=$(
714
							sort -u <<< "$ldd_output" | sed -n "$expr"
758
								expr="s/^.*Cannot Successfully map soname '\([^[:space:]]*\)' under any of the filenames.*$/\1/p";
715
						)
759
								sed -n "$expr" <<< "$ldd_output"
760
							)
761
						else
762
							MISSING_LIBS=$(
763
								expr="/$SONAME_SEARCH/s/^[[:space:]]*\([^[:space:]]*\).*$/\1/p";
764
								sort -u <<< "$ldd_output" | sed -n "$expr"
765
							)
766
						fi
716
						REQUIRED_LIBS=$(
767
						REQUIRED_LIBS=$(
717
							expr='s/^[[:space:]]*NEEDED[[:space:]]*\([^[:space:]]*\).*/\1/p';
768
							expr='s/^[[:space:]]*NEEDED[[:space:]]*\([^[:space:]]*\).*/\1/p';
718
							objdump -x "$target_file" | grep NEEDED | sed "$expr" | sort -u
769
							objdump -x "$target_file" 2>/dev/null | grep NEEDED | sed "$expr" | sort -u
719
						)
770
						)
720
						MISSING_LIBS=$(grep -F "$REQUIRED_LIBS" <<< "$MISSING_LIBS")
771
						MISSING_LIBS=$(grep -F "$REQUIRED_LIBS" <<< "$MISSING_LIBS")
721
						if [[ $MISSING_LIBS ]]; then
772
						if [[ $MISSING_LIBS ]]; then
722
							echo "obj $target_file" >> "$BROKEN_FILE"
773
							echo "obj $target_file" >> "$BROKEN_FILE"
723
							if [[ $SEARCH_BROKEN ]]; then
774
							if [[ $SEARCH_BROKEN ]]; then
724
								echo_v "  broken $target_file (requires $MISSING_LIBS)"
775
								echo_v "  broken $target_file ( requires $( for LIB in $( sort <<< "$MISSING_LIBS" | uniq ); do echo -n "$LIB "; done ))"
725
							else
776
							else
726
								echo_v "  found $target_file"
777
								echo_v "  found $target_file"
727
							fi
778
							fi
728
						fi
779
						fi
729
					fi
780
					fi
730
				fi
781
				#fi
731
			elif [[ $SEARCH_BROKEN ]]; then
782
			elif [[ $SEARCH_BROKEN ]]; then
732
				# Look for broken .la files
783
				# Look for broken .la files
733
				la_SEARCH_DIRS="$SEARCH_DIRS"
784
				la_SEARCH_DIRS="$SEARCH_DIRS"
Lines 741-747 main_checks() { Link Here
741
				); do
792
				); do
742
					if [[ $depend = /* && ! -e $depend ]]; then
793
					if [[ $depend = /* && ! -e $depend ]]; then
743
						echo "obj $target_file" >> "$BROKEN_FILE"
794
						echo "obj $target_file" >> "$BROKEN_FILE"
744
						echo_v "  broken $target_file (requires $depend)"
795
						echo_v "  broken $target_file (requires absolute dependency $depend)"
745
					elif [[ $depend = -[LR]/* ]]; then
796
					elif [[ $depend = -[LR]/* ]]; then
746
						if ! [[ $'\n'${la_SEARCH_DIRS}$'\n' == *$'\n'${depend#-?}$'\n'* ]]; then
797
						if ! [[ $'\n'${la_SEARCH_DIRS}$'\n' == *$'\n'${depend#-?}$'\n'* ]]; then
747
							la_SEARCH_DIRS+=$'\n'"${depend#-?}"
798
							la_SEARCH_DIRS+=$'\n'"${depend#-?}"
Lines 755-760 main_checks() { Link Here
755
								la_broken="no"
806
								la_broken="no"
756
							fi
807
							fi
757
						done
808
						done
809
						if (( $running_on_irix )); then
810
							for la_search_dir in /lib /lib32 /lib32/internal /lib32/mips4 /lib64 /lib64/mips4 \
811
								/usr/lib /usr/lib/abi /usr/lib/internal \
812
								/usr/lib32 /usr/lib32/internal /usr/lib32/mips3 /usr/lib32/mips4 \
813
								/usr/lib64 /usr/lib64/internal /usr/lib64/mips3 /usr/lib64/mips4
814
							do
815
								if [[ -e ${la_search_dir}/${la_lib}.so || -e ${la_search_dir}/${la_lib}.a ]]; then
816
									la_broken="no"
817
								fi
818
							done
819
						fi
758
						IFS="$OIFS"
820
						IFS="$OIFS"
759
						if [[ $la_broken = yes ]]; then
821
						if [[ $la_broken = yes ]]; then
760
							echo "obj $target_file" >> "$BROKEN_FILE"
822
							echo "obj $target_file" >> "$BROKEN_FILE"
Lines 852-858 assign_packages_to_ebuilds() { Link Here
852
				# Get the slot
914
				# Get the slot
853
				PKG="${EXACT_PKG%%-r[[:digit:]]*}"
915
				PKG="${EXACT_PKG%%-r[[:digit:]]*}"
854
				PKG="${PKG%-*}"
916
				PKG="${PKG%-*}"
855
				SLOT=$(</var/db/pkg/$EXACT_PKG/SLOT)
917
				SLOT=$(<$EPREFIX/var/db/pkg/$EXACT_PKG/SLOT)
856
				echo "$PKG:$SLOT"
918
				echo "$PKG:$SLOT"
857
			done < "$PKGS_FILE" > "$EBUILDS_FILE"
919
			done < "$PKGS_FILE" > "$EBUILDS_FILE"
858
			einfo "Generated new $EBUILDS_FILE"
920
			einfo "Generated new $EBUILDS_FILE"
Lines 988-1024 setup_search_paths_and_masks() { Link Here
988
1050
989
	einfo "Configuring search environment for $APP_NAME"
1051
	einfo "Configuring search environment for $APP_NAME"
990
1052
991
	# Update the incremental variables using /etc/profile.env, /etc/ld.so.conf,
1053
	# Update the incremental variables using $EPREFIX/etc/profile.env,
992
	# portage, and the environment
1054
	# $EPREFIX/etc/ld.so.conf, portage, and the environment
993
1055
994
	# Read the incremental variables from environment and portage
1056
	# Read the incremental variables from environment and portage
995
	# Until such time as portage supports these variables as incrementals
1057
	# Until such time as portage supports these variables as incrementals
996
	# The value will be what is in /etc/make.conf
1058
	# The value will be what is in $EPREFIX/etc/make.conf
997
	SEARCH_DIRS+=" "$(unset SEARCH_DIRS; portageq envvar SEARCH_DIRS)
1059
	SEARCH_DIRS+=" "$(unset SEARCH_DIRS; portageq envvar SEARCH_DIRS)
998
	SEARCH_DIRS_MASK+=" "$(unset SEARCH_DIRS_MASK; portageq envvar SEARCH_DIRS_MASK)
1060
	SEARCH_DIRS_MASK+=" "$(unset SEARCH_DIRS_MASK; portageq envvar SEARCH_DIRS_MASK)
999
	LD_LIBRARY_MASK+=" "$(unset LD_LIBRARY_MASK; portageq envvar LD_LIBRARY_MASK)
1061
	LD_LIBRARY_MASK+=" "$(unset LD_LIBRARY_MASK; portageq envvar LD_LIBRARY_MASK)
1000
1062
1001
	# Add the defaults
1063
	# Add the defaults
1002
	if [[ -d /etc/revdep-rebuild ]]; then
1064
	if [[ -d $EPREFIX/etc/revdep-rebuild ]]; then
1003
		for configfile in /etc/revdep-rebuild/*; do
1065
		for configfile in $EPREFIX/etc/revdep-rebuild/*; do
1004
			SEARCH_DIRS+=" "$(. $configfile; echo $SEARCH_DIRS)
1066
			SEARCH_DIRS+=" "$(. $configfile; echo $SEARCH_DIRS)
1005
			SEARCH_DIRS_MASK+=" "$(. $configfile; echo $SEARCH_DIRS_MASK)
1067
			SEARCH_DIRS_MASK+=" "$(. $configfile; echo $SEARCH_DIRS_MASK)
1006
			LD_LIBRARY_MASK+=" "$(. $configfile; echo $LD_LIBRARY_MASK)
1068
			LD_LIBRARY_MASK+=" "$(. $configfile; echo $LD_LIBRARY_MASK)
1007
		done
1069
		done
1008
	else
1070
	else
1009
		SEARCH_DIRS+=" /bin /sbin /usr/bin /usr/sbin /lib* /usr/lib*"
1071
		SEARCH_DIRS+=" $EPREFIX/bin $EPREFIX/sbin $EPREFIX/usr/bin $EPREFIX/usr/sbin $EPREFIX/lib* $EPREFIX/usr/lib*"
1010
		SEARCH_DIRS_MASK+=" /opt/OpenOffice /usr/lib/openoffice"
1072
		SEARCH_DIRS_MASK+=" $EPREFIX/opt/OpenOffice $EPREFIX/usr/lib/openoffice"
1011
		LD_LIBRARY_MASK+=" libodbcinst.so libodbc.so libjava.so libjvm.so"
1073
		LD_LIBRARY_MASK+=" libodbcinst.so libodbc.so libjava.so libjvm.so"
1012
	fi
1074
	fi
1013
1075
1014
	# Get the ROOTPATH and PATH from /etc/profile.env
1076
	# Get the ROOTPATH and PATH from $EPREFIX/etc/profile.env
1015
	if [[ -r "/etc/profile.env" && -s "/etc/profile.env" ]]; then
1077
	if [[ -r "$EPREFIX/etc/profile.env" && -s "$EPREFIX/etc/profile.env" ]]; then
1016
		SEARCH_DIRS+=" "$(. /etc/profile.env; /usr/bin/tr ':' ' ' <<< "$ROOTPATH $PATH")
1078
		SEARCH_DIRS+=" "$(. $EPREFIX/etc/profile.env; $EPREFIX/usr/bin/tr ':' ' ' <<< "$ROOTPATH $PATH")
1017
	fi
1079
	fi
1018
1080
1019
	# Get the directories from /etc/ld.so.conf
1081
	# Get the directories from /etc/ld.so.conf
1020
	if [[ -r /etc/ld.so.conf && -s /etc/ld.so.conf ]]; then
1082
	if [[ -r $EPREFIX/etc/ld.so.conf && -s $EPREFIX/etc/ld.so.conf ]]; then
1021
		SEARCH_DIRS+=" "$(sed '/^#/d;s/#.*$//' /etc/ld.so.conf)
1083
		SEARCH_DIRS+=" "$(sed '/^#/d;s/#.*$//' $EPREFIX/etc/ld.so.conf)
1022
	fi
1084
	fi
1023
1085
1024
	# Set the final variables
1086
	# Set the final variables

Return to bug 278081