components/perl/perl516/patches/hints_solaris_2.sh.patch
author Mike Sullivan <Mike.Sullivan@Oracle.COM>
Mon, 10 Nov 2014 23:00:19 -0800
changeset 2200 ed16c623101c
parent 1213 389fa144ba08
permissions -rw-r--r--
Added tag s12-61 for changeset ce636b4fc3b2
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1213
389fa144ba08 16486887 perl 5.16 needs to build x86 64-bit properly
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
     1
#
389fa144ba08 16486887 perl 5.16 needs to build x86 64-bit properly
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
     2
# Teach perl how to build 64-bit x86 properly.
389fa144ba08 16486887 perl 5.16 needs to build x86 64-bit properly
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
     3
#
389fa144ba08 16486887 perl 5.16 needs to build x86 64-bit properly
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
     4
--- perl-5.16.2/hints/solaris_2.sh_orig	2012-10-25 19:44:15.000000000 -0700
389fa144ba08 16486887 perl 5.16 needs to build x86 64-bit properly
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
     5
+++ perl-5.16.2/hints/solaris_2.sh	2013-03-13 11:13:25.982938736 -0700
389fa144ba08 16486887 perl 5.16 needs to build x86 64-bit properly
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
     6
@@ -84,8 +84,8 @@
389fa144ba08 16486887 perl 5.16 needs to build x86 64-bit properly
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
     7
 	getworkshoplibs=`cat <<'END'
389fa144ba08 16486887 perl 5.16 needs to build x86 64-bit properly
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
     8
 eval $tryworkshopcc -### 2>&1 | \
389fa144ba08 16486887 perl 5.16 needs to build x86 64-bit properly
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
     9
 sed -n '/ -Y /s!.* -Y "P,\([^"]*\)".*!\1!p' | tr ':' ' ' | \
389fa144ba08 16486887 perl 5.16 needs to build x86 64-bit properly
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    10
-sed -e 's!/usr/lib/sparcv9!!' -e 's!/usr/ccs/lib/sparcv9!!' \
389fa144ba08 16486887 perl 5.16 needs to build x86 64-bit properly
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    11
-    -e 's!/usr/lib!!g' -e 's!/usr/ccs/lib!!g'
389fa144ba08 16486887 perl 5.16 needs to build x86 64-bit properly
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    12
+sed -e 's!/lib/64!!' -e 's!/usr/lib/64!!' \
389fa144ba08 16486887 perl 5.16 needs to build x86 64-bit properly
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    13
+    -e 's!/lib!!g' -e 's!/usr/lib!!g'
389fa144ba08 16486887 perl 5.16 needs to build x86 64-bit properly
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    14
 END
389fa144ba08 16486887 perl 5.16 needs to build x86 64-bit properly
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    15
 `
389fa144ba08 16486887 perl 5.16 needs to build x86 64-bit properly
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    16
 
389fa144ba08 16486887 perl 5.16 needs to build x86 64-bit properly
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    17
@@ -552,8 +552,7 @@
389fa144ba08 16486887 perl 5.16 needs to build x86 64-bit properly
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    18
 		;;
389fa144ba08 16486887 perl 5.16 needs to build x86 64-bit properly
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    19
 	    esac
389fa144ba08 16486887 perl 5.16 needs to build x86 64-bit properly
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    20
 	    processor=`uname -p`;
389fa144ba08 16486887 perl 5.16 needs to build x86 64-bit properly
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    21
-	    if test "$processor" = sparc; then
389fa144ba08 16486887 perl 5.16 needs to build x86 64-bit properly
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    22
-		libc='/usr/lib/sparcv9/libc.so'
389fa144ba08 16486887 perl 5.16 needs to build x86 64-bit properly
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    23
+		libc='/lib/64/libc.so'
389fa144ba08 16486887 perl 5.16 needs to build x86 64-bit properly
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    24
 		if test ! -f $libc; then
389fa144ba08 16486887 perl 5.16 needs to build x86 64-bit properly
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    25
 		    cat >&4 <<EOM
389fa144ba08 16486887 perl 5.16 needs to build x86 64-bit properly
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    26
 
389fa144ba08 16486887 perl 5.16 needs to build x86 64-bit properly
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    27
@@ -563,7 +562,6 @@
389fa144ba08 16486887 perl 5.16 needs to build x86 64-bit properly
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    28
 EOM
389fa144ba08 16486887 perl 5.16 needs to build x86 64-bit properly
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    29
 		    exit 1
389fa144ba08 16486887 perl 5.16 needs to build x86 64-bit properly
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    30
 		fi
389fa144ba08 16486887 perl 5.16 needs to build x86 64-bit properly
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    31
-	    fi
389fa144ba08 16486887 perl 5.16 needs to build x86 64-bit properly
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    32
 	    case "${cc:-cc} -v 2>/dev/null" in
389fa144ba08 16486887 perl 5.16 needs to build x86 64-bit properly
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    33
 	    *gcc*)
389fa144ba08 16486887 perl 5.16 needs to build x86 64-bit properly
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    34
 		echo 'int main() { return 0; }' > try.c
389fa144ba08 16486887 perl 5.16 needs to build x86 64-bit properly
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    35
@@ -614,9 +612,7 @@
389fa144ba08 16486887 perl 5.16 needs to build x86 64-bit properly
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    36
 
389fa144ba08 16486887 perl 5.16 needs to build x86 64-bit properly
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    37
 		echo "int main() { return(0); } " > try.c
389fa144ba08 16486887 perl 5.16 needs to build x86 64-bit properly
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    38
 		tryworkshopcc="${cc:-cc} try.c -o try $ccflags"
389fa144ba08 16486887 perl 5.16 needs to build x86 64-bit properly
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    39
-		if test "$processor" = sparc; then
389fa144ba08 16486887 perl 5.16 needs to build x86 64-bit properly
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    40
-		    loclibpth="/usr/lib/sparcv9 /usr/ccs/lib/sparcv9 $loclibpth"
389fa144ba08 16486887 perl 5.16 needs to build x86 64-bit properly
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    41
-		fi
389fa144ba08 16486887 perl 5.16 needs to build x86 64-bit properly
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    42
+		loclibpth="/lib/64 /usr/lib/64 $loclibpth"
389fa144ba08 16486887 perl 5.16 needs to build x86 64-bit properly
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    43
 		loclibpth="`$getworkshoplibs` $loclibpth"
389fa144ba08 16486887 perl 5.16 needs to build x86 64-bit properly
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    44
 		;;
389fa144ba08 16486887 perl 5.16 needs to build x86 64-bit properly
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    45
 	    esac