From: Victor Martinez <pitillo@ono.com>
Date: Sun, 23 May 2010 10:59:49 +0000 (+0000)
Subject: Fixed perl compilation with msoft-float option.
X-Git-Url: http://gitweb/?a=commitdiff_plain;h=e5c2f005fce16405cbf0ab2272d257f24fe77c3e;p=attic%2Fports%2Fcore-cross.git

Fixed perl compilation with msoft-float option.
---

diff --git a/perl/.md5sum b/perl/.md5sum
index 51d15c3..dee2d19 100644
--- a/perl/.md5sum
+++ b/perl/.md5sum
@@ -1,2 +1,2 @@
-5efface8b393841a07c66a08dc7be847  perl-5.10.0-cross_compile-1.patch
+6a924c325bf48b0ecbd38459f2c7cbac  perl-5.10.0-cross_compile-1.patch
 d2c39b002ebfd2c3c5dba589365c5a71  perl-5.10.0.tar.gz
diff --git a/perl/Pkgfile b/perl/Pkgfile
index f946ed0..dd8e4be 100644
--- a/perl/Pkgfile
+++ b/perl/Pkgfile
@@ -6,7 +6,7 @@
 
 name=perl
 version=5.10.0
-release=1
+release=2
 source=(http://www.cpan.org/src/5.0/$name-$version.tar.gz \
         $name-$version-cross_compile-1.patch)
 
@@ -14,6 +14,9 @@ build() {
   cd $name-$version
   patch -p1 -i $SRC/$name-$version-cross_compile-1.patch
 
+  # Use of safe cflags to build perl-cross on the host, and don't use msoft-float
+  export CFLAGS="-O2 -pipe"
+
   # avoid to use target generate_uudmap binary
   sed -i Makefile.SH \
       -e 's|generate_uudmap\\$(EXE_EXT): .*|generate_uudmap\\$(EXE_EXT):|' \
diff --git a/perl/perl-5.10.0-cross_compile-1.patch b/perl/perl-5.10.0-cross_compile-1.patch
index 6972bb3..d764a46 100644
--- a/perl/perl-5.10.0-cross_compile-1.patch
+++ b/perl/perl-5.10.0-cross_compile-1.patch
@@ -3526,7 +3526,7 @@ diff -Naur perl-5.10.0.orig/Cross/Makefile perl-5.10.0/Cross/Makefile
 +	    -e "s@\(^full_ar=\).*@\1'$(shell which $(AR))'@g" \
 +	    -e "s@\(^full_sed=\).*@\1'$(shell which sed)'@g" \
 +	    -e "s@\(^ccdlflags=\).*@\1'-Wl,-E -Wl,-rpath,/usr/lib/perl5/$(VERSION)/$(ARCHNAME)/CORE'@g" \
-+	    -e "/^ccflags=/s@-I/usr/local/include@@g" \
++	    -e "/^ccflags=/s@-I/usr/local/include@-msoft-float@g" \
 +	    -e "/^cppflags=/s@-I/usr/local/include@@g" \
 +	    -e "/^ldflags=/s@-L/usr/local/lib@@g" \
 +	    -e "/^lddlflags=/s@-L/usr/local/lib@@g" \