diff options
Diffstat (limited to 'meta/packages/perl/perl-5.8.8')
| -rw-r--r-- | meta/packages/perl/perl-5.8.8/Makefile.SH.patch | 63 | ||||
| -rw-r--r-- | meta/packages/perl/perl-5.8.8/Makefile.patch | 42 | ||||
| -rw-r--r-- | meta/packages/perl/perl-5.8.8/asm-pageh-fix.patch | 19 | ||||
| -rw-r--r-- | meta/packages/perl/perl-5.8.8/generate-sh.patch | 2 | ||||
| -rw-r--r-- | meta/packages/perl/perl-5.8.8/installperl.patch | 15 | ||||
| -rw-r--r-- | meta/packages/perl/perl-5.8.8/makedepend-dash.patch (renamed from meta/packages/perl/perl-5.8.8/native-makedepend-dash.patch) | 0 | ||||
| -rw-r--r-- | meta/packages/perl/perl-5.8.8/native-ssp.patch | 14 |
7 files changed, 134 insertions, 21 deletions
diff --git a/meta/packages/perl/perl-5.8.8/Makefile.SH.patch b/meta/packages/perl/perl-5.8.8/Makefile.SH.patch index c674ce9ee..a30074be2 100644 --- a/meta/packages/perl/perl-5.8.8/Makefile.SH.patch +++ b/meta/packages/perl/perl-5.8.8/Makefile.SH.patch @@ -1,6 +1,37 @@ ---- perl-5.8.8/Makefile.SH 2007/04/20 12:43:33 1.1 -+++ perl-5.8.8/Makefile.SH 2007/04/20 15:20:40 -@@ -129,18 +129,7 @@ +Index: perl-5.8.8/Makefile.SH +=================================================================== +--- perl-5.8.8.orig/Makefile.SH 2006-01-24 23:49:44.000000000 +1100 ++++ perl-5.8.8/Makefile.SH 2007-06-14 13:29:37.000000000 +1000 +@@ -43,12 +43,12 @@ + true) + # Prefix all runs of 'miniperl' and 'perl' with + # $ldlibpth so that ./perl finds *this* shared libperl. +- case "$LD_LIBRARY_PATH" in +- '') +- ldlibpth="LD_LIBRARY_PATH=`pwd`";; +- *) +- ldlibpth="LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}";; +- esac ++# case "$LD_LIBRARY_PATH" in ++# '') ++# ldlibpth="LD_LIBRARY_PATH=`pwd`";; ++# *) ++# ldlibpth="LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}";; ++# esac + + pldlflags="$cccdlflags" + static_target='static_pic' +@@ -108,7 +108,8 @@ + ldlibpth='' + ;; + *) +- eval "ldlibpth=\"$ldlibpthname=`pwd`:\$$ldlibpthname\"" ++# We compile in the library path in OE from cross-compile, so lets not do this ++# eval "ldlibpth=\"$ldlibpthname=`pwd`:\$$ldlibpthname\"" + ;; + esac + # Strip off any trailing :'s +@@ -129,18 +130,7 @@ # INSTALL file, under "Building a shared perl library". # If there is no pre-existing $libperl, we don't need # to do anything further. @@ -20,7 +51,7 @@ ;; os390) test -f /bin/env && ldlibpth="/bin/env $ldlibpth" ;; -@@ -401,9 +390,19 @@ +@@ -401,9 +391,19 @@ .c.s: $(CCCMDSRC) -S $*.c @@ -43,7 +74,7 @@ .PHONY: all compile translators utilities -@@ -413,10 +412,10 @@ +@@ -413,10 +413,10 @@ cd x2p; $(MAKE) compile; cd pod; $(MAKE) compile; @@ -56,7 +87,7 @@ @echo " "; echo " Making utilities"; cd utils; $(LDLIBPTH) $(MAKE) all -@@ -550,7 +549,7 @@ +@@ -550,7 +550,7 @@ case "$useshrplib" in true) $spitshell >>Makefile <<'!NO!SUBS!' @@ -65,7 +96,7 @@ !NO!SUBS! case "$osname" in aix) -@@ -591,7 +590,9 @@ +@@ -591,7 +591,9 @@ $(CC) -o miniperl $(CLDFLAGS) \ `echo $(obj) | sed 's/ op$(OBJ_EXT) / /'` \ miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) perl$(OBJ_EXT) $(libs) @@ -76,7 +107,7 @@ !NO!SUBS! ;; next4*) -@@ -599,7 +600,9 @@ +@@ -599,7 +601,9 @@ miniperl: $& miniperlmain$(OBJ_EXT) $(LIBPERL) opmini$(OBJ_EXT) $(CC) -o miniperl `echo $(obj) | sed 's/ op$(OBJ_EXT) / /'` \ miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) perl$(OBJ_EXT) $(libs) @@ -87,7 +118,7 @@ !NO!SUBS! ;; darwin*) -@@ -620,7 +623,9 @@ +@@ -620,7 +624,9 @@ -@rm -f miniperl.xok $(CC) $(CLDFLAGS) $(NAMESPACEFLAGS) -o miniperl \ miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) $(LLIBPERL) $(libs) @@ -98,7 +129,7 @@ !NO!SUBS! ;; *) -@@ -629,7 +634,9 @@ +@@ -629,7 +635,9 @@ -@rm -f miniperl.xok $(LDLIBPTH) $(CC) $(CLDFLAGS) -o miniperl \ miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) $(LLIBPERL) $(libs) @@ -109,7 +140,7 @@ !NO!SUBS! ;; esac -@@ -766,7 +773,7 @@ +@@ -766,7 +774,7 @@ # We need to autosplit in two steps because VOS can't handle so many args # .PHONY: preplibrary @@ -118,7 +149,7 @@ @sh ./makedir lib/auto @echo " AutoSplitting perl library" $(LDLIBPTH) ./miniperl -Ilib -e 'use AutoSplit; \ -@@ -775,35 +782,35 @@ +@@ -775,35 +783,35 @@ autosplit_lib_modules(@ARGV)' lib/*/*.pm $(MAKE) lib/re.pm @@ -161,7 +192,7 @@ -@test -f extra.pods && rm -f `cat extra.pods` -@rm -f extra.pods -@for x in `grep -l '^=[a-z]' README.* | grep -v README.vms` ; do \ -@@ -850,18 +857,7 @@ +@@ -850,18 +858,7 @@ INSTALL_DEPENDENCE = all install.perl: $(INSTALL_DEPENDENCE) installperl @@ -181,7 +212,7 @@ # XXX Experimental. Hardwired values, but useful for testing. # Eventually Configure could ask for some of these values. -@@ -978,16 +974,16 @@ +@@ -978,16 +975,16 @@ # # DynaLoader may be needed for extensions that use Makefile.PL. @@ -202,7 +233,7 @@ @$(LDLIBPTH) sh ext/util/make_ext nonxs $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) .PHONY: clean _tidy _mopup _cleaner1 _cleaner2 \ -@@ -1125,7 +1121,7 @@ +@@ -1125,7 +1122,7 @@ test_prep_pre: preplibrary utilities $(nonxs_ext) @@ -211,7 +242,7 @@ PERL=./perl $(MAKE) _test_prep _test_tty: -@@ -1238,7 +1234,7 @@ +@@ -1238,7 +1235,7 @@ # Can't depend on lib/Config.pm because that might be where miniperl # is crashing. diff --git a/meta/packages/perl/perl-5.8.8/Makefile.patch b/meta/packages/perl/perl-5.8.8/Makefile.patch index c78a39b17..ed494b328 100644 --- a/meta/packages/perl/perl-5.8.8/Makefile.patch +++ b/meta/packages/perl/perl-5.8.8/Makefile.patch @@ -1,6 +1,18 @@ ---- perl-5.8.8/Cross/Makefile 2007/04/06 00:47:46 1.1 -+++ perl-5.8.8/Cross/Makefile 2007/04/06 00:48:04 -@@ -12,7 +12,7 @@ +Index: perl-5.8.8/Cross/Makefile +=================================================================== +--- perl-5.8.8.orig/Cross/Makefile 2004-01-12 21:44:01.000000000 +0100 ++++ perl-5.8.8/Cross/Makefile 2007-08-15 00:15:18.000000000 +0200 +@@ -2,7 +2,8 @@ + # + ## $Id: Makefile,v 1.7 2004/01/12 15:41:02 red Exp red $ + +-export TOPDIR=${shell pwd} ++override TOPDIR=${shell pwd} ++export TOPDIR + include $(TOPDIR)/config + export CFLAGS + export SYS=$(ARCH)-$(OS) +@@ -12,7 +13,7 @@ export CC = $(CROSS)gcc export CXX = $(CROSS)g++ @@ -9,7 +21,29 @@ export STRIP = $(CROSS)strip export AR = $(CROSS)ar export RANLIB = $(CROSS)ranlib -@@ -58,11 +58,11 @@ +@@ -34,21 +35,6 @@ + all: + @echo Please read the README file before doing anything else. + +-gen_patch: +- diff -Bbur ../Makefile.SH Makefile.SH > Makefile.SH.patch +- diff -Bbur ../installperl installperl > installperl.patch +- +-patch: +- cd .. ; if [ ! -e ./CROSS_PATCHED ] ; then \ +- patch -p1 < Cross/Makefile.SH.patch; \ +- patch -p1 < Cross/installperl.patch ; mv installperl installperl-patched; \ +- sed -e 's/XXSTRIPXX/$(SYS)/' installperl-patched > installperl; \ +- touch CROSS_PATCHED ; fi +- +-dry_patch: +- cd .. ; patch --dry-run -p1 < Cross/Makefile.SH.patch; \ +- patch --dry-run -p1 < Cross/installperl.patch; \ +- + perl: + @echo Perl cross-build directory is $(TOPDIR) + @echo Target arch is $(SYS) +@@ -58,11 +44,11 @@ $(TOPDIR)/generate_config_sh config.sh-$(SYS) > $(TOPDIR)/../config.sh cd $(TOPDIR)/.. ; ./Configure -S ; make depend ; make ; make more cd $(TOPDIR)/.. ; mkdir -p fake_config_library ; cp lib/Config.pm fake_config_library diff --git a/meta/packages/perl/perl-5.8.8/asm-pageh-fix.patch b/meta/packages/perl/perl-5.8.8/asm-pageh-fix.patch new file mode 100644 index 000000000..41f3b1d23 --- /dev/null +++ b/meta/packages/perl/perl-5.8.8/asm-pageh-fix.patch @@ -0,0 +1,19 @@ +Perl inclues asm/page.h in order to get the definition for getpagesize which +has been definied in unistd.h since glibc 2.1. Some recent version of linux +libc headers removed the asm/page.h resulting in failures here for some +people. + +Index: perl-5.8.8/ext/IPC/SysV/SysV.xs +=================================================================== +--- perl-5.8.8.orig/ext/IPC/SysV/SysV.xs 2001-07-01 04:46:07.000000000 +1000 ++++ perl-5.8.8/ext/IPC/SysV/SysV.xs 2007-07-06 11:40:21.000000000 +1000 +@@ -3,9 +3,6 @@ + #include "XSUB.h" + + #include <sys/types.h> +-#ifdef __linux__ +-# include <asm/page.h> +-#endif + #if defined(HAS_MSG) || defined(HAS_SEM) || defined(HAS_SHM) + #ifndef HAS_SEM + # include <sys/ipc.h> diff --git a/meta/packages/perl/perl-5.8.8/generate-sh.patch b/meta/packages/perl/perl-5.8.8/generate-sh.patch index 50ce00b42..ceb74196d 100644 --- a/meta/packages/perl/perl-5.8.8/generate-sh.patch +++ b/meta/packages/perl/perl-5.8.8/generate-sh.patch @@ -35,7 +35,7 @@ Index: perl-5.8.8/Cross/generate_config_sh + $value =~ s/^\'//; + $value =~ s/\'$//; + # Remove -I/usr/local/... from the value -+ $value =~ s#\W-I/usr/local/\w+\W##g; ++ $value =~ s#\W-I/usr/local/\w+\W# #g; + # Prepend env var (OE setting) to value + print("$key=\'$ENV{$envvar} $value\'\n"); + } diff --git a/meta/packages/perl/perl-5.8.8/installperl.patch b/meta/packages/perl/perl-5.8.8/installperl.patch new file mode 100644 index 000000000..ff52bc3a9 --- /dev/null +++ b/meta/packages/perl/perl-5.8.8/installperl.patch @@ -0,0 +1,15 @@ +Index: perl-5.8.8/installperl +=================================================================== +--- perl-5.8.8.orig/installperl 2007-06-14 12:36:23.000000000 +1000 ++++ perl-5.8.8/installperl 2007-06-14 12:38:39.000000000 +1000 +@@ -3,8 +3,8 @@ + BEGIN { + require 5.004; + chdir '..' if !-d 'lib' and -d '../lib'; +- @INC = 'lib'; +- $ENV{PERL5LIB} = 'lib'; ++# @INC = 'lib'; ++# $ENV{PERL5LIB} = 'lib'; + } + + use strict; diff --git a/meta/packages/perl/perl-5.8.8/native-makedepend-dash.patch b/meta/packages/perl/perl-5.8.8/makedepend-dash.patch index 1f1547437..1f1547437 100644 --- a/meta/packages/perl/perl-5.8.8/native-makedepend-dash.patch +++ b/meta/packages/perl/perl-5.8.8/makedepend-dash.patch diff --git a/meta/packages/perl/perl-5.8.8/native-ssp.patch b/meta/packages/perl/perl-5.8.8/native-ssp.patch new file mode 100644 index 000000000..f815aad45 --- /dev/null +++ b/meta/packages/perl/perl-5.8.8/native-ssp.patch @@ -0,0 +1,14 @@ +Fix for compiling with ssp enabled gcc: +See http://bugs.openembedded.org/show_bug.cgi?id=1980 + +diff -Naur perl-5.8.7.orig/cflags.SH perl-5.8.7/cflags.SH +--- perl-5.8.7.orig/cflags.SH 2002-09-30 10:59:07.000000000 +0000 ++++ perl-5.8.7/cflags.SH 2005-10-02 04:08:39.000000000 +0000 +@@ -165,6 +165,8 @@ + esac + + : Can we perhaps use $ansi2knr here ++ [[ $file == regcomp ]] && export ccflags="${ccflags} -fno-stack-protector" ++ [[ $file == regexec ]] && export ccflags="${ccflags} -fno-stack-protector" + echo "$cc -c -DPERL_CORE $ccflags $optimize $warn" + eval "$also "'"$cc -DPERL_CORE -c $ccflags $optimize $warn"' |