diff --git a/perl/perl/config.in b/perl/perl/config.in index d35784257..2b93356bd 100644 --- a/perl/perl/config.in +++ b/perl/perl/config.in @@ -2,6 +2,7 @@ # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # Filename: package/.../perl/config.in +# Copyright (C) 2010 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2003 Clifford Wolf # @@ -21,9 +22,6 @@ then text 'Vendor prefix' SDECFG_PKG_PERL5_VENDOR_PREFIX "opt" bool 'Create suid binary' SDECFG_PKG_PERL5_SUIDPERL 1 bool 'Use threads' SDECFG_PKG_PERL5_THREADS 0 - if pkgcheck bdb33 X; then - bool 'Force usage of BerkleyDB 3.3 (Compatibility)' SDECFG_PKG_PERL5_USE_DB3 1 - fi menu_end fi diff --git a/perl/perl/install.patch.cross b/perl/perl/install.patch.cross index f9107802f..3087ea983 100644 --- a/perl/perl/install.patch.cross +++ b/perl/perl/install.patch.cross @@ -2,7 +2,7 @@ # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # Filename: package/.../perl/install.patch.cross -# Copyright (C) 2009 The OpenSDE Project +# Copyright (C) 2009 - 2010 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # # More information can be found in the files COPYING and README. @@ -21,19 +21,28 @@ Some cross compile hacks. Skip man page installation, requires Fcntl extension in miniperl module - Michael Tross -diff -Nur perl-5.10.0-orig/Makefile.SH perl-5.10.0/Makefile.SH ---- perl-5.10.0-orig/Makefile.SH 2009-08-04 11:06:32.000000000 +0300 -+++ perl-5.10.0/Makefile.SH 2009-08-04 11:09:39.000000000 +0300 -@@ -482,7 +482,7 @@ - \$(RUN) ./generate_uudmap\$(EXE_EXT) >uudmap.h +diff -Nur perl-5.10.1-orig/Makefile.SH perl-5.10.1/Makefile.SH +--- perl-5.10.1-orig/Makefile.SH 2010-12-16 14:20:45.912059387 +0100 ++++ perl-5.10.1/Makefile.SH 2010-12-16 14:36:55.804059386 +0100 +@@ -601,7 +601,7 @@ + \$(RUN) ./generate_uudmap\$(HOST_EXE_EXT) >uudmap.h - generate_uudmap\$(EXE_EXT): generate_uudmap\$(OBJ_EXT) -- \$(CC) -o generate_uudmap \$(LDFLAGS) generate_uudmap\$(OBJ_EXT) \$(libs) + generate_uudmap\$(HOST_EXE_EXT): generate_uudmap\$(OBJ_EXT) +- \$(CC) -o generate_uudmap\$(EXE_EXT) \$(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 @@ + $spitshell >>$Makefile <<'!NO!SUBS!' +@@ -1021,7 +1021,7 @@ + # But also this ensures that all extensions are built before we try to scan + # them, which picks up Devel::PPPort's documentation. + pod/perltoc.pod: $(perltoc_pod_prereqs) perl$(EXE_EXT) $(ext) pod/buildtoc +- $(LDLIBPTH) $(RUN) ./perl$(EXE_EXT) -Ilib pod/buildtoc --build-toc -q ++ $(LDLIBPTH) $(RUN) ./miniperl$(EXE_EXT) -Ilib pod/buildtoc --build-toc -q + + pod/perlapi.pod pod/perlintern.pod: miniperl$(EXE_EXT) autodoc.pl embed.fnc + $(LDLIBPTH) $(RUN) ./miniperl$(EXE_EXT) -Ilib autodoc.pl +@@ -1075,11 +1075,11 @@ INSTALL_DEPENDENCE = all install.perl: $(INSTALL_DEPENDENCE) installperl diff --git a/perl/perl/perl.conf b/perl/perl/perl.conf index 9cba3c029..8c5388486 100644 --- a/perl/perl/perl.conf +++ b/perl/perl/perl.conf @@ -70,7 +70,6 @@ confopt="-des -Dcc=$cc -Darchname=$arch_target -Dprefix=/$prefix \ [ "$SDECFG_PKG_PERL5_SUIDPERL" != "0" ] && confopt="$confopt -Dd_dosuid" [ "$SDECFG_PKG_PERL5_THREADS" = "1" ] && confopt="$confopt -Dusethreads" -[ "$SDECFG_PKG_PERL5_USE_DB3" = "1" ] && patchfiles="$patchfiles $confdir/use_db3.diff" hook_add preconf 2 "( rm -f config.sh Policy.sh; eval sh Configure \$confopt; )" if ! atstage native; then diff --git a/perl/perl/perl.desc b/perl/perl/perl.desc index fd0dd6166..9b2868a93 100644 --- a/perl/perl/perl.desc +++ b/perl/perl/perl.desc @@ -2,7 +2,7 @@ [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. [COPY] [COPY] Filename: package/.../perl/perl.desc -[COPY] Copyright (C) 2006 - 2009 The OpenSDE Project +[COPY] Copyright (C) 2006 - 2010 The OpenSDE Project [COPY] Copyright (C) 2004 - 2006 The T2 SDE Project [COPY] Copyright (C) 1998 - 2004 Clifford Wolf [COPY] @@ -33,7 +33,7 @@ [L] GPL Artistic [S] Stable -[V] 5.10.0 +[V] 5.10.1 [P] X -1-3---7-9 102.000 -[D] 642063252 perl-5.10.0.tar.gz http://www.perl.com/CPAN/src/5.0/ +[D] 3352999772 perl-5.10.1.tar.bz2 http://cpan.perl.org/src/5.0/