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

Collapse All | Expand All

(-)Configure.orig (-14 / +22 lines)
Lines 1279-1290 Link Here
1279
: change the next line if compiling for Xenix/286 on Xenix/386
1279
: change the next line if compiling for Xenix/286 on Xenix/386
1280
xlibpth='/usr/lib/386 /lib/386'
1280
xlibpth='/usr/lib/386 /lib/386'
1281
: Possible local library directories to search.
1281
: Possible local library directories to search.
1282
loclibpth="/usr/local/lib /opt/local/lib /usr/gnu/lib"
1282
loclibpth="/usr/local/$lib /opt/local/$lib /usr/gnu/$lib"
1283
loclibpth="$loclibpth /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib"
1283
loclibpth="$loclibpth /opt/gnu/$lib /usr/GNU/$lib /opt/GNU/$lib"
1284
1284
1285
: general looking path for locating libraries
1285
: general looking path for locating libraries
1286
glibpth="/lib /usr/lib $xlibpth"
1286
glibpth="/$lib /usr/$lib $xlibpth"
1287
glibpth="$glibpth /usr/ccs/lib /usr/ucblib /usr/local/lib"
1287
glibpth="$glibpth /usr/ccs/$lib /usr/ucblib /usr/local/$lib"
1288
test -f /usr/shlib/libc.so && glibpth="/usr/shlib $glibpth"
1288
test -f /usr/shlib/libc.so && glibpth="/usr/shlib $glibpth"
1289
test -f /shlib/libc.so     && glibpth="/shlib $glibpth"
1289
test -f /shlib/libc.so     && glibpth="/shlib $glibpth"
1290
test -d /usr/lib64         && glibpth="$glibpth /lib64 /usr/lib64 /usr/local/lib64"
1290
test -d /usr/lib64         && glibpth="$glibpth /lib64 /usr/lib64 /usr/local/lib64"
Lines 1314-1319 Link Here
1314
: no include file wanted by default
1314
: no include file wanted by default
1315
inclwanted=''
1315
inclwanted=''
1316
1316
1317
: determine libdir name
1318
: Should be */lib64 on x86-64, sparc64, ppc64
1319
case `arch` in
1320
  x86_64) lib='lib64';;
1321
  *) lib='lib';;
1322
esac
1323
1317
: Enable -DEBUGGING and -DDEBUGGING from the command line
1324
: Enable -DEBUGGING and -DDEBUGGING from the command line
1318
EBUGGING=''
1325
EBUGGING=''
1319
DEBUGGING=old
1326
DEBUGGING=old
Lines 6112-6119 Link Here
6112
: Reproduce behavior of 5.005 and earlier, maybe drop that in 5.7.
6119
: Reproduce behavior of 5.005 and earlier, maybe drop that in 5.7.
6113
case "$installstyle" in
6120
case "$installstyle" in
6114
'')	case "$prefix" in
6121
'')	case "$prefix" in
6115
		*perl*) dflt='lib';;
6122
		*perl*) dflt='lib64';;
6116
		*) dflt='lib/perl5' ;;
6123
		*) dflt='lib64/perl5' ;;
6117
	esac
6124
	esac
6118
	;;
6125
	;;
6119
*)	dflt="$installstyle" ;;
6126
*)	dflt="$installstyle" ;;
Lines 6179-6186 Link Here
6179
: /opt/perl/lib/perl5... would be redundant.
6186
: /opt/perl/lib/perl5... would be redundant.
6180
: The default "style" setting is made in installstyle.U
6187
: The default "style" setting is made in installstyle.U
6181
case "$installstyle" in
6188
case "$installstyle" in
6182
*lib/perl5*) set dflt privlib lib/$package/$version ;;
6189
*lib64/perl5*) set dflt privlib lib64/$package/$version ;;
6183
*)	 set dflt privlib lib/$version ;;
6190
*)	 set dflt privlib lib64/$version ;;
6184
esac
6191
esac
6185
eval $prefixit
6192
eval $prefixit
6186
$cat <<EOM
6193
$cat <<EOM
Lines 6411-6418 Link Here
6411
prog=`echo $package | $sed 's/-*[0-9.]*$//'`
6418
prog=`echo $package | $sed 's/-*[0-9.]*$//'`
6412
case "$sitelib" in
6419
case "$sitelib" in
6413
'') case "$installstyle" in
6420
'') case "$installstyle" in
6414
	*lib/perl5*) dflt=$siteprefix/lib/$package/site_$prog/$version ;;
6421
	*lib64/perl5*) dflt=$siteprefix/lib64/$package/site_$prog/$version ;;
6415
	*)	 dflt=$siteprefix/lib/site_$prog/$version ;;
6422
	*)	 dflt=$siteprefix/lib64/site_$prog/$version ;;
6416
	esac
6423
	esac
6417
	;;
6424
	;;
6418
*)	dflt="$sitelib"
6425
*)	dflt="$sitelib"
Lines 6917-6924 Link Here
6917
	'')
6924
	'')
6918
		prog=`echo $package | $sed 's/-*[0-9.]*$//'`
6925
		prog=`echo $package | $sed 's/-*[0-9.]*$//'`
6919
		case "$installstyle" in
6926
		case "$installstyle" in
6920
		*lib/perl5*) dflt=$vendorprefix/lib/$package/vendor_$prog/$version ;;
6927
		*lib64/perl5*) dflt=$vendorprefix/lib64/$package/vendor_$prog/$version ;;
6921
		*)	     dflt=$vendorprefix/lib/vendor_$prog/$version ;;
6928
		*)	     dflt=$vendorprefix/lib64/vendor_$prog/$version ;;
6922
		esac
6929
		esac
6923
		;;
6930
		;;
6924
	*)	dflt="$vendorlib"
6931
	*)	dflt="$vendorlib"
Lines 10977-10984 Link Here
10977
			for net in net socket
10984
			for net in net socket
10978
			do
10985
			do
10979
				if test -f /usr/lib/lib$net$_a; then
10986
				if test -f /usr/lib/lib$net$_a; then
10980
					( ($nm $nm_opt /usr/lib/lib$net$_a | eval $nm_extract) ||  \
10987
					( ($nm $nm_opt /usr/$lib/lib$net$_a | eval $nm_extract) ||  \
10981
					$ar t /usr/lib/lib$net$_a) 2>/dev/null >> libc.list
10988
					$ar t /usr/$lib/lib$net$_a) 2>/dev/null >> libc.list
10982
					if $contains socket libc.list >/dev/null 2>&1; then
10989
					if $contains socket libc.list >/dev/null 2>&1; then
10983
						d_socket="$define"
10990
						d_socket="$define"
10984
						socketlib="-l$net"
10991
						socketlib="-l$net"
Lines 22229-22234 Link Here
22229
ldflags_uselargefiles='$ldflags_uselargefiles'
22236
ldflags_uselargefiles='$ldflags_uselargefiles'
22230
ldlibpthname='$ldlibpthname'
22237
ldlibpthname='$ldlibpthname'
22231
less='$less'
22238
less='$less'
22239
lib='$lib'
22232
lib_ext='$lib_ext'
22240
lib_ext='$lib_ext'
22233
libc='$libc'
22241
libc='$libc'
22234
libperl='$libperl'
22242
libperl='$libperl'

Return to bug 206455