Browse Source

perl: Updated (5.8.8 -> 5.10.0)

user/chris/test/early-mdev
Aldas Nabazas 16 years ago committed by Alejandro Mery
parent
commit
349ade4106
  1. 37
      perl/perl/install.patch.cross
  2. 27
      perl/perl/perl-5.8.8-makedepend-fix.patch
  3. 29
      perl/perl/perl.conf
  4. 8
      perl/perl/perl.desc
  5. 46
      perl/perl/use_db3.diff

37
perl/perl/install.patch.cross

@ -2,6 +2,7 @@
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# #
# Filename: package/.../perl/install.patch.cross # Filename: package/.../perl/install.patch.cross
# Copyright (C) 2009 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project
# #
# More information can be found in the files COPYING and README. # More information can be found in the files COPYING and README.
@ -15,22 +16,34 @@
# --- SDE-COPYRIGHT-NOTE-END --- # --- SDE-COPYRIGHT-NOTE-END ---
Some cross compile hacks. Some cross compile hacks.
- Rene Rebe <rene@exactcode.de> - Rene Rebe <rene@exactcode.de>
--- ./Makefile.SH 2004-10-21 17:30:02.000000000 +0200 Skip man page installation, requires Fcntl extension in miniperl module
+++ ./Makefile.SH 2005-05-31 12:59:21.000000000 +0200 - Michael Tross <michael@tross.org>
@@ -828,11 +828,11 @@
cd ../pod; $(MAKE) compile; \ diff -Nur perl-5.10.0-orig/Makefile.SH perl-5.10.0/Makefile.SH
else :; \ --- perl-5.10.0-orig/Makefile.SH 2009-08-04 11:06:32.000000000 +0300
fi +++ perl-5.10.0/Makefile.SH 2009-08-04 11:09:39.000000000 +0300
- $(LDLIBPTH) ./perl installperl --destdir=$(DESTDIR) $(INSTALLFLAGS) $(STRIPFLAGS) @@ -482,7 +482,7 @@
+ $(LDLIBPTH) ./miniperl installperl --destdir=$(DESTDIR) $(INSTALLFLAGS) $(STRIPFLAGS) \$(RUN) ./generate_uudmap\$(EXE_EXT) >uudmap.h
$(MAKE) extras.install
generate_uudmap\$(EXE_EXT): generate_uudmap\$(OBJ_EXT)
- \$(CC) -o generate_uudmap \$(LDFLAGS) generate_uudmap\$(OBJ_EXT) \$(libs)
+ \$(HOSTCC) -o generate_uudmap \$(LDFLAGS) generate_uudmap.c \$(libs)
!GROK!THIS!
$spitshell >>Makefile <<'!NO!SUBS!'
@@ -919,11 +919,11 @@
INSTALL_DEPENDENCE = all
install.perl: $(INSTALL_DEPENDENCE) installperl
- $(LDLIBPTH) $(RUN) ./perl installperl --destdir=$(DESTDIR) $(INSTALLFLAGS) $(STRIPFLAGS)
+ $(LDLIBPTH) $(RUN) ./miniperl installperl --destdir=$(DESTDIR) $(INSTALLFLAGS) $(STRIPFLAGS)
-@test ! -s extras.lst || $(MAKE) extras.install
install.man: all installman install.man: all installman
- $(LDLIBPTH) ./perl installman --destdir=$(DESTDIR) $(INSTALLFLAGS) - $(LDLIBPTH) $(RUN) ./perl installman --destdir=$(DESTDIR) $(INSTALLFLAGS)
+ $(LDLIBPTH) ./miniperl installman --destdir=$(DESTDIR) $(INSTALLFLAGS) + $(LDLIBPTH) $(RUN) echo installman --destdir=$(DESTDIR) $(INSTALLFLAGS)
# XXX Experimental. Hardwired values, but useful for testing. # XXX Experimental. Hardwired values, but useful for testing.
# Eventually Configure could ask for some of these values. # Eventually Configure could ask for some of these values.

27
perl/perl/perl-5.8.8-makedepend-fix.patch

@ -1,27 +0,0 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../perl/perl-5.8.8-makedepend-fix.patch
# Copyright (C) 2008 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
--- perl-5.8.8/makedepend.SH.orig 2007-10-02 05:15:04.000000000 +0300
+++ perl-5.8.8/makedepend.SH 2007-10-02 05:16:41.000000000 +0300
@@ -128,7 +128,7 @@
*.y) filebase=`basename $file .y` ;;
esac
case "$file" in
- */*) finc="-I`echo $file | sed 's#/[^/]*$##`" ;;
+ */*) finc="-I`echo $file | sed 's#/[^/]*$##'`" ;;
*) finc= ;;
esac
$echo "Finding dependencies for $filebase$_o."

29
perl/perl/perl.conf

@ -2,7 +2,7 @@
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# #
# Filename: package/.../perl/perl.conf # Filename: package/.../perl/perl.conf
# Copyright (C) 2010 The OpenSDE Project # Copyright (C) 2009 - 2010 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project
# Copyright (C) 1998 - 2004 Clifford Wolf # Copyright (C) 1998 - 2004 Clifford Wolf
# #
@ -22,11 +22,17 @@ perl_cross_bootstrap()
$MAKE clean $MAKE clean
# setup cross compiler # setup cross compiler
sed -e '/^d_futimes/d' -e '/^d_sockatmark/d' -i config.sh
cat >> config.sh <<-EOT cat >> config.sh <<-EOT
cc='$CC' cc='$CC'
ccname='$CC' ccname='$CC'
ld='$CC' ld='$CC'
libs='-ldl -lm -lcrypt -lutil -lc'
d_futimes='undef'
d_sockatmark='undef'
d_sockatmarkproto='undef'
EOT EOT
touch config.sh
eval $MAKE $makeopt miniperl eval $MAKE $makeopt miniperl
cp -f miniperl.native miniperl cp -f miniperl.native miniperl
} }
@ -56,7 +62,8 @@ perl_postmake() {
runconfig=0 runconfig=0
[[ $libdir = *lib64 ]] && var_append patchfiles ' ' "$confdir/lib64.diff" [[ $libdir = *lib64 ]] && var_append patchfiles ' ' "$confdir/lib64.diff"
confopt="-des -Dcc=gcc -Darchname=$arch_target -Dprefix=/$prefix \ libpth="/usr/local/${libdir##*/} /${libdir##*/} /usr/${libdir##*/}"
confopt="-des -Dcc=$cc -Darchname=$arch_target -Dprefix=/$prefix \
-Dmyhostname=$SDECFG_PKG_PERL5_HOST_NAME \ -Dmyhostname=$SDECFG_PKG_PERL5_HOST_NAME \
-Dsiteprefix=/$SDECFG_PKG_PERL5_SITE_PREFIX \ -Dsiteprefix=/$SDECFG_PKG_PERL5_SITE_PREFIX \
-Dvendorprefix=/$SDECFG_PKG_PERL5_VENDOR_PREFIX" -Dvendorprefix=/$SDECFG_PKG_PERL5_VENDOR_PREFIX"
@ -65,11 +72,25 @@ confopt="-des -Dcc=gcc -Darchname=$arch_target -Dprefix=/$prefix \
[ "$SDECFG_PKG_PERL5_THREADS" = "1" ] && confopt="$confopt -Dusethreads" [ "$SDECFG_PKG_PERL5_THREADS" = "1" ] && confopt="$confopt -Dusethreads"
[ "$SDECFG_PKG_PERL5_USE_DB3" = "1" ] && patchfiles="$patchfiles $confdir/use_db3.diff" [ "$SDECFG_PKG_PERL5_USE_DB3" = "1" ] && patchfiles="$patchfiles $confdir/use_db3.diff"
hook_add preconf 2 "( rm -f config.sh Policy.sh; sh Configure \$confopt; )" hook_add preconf 2 "( rm -f config.sh Policy.sh; eval sh Configure \$confopt; )"
if ! atstage native; then if ! atstage native; then
var_append confopt " " "-Ddynamic_ext=none -Dstatic_ext=none" var_append confopt " " "-Ddynamic_ext=none"
var_append confopt " " "-Dstatic_ext=\"Data/Dumper IO Fcntl POSIX\""
hook_add premake 3 "perl_cross_bootstrap" hook_add premake 3 "perl_cross_bootstrap"
fi fi
hook_add postmake 4 "perl_postmake" hook_add postmake 4 "perl_postmake"
PERL_CROSS_MODULES="File/Basename.pm Errno.pm Config.pm IO/File.pm Symbol.pm \
SelectSaver.pm IO/Seekable.pm IO/Handle.pm IO.pm XSLoader.pm \
DynaLoader.pm AutoLoader.pm Carp/Heavy.pm"
perl_cross_modules()
{
moddir=${root}/${SDECFG_PKG_PERL5_SITE_PREFIX}/lib/perl5/$ver
for mod in $PERL_CROSS_MODULES; do
[ -d $moddir/`dirname $mod` ] || mkdir -p $moddir/`dirname $mod`;
cp -vdpf lib/$mod $moddir/$mod
done;
}
atstage cross && hook_add postmake 3 "perl_cross_modules"

8
perl/perl/perl.desc

@ -1,9 +1,8 @@
[COPY] --- SDE-COPYRIGHT-NOTE-BEGIN --- [COPY] --- SDE-COPYRIGHT-NOTE-BEGIN ---
[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
[COPY] [COPY]
[COPY] Filename: package/.../perl/perl.desc [COPY] Filename: package/.../perl/perl.desc
[COPY] Copyright (C) 2006 - 2007 The OpenSDE Project [COPY] Copyright (C) 2006 - 2009 The OpenSDE Project
[COPY] Copyright (C) 2004 - 2006 The T2 SDE Project [COPY] Copyright (C) 2004 - 2006 The T2 SDE Project
[COPY] Copyright (C) 1998 - 2004 Clifford Wolf [COPY] Copyright (C) 1998 - 2004 Clifford Wolf
[COPY] [COPY]
@ -34,8 +33,7 @@
[L] GPL Artistic [L] GPL Artistic
[S] Stable [S] Stable
[V] 5.8.8 [V] 5.10.0
[P] X -1-3---7-9 102.000 [P] X -1-3---7-9 102.000
[D] 2197176542 perl-5.8.8.tar.gz http://www.perl.com/CPAN/src/5.0/ [D] 642063252 perl-5.10.0.tar.gz http://www.perl.com/CPAN/src/5.0/

46
perl/perl/use_db3.diff

@ -1,46 +0,0 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../perl/use_db3.diff
# Copyright (C) 2004 - 2006 The T2 SDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
Force perl to use bdb33, for on-disk data binary compatibility reasons.
- Rene Rebe <rene@exactcode.de>
--- perl-5.8.7/ext/DB_File/Makefile.PL.orig 2002-03-25 00:13:47.000000000 +0100
+++ perl-5.8.7/ext/DB_File/Makefile.PL 2005-08-07 20:58:46.000000000 +0200
@@ -8,20 +8,19 @@
# OS2 is a special case, so check for it now.
my $OS2 = "-DOS2" if $Config{'osname'} eq 'os2' ;
-my $LIB = "-ldb" ;
+my $LIB = "-ldb-3" ;
# so is win32
$LIB = "-llibdb" if $^O eq 'MSWin32' ;
WriteMakefile(
NAME => 'DB_File',
- LIBS => ["-L/usr/local/lib $LIB"],
+ LIBS => ["-L/usr/lib $LIB"],
MAN3PODS => {}, # Pods will be built by installman.
- #INC => '-I/usr/local/include',
VERSION_FROM => 'DB_File.pm',
OBJECT => 'version$(OBJ_EXT) DB_File$(OBJ_EXT)',
XSPROTOARG => '-noprototypes',
DEFINE => $OS2 || "",
- INC => ($^O eq "MacOS" ? "-i ::::db:include" : ""),
+ INC => ($^O eq "MacOS" ? "-i ::::db:include" : "-I/usr/include/db3"),
'depend' => {'version$(OBJ_EXT)' => 'version.c'},
'clean' => {FILES => 'constants.h constants.xs'},
);
Loading…
Cancel
Save