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

Collapse All | Expand All

(-)Configure.orig (-16 / +23 lines)
Lines 1264-1269 Link Here
1264
    _exe=".exe"
1264
    _exe=".exe"
1265
fi
1265
fi
1266
1266
1267
: determine libdir name
1268
: Should be */lib64 on x86-64, sparc64, ppc64
1269
case `arch` in
1270
  x86_64) lib='lib64';;
1271
  *) lib='lib';;
1272
esac
1273
1267
i_whoami=''
1274
i_whoami=''
1268
: Trailing extension.  Override this in a hint file, if needed.
1275
: Trailing extension.  Override this in a hint file, if needed.
1269
: Extra object files, if any, needed on this platform.
1276
: Extra object files, if any, needed on this platform.
Lines 1274-1288 Link Here
1274
: change the next line if compiling for Xenix/286 on Xenix/386
1281
: change the next line if compiling for Xenix/286 on Xenix/386
1275
xlibpth='/usr/lib/386 /lib/386'
1282
xlibpth='/usr/lib/386 /lib/386'
1276
: Possible local library directories to search.
1283
: Possible local library directories to search.
1277
loclibpth="/usr/local/lib /opt/local/lib /usr/gnu/lib"
1284
loclibpth="/usr/local/$lib /opt/local/$lib /usr/gnu/$lib"
1278
loclibpth="$loclibpth /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib"
1285
loclibpth="$loclibpth /opt/gnu/$lib /usr/GNU/$lib /opt/GNU/$lib"
1279
1286
1280
: general looking path for locating libraries
1287
: general looking path for locating libraries
1281
glibpth="/lib /usr/lib $xlibpth"
1288
glibpth="/$lib /usr/$lib $xlibpth"
1282
glibpth="$glibpth /usr/ccs/lib /usr/ucblib /usr/local/lib"
1289
glibpth="$glibpth /usr/ccs/$lib /usr/ucblib /usr/local/$lib"
1283
test -f /usr/shlib/libc.so && glibpth="/usr/shlib $glibpth"
1290
test -f /usr/shlib/libc.so && glibpth="/usr/shlib $glibpth"
1284
test -f /shlib/libc.so     && glibpth="/shlib $glibpth"
1291
test -f /shlib/libc.so     && glibpth="/shlib $glibpth"
1285
test -d /usr/lib64         && glibpth="$glibpth /lib64 /usr/lib64 /usr/local/lib64"
1286
1292
1287
: Private path used by Configure to find libraries.  Its value
1293
: Private path used by Configure to find libraries.  Its value
1288
: is prepended to libpth. This variable takes care of special
1294
: is prepended to libpth. This variable takes care of special
Lines 6116-6123 Link Here
6116
: Reproduce behavior of 5.005 and earlier, maybe drop that in 5.7.
6122
: Reproduce behavior of 5.005 and earlier, maybe drop that in 5.7.
6117
case "$installstyle" in
6123
case "$installstyle" in
6118
'')	case "$prefix" in
6124
'')	case "$prefix" in
6119
		*perl*) dflt='lib';;
6125
		*perl*) dflt='lib64';;
6120
		*) dflt='lib/perl5' ;;
6126
		*) dflt='lib64/perl5' ;;
6121
	esac
6127
	esac
6122
	;;
6128
	;;
6123
*)	dflt="$installstyle" ;;
6129
*)	dflt="$installstyle" ;;
Lines 6183-6190 Link Here
6183
: /opt/perl/lib/perl5... would be redundant.
6189
: /opt/perl/lib/perl5... would be redundant.
6184
: The default "style" setting is made in installstyle.U
6190
: The default "style" setting is made in installstyle.U
6185
case "$installstyle" in
6191
case "$installstyle" in
6186
*lib/perl5*) set dflt privlib lib/$package/$version ;;
6192
*lib64/perl5*) set dflt privlib lib64/$package/$version ;;
6187
*)	 set dflt privlib lib/$version ;;
6193
*)	 set dflt privlib lib64/$version ;;
6188
esac
6194
esac
6189
eval $prefixit
6195
eval $prefixit
6190
$cat <<EOM
6196
$cat <<EOM
Lines 6415-6422 Link Here
6415
prog=`echo $package | $sed 's/-*[0-9.]*$//'`
6421
prog=`echo $package | $sed 's/-*[0-9.]*$//'`
6416
case "$sitelib" in
6422
case "$sitelib" in
6417
'') case "$installstyle" in
6423
'') case "$installstyle" in
6418
	*lib/perl5*) dflt=$siteprefix/lib/$package/site_$prog/$version ;;
6424
	*lib64/perl5*) dflt=$siteprefix/lib64/$package/site_$prog/$version ;;
6419
	*)	 dflt=$siteprefix/lib/site_$prog/$version ;;
6425
	*)	 dflt=$siteprefix/lib64/site_$prog/$version ;;
6420
	esac
6426
	esac
6421
	;;
6427
	;;
6422
*)	dflt="$sitelib"
6428
*)	dflt="$sitelib"
Lines 6921-6928 Link Here
6921
	'')
6927
	'')
6922
		prog=`echo $package | $sed 's/-*[0-9.]*$//'`
6928
		prog=`echo $package | $sed 's/-*[0-9.]*$//'`
6923
		case "$installstyle" in
6929
		case "$installstyle" in
6924
		*lib/perl5*) dflt=$vendorprefix/lib/$package/vendor_$prog/$version ;;
6930
		*lib64/perl5*) dflt=$vendorprefix/lib64/$package/vendor_$prog/$version ;;
6925
		*)	     dflt=$vendorprefix/lib/vendor_$prog/$version ;;
6931
		*)	     dflt=$vendorprefix/lib64/vendor_$prog/$version ;;
6926
		esac
6932
		esac
6927
		;;
6933
		;;
6928
	*)	dflt="$vendorlib"
6934
	*)	dflt="$vendorlib"
Lines 11026-11034 Link Here
11026
		else
11032
		else
11027
			for net in net socket
11033
			for net in net socket
11028
			do
11034
			do
11029
				if test -f /usr/lib/lib$net$_a; then
11035
				if test -f /usr/$lib/lib$net$_a; then
11030
					( ($nm $nm_opt /usr/lib/lib$net$_a | eval $nm_extract) ||  \
11036
					( ($nm $nm_opt /usr/$lib/lib$net$_a | eval $nm_extract) ||  \
11031
					$ar t /usr/lib/lib$net$_a) 2>/dev/null >> libc.list
11037
					$ar t /usr/$lib/lib$net$_a) 2>/dev/null >> libc.list
11032
					if $contains socket libc.list >/dev/null 2>&1; then
11038
					if $contains socket libc.list >/dev/null 2>&1; then
11033
						d_socket="$define"
11039
						d_socket="$define"
11034
						socketlib="-l$net"
11040
						socketlib="-l$net"
Lines 22280-22285 Link Here
22280
ldflags_uselargefiles='$ldflags_uselargefiles'
22286
ldflags_uselargefiles='$ldflags_uselargefiles'
22281
ldlibpthname='$ldlibpthname'
22287
ldlibpthname='$ldlibpthname'
22282
less='$less'
22288
less='$less'
22289
lib='$lib'
22283
lib_ext='$lib_ext'
22290
lib_ext='$lib_ext'
22284
libc='$libc'
22291
libc='$libc'
22285
libperl='$libperl'
22292
libperl='$libperl'

Return to bug 252824