Kaynağa Gözat

Fix building on Solaris under new GCC 4.0 world order

Ralf S. Engelschall 20 yıl önce
ebeveyn
işleme
1b1131e0bc
2 değiştirilmiş dosya ile 41 ekleme ve 1 silme
  1. 40 0
      perl/perl.patch
  2. 1 1
      perl/perl.spec

+ 40 - 0
perl/perl.patch

@@ -265,3 +265,43 @@ http://cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2004-0976
  
     # object oriented 
     my $sh = Shell->new;
+
+
+Index: Configure
+--- Configure.orig	2005-09-21 10:56:01.133363000 +0000
++++ Configure	2005-09-21 12:15:36.836486000 +0000
+@@ -7630,7 +7630,7 @@
+ 			      ;;	
+ 			linux|irix*|gnu*)	dflt='-shared' ;;
+ 			next)  dflt='none' ;;
+-			solaris) dflt='-G' ;;
++			solaris) dflt='-shared' ;;
+ 			sunos) dflt='-assert nodefinitions' ;;
+ 			svr4*|esix*|nonstopux) dflt="-G $ldflags" ;;
+ 	        *)     dflt='none' ;;
+Index: utils/h2ph.PL
+--- utils/h2ph.PL.orig	2005-04-04 23:47:17 +0200
++++ utils/h2ph.PL	2005-09-21 17:08:46 +0200
+@@ -734,8 +734,9 @@
+ # non-GCC?) C compilers, but gcc uses an additional include directory.
+ sub inc_dirs
+ {
+-    my $from_gcc    = `$Config{cc} -v 2>&1`;
++    my $from_gcc    = `$Config{cc} -v 2>&1; $Config{cc} -print-search-dirs 2>&1`;
+     $from_gcc       =~ s:^Reading specs from (.*?)/specs\b.*:$1/include:s;
++    $from_gcc       =~ s;^install:\s+([^\n\s]+).*;$1/include;s;
+ 
+     length($from_gcc) ? ($from_gcc, $Config{usrinc}) : ($Config{usrinc});
+ }
+Index: hints/solaris_2.sh
+--- hints/solaris_2.sh.orig	2005-04-04 22:03:12 +0200
++++ hints/solaris_2.sh	2005-09-21 16:59:42 +0200
+@@ -211,7 +211,7 @@
+ 	# Indent to avoid propagation to config.sh
+ 	verbose=`${cc:-cc} -v -o try try.c 2>&1`
+ 
+-if echo "$verbose" | grep '^Reading specs from' >/dev/null 2>&1; then
++if echo "$verbose" | egrep '^(Reading specs from|Using built-in specs)' >/dev/null 2>&1; then
+ 	#
+ 	# Using gcc.
+ 	#

+ 1 - 1
perl/perl.spec

@@ -33,7 +33,7 @@ Class:        CORE
 Group:        Language
 License:      GPL/Artistic
 Version:      5.8.7
-Release:      20050706
+Release:      20050921
 
 #   list of sources
 Source0:      ftp://ftp.cpan.org/pub/CPAN/src/perl-%{version}.tar.gz