diff options
author | Robert Coie <rac@gentoo.org> | 2003-11-08 22:53:57 +0000 |
---|---|---|
committer | Robert Coie <rac@gentoo.org> | 2003-11-08 22:53:57 +0000 |
commit | b6d37213e6e25e7284b3abe526f78177cbcb924a (patch) | |
tree | 82f7103f39e7415e63a0cba44fe40bb7a7840639 /dev-lang/perl | |
parent | add 5.8.2 (diff) | |
download | gentoo-2-b6d37213e6e25e7284b3abe526f78177cbcb924a.tar.gz gentoo-2-b6d37213e6e25e7284b3abe526f78177cbcb924a.tar.bz2 gentoo-2-b6d37213e6e25e7284b3abe526f78177cbcb924a.zip |
add 5.8.2
Diffstat (limited to 'dev-lang/perl')
-rw-r--r-- | dev-lang/perl/ChangeLog | 9 | ||||
-rw-r--r-- | dev-lang/perl/Manifest | 7 | ||||
-rw-r--r-- | dev-lang/perl/files/digest-perl-5.8.2 | 1 | ||||
-rw-r--r-- | dev-lang/perl/files/perl-5.8.2-perldoc-emptydirs.patch | 10 | ||||
-rw-r--r-- | dev-lang/perl/files/perl-5.8.2-prelink-lpthread.patch | 11 | ||||
-rw-r--r-- | dev-lang/perl/files/perl-5.8.2-reorder-INC.patch | 85 | ||||
-rw-r--r-- | dev-lang/perl/perl-5.8.2.ebuild | 310 |
7 files changed, 430 insertions, 3 deletions
diff --git a/dev-lang/perl/ChangeLog b/dev-lang/perl/ChangeLog index 68f3fc56b00d..f64fe131464b 100644 --- a/dev-lang/perl/ChangeLog +++ b/dev-lang/perl/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-lang/perl # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.42 2003/10/22 20:26:53 rac Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.43 2003/11/08 22:53:54 rac Exp $ + +*perl-5.8.2 (08 Nov 2003) + + 08 Nov 2003; <rac@gentoo.org> perl-5.8.2.ebuild, + files/perl-5.8.2-perldoc-emptydirs.patch, + files/perl-5.8.2-prelink-lpthread.patch, files/perl-5.8.2-reorder-INC.patch: + new upstream version 22 Oct 2003; <rac@gentoo.org> perl-5.8.1-r2.ebuild, files/perl-5.8.1-perldoc-emptydirs.patch: diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest index 724cd27076e5..92f74c57651d 100644 --- a/dev-lang/perl/Manifest +++ b/dev-lang/perl/Manifest @@ -1,4 +1,4 @@ -MD5 039399151aff0b9074381e9dc831f52a perl-5.8.2.ebuild 9144 +MD5 9129ca3bfefe60b0eeb776a8ebfb5a3c perl-5.8.2.ebuild 9141 MD5 5e2ced5e0d331faea9122a21c49957b0 perl-5.6.1-r12.ebuild 7089 MD5 6fa918519f79045619ee131c5cd6b38b perl-5.8.1-r1.ebuild 8736 MD5 51da78b2203cbf4e81dafb6e24dd2e22 perl-5.8.0-r10.ebuild 14009 @@ -6,7 +6,7 @@ MD5 907c3574f85470b1f2148180f7321f20 perl-5.8.0-r9.ebuild 13534 MD5 220bd838139aaf17ec8f8f6cc1a37c61 perl-5.8.0-r12.ebuild 10316 MD5 33226bb561cd0f81cc4f7756c0f7f4c5 perl-5.6.1-r11.ebuild 6141 MD5 039399151aff0b9074381e9dc831f52a perl-5.8.1-r2.ebuild 9144 -MD5 28e8f3460882472f78a1173a61d70228 ChangeLog 20154 +MD5 a464e32e867f114ee7ab5d4566e33c47 ChangeLog 20379 MD5 31f5ae7d2343aa4819b892820b0ccaf7 perl-5.8.0-r11.ebuild 9890 MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305 MD5 0339818063f904e5a6ebe6b16b4d819f perl-5.6.1-r10.ebuild 6666 @@ -21,8 +21,11 @@ MD5 28fe3868fd4e47ca609f7af6156c94ea files/5.6.1-op-test-fix.diff 503 MD5 b8480b2ccbf7d5a7fe543b9e6f8dbc14 files/libperl_rebuilder 10260 MD5 ea9bf02b28e73e19dc85eb07f2347460 files/5.6.1-builtin-fixup.diff 777 MD5 0a28eb41f5f12ed54f025004af45c83d files/perl-5.8.1-perldoc-emptydirs.patch 489 +MD5 d9412dab085f22309997c8f08ea1ac85 files/perl-5.8.2-reorder-INC.patch 2211 MD5 0a2e349a2e2fa8c18192d5e908f8533f files/perl-5.8.1_rc1-sockatmark-should-__THROW.patch 379 MD5 013255dc6a00399b13caaf899a72e8db files/perl-5.8.0-reorder-INC.patch 2292 +MD5 0a28eb41f5f12ed54f025004af45c83d files/perl-5.8.2-perldoc-emptydirs.patch 489 +MD5 4e99f7529e149661372283c981cf17ff files/perl-5.8.2-prelink-lpthread.patch 476 MD5 8381e239056a7895edf8f3c6c05c835c files/digest-perl-5.8.2 64 MD5 8605f033c451df987f4631bbf9d7b481 files/digest-perl-5.8.0-r10 64 MD5 5c83a2e6f630182b708d39c7de034075 files/digest-perl-5.8.0-r11 188 diff --git a/dev-lang/perl/files/digest-perl-5.8.2 b/dev-lang/perl/files/digest-perl-5.8.2 new file mode 100644 index 000000000000..03c9dcc55731 --- /dev/null +++ b/dev-lang/perl/files/digest-perl-5.8.2 @@ -0,0 +1 @@ +MD5 fa356b74f99166b63a68a322c3c68f91 perl-5.8.2.tar.gz 11896287 diff --git a/dev-lang/perl/files/perl-5.8.2-perldoc-emptydirs.patch b/dev-lang/perl/files/perl-5.8.2-perldoc-emptydirs.patch new file mode 100644 index 000000000000..650248c509e8 --- /dev/null +++ b/dev-lang/perl/files/perl-5.8.2-perldoc-emptydirs.patch @@ -0,0 +1,10 @@ +--- lib/Pod/Perldoc.pm.orig 2003-10-22 13:02:15.000000000 -0700 ++++ lib/Pod/Perldoc.pm 2003-10-22 13:02:36.000000000 -0700 +@@ -1513,6 +1513,7 @@ + $self->{'target'} = (splitdir $s)[-1]; # XXX: why not use File::Basename? + for ($i=0; $i<@dirs; $i++) { + $dir = $dirs[$i]; ++ next unless -d $dir; + ($dir = VMS::Filespec::unixpath($dir)) =~ s!/\z!! if IS_VMS; + if ( (! $self->opt_m && ( $ret = $self->check_file($dir,"$s.pod"))) + or ( $ret = $self->check_file($dir,"$s.pm")) diff --git a/dev-lang/perl/files/perl-5.8.2-prelink-lpthread.patch b/dev-lang/perl/files/perl-5.8.2-prelink-lpthread.patch new file mode 100644 index 000000000000..d38497e0aebe --- /dev/null +++ b/dev-lang/perl/files/perl-5.8.2-prelink-lpthread.patch @@ -0,0 +1,11 @@ +--- hints/linux.sh.orig 2003-02-14 18:11:50.000000000 -0800 ++++ hints/linux.sh 2003-02-14 18:12:01.000000000 -0800 +@@ -43,7 +43,7 @@ + # 'kaffe' has a /usr/lib/libnet.so which is not at all relevent for perl. + set `echo X "$libswanted "| sed -e 's/ bsd / /' -e 's/ net / /'` + shift +-libswanted="$*" ++libswanted="pthread $*" + + # If you have glibc, then report the version for ./myconfig bug reporting. + # (Configure doesn't need to know the specific version since it just uses diff --git a/dev-lang/perl/files/perl-5.8.2-reorder-INC.patch b/dev-lang/perl/files/perl-5.8.2-reorder-INC.patch new file mode 100644 index 000000000000..c934b4135a13 --- /dev/null +++ b/dev-lang/perl/files/perl-5.8.2-reorder-INC.patch @@ -0,0 +1,85 @@ +--- perl.c.orig 2003-07-10 22:09:00.000000000 -0700 ++++ perl.c 2003-07-10 22:30:21.000000000 -0700 +@@ -3932,9 +3932,9 @@ + incpush(APPLLIB_EXP, TRUE, TRUE, TRUE); + #endif + +-#ifdef ARCHLIB_EXP +- incpush(ARCHLIB_EXP, FALSE, FALSE, TRUE); +-#endif ++ /* for configuration where /usr is mounted ro (CPAN::Config, Net::Config) */ ++ incpush("/etc/perl", FALSE, FALSE, TRUE); ++ + #ifdef MACOS_TRADITIONAL + { + Stat_t tmpstatbuf; +@@ -3961,8 +3961,6 @@ + #endif + #if defined(WIN32) + incpush(PRIVLIB_EXP, TRUE, FALSE, TRUE); +-#else +- incpush(PRIVLIB_EXP, FALSE, FALSE, TRUE); + #endif + + #ifdef SITEARCH_EXP +@@ -4006,6 +4004,60 @@ + incpush(PERL_VENDORLIB_STEM, FALSE, TRUE, TRUE); + #endif + ++ incpush(ARCHLIB_EXP, FALSE, FALSE, TRUE); ++ incpush(PRIVLIB_EXP, FALSE, FALSE, TRUE); ++ ++ /* Non-versioned site directory for local modules and for ++ compatability with the previous packages' site dirs */ ++ ++ incpush("/usr/local/lib/site_perl", TRUE, FALSE, TRUE); ++ ++#ifdef PERL_INC_VERSION_LIST ++{ ++ struct stat s; ++ ++ /* add small buffer in case old versions are longer than the current version */ ++ char sitearch[sizeof(SITEARCH_EXP)+16] = SITEARCH_EXP; ++ char sitelib[sizeof(SITELIB_EXP)+16] = SITELIB_EXP; ++ char const *vers[] = { PERL_INC_VERSION_LIST }; ++ char const **p; ++ ++ char *arch_vers = strrchr(sitearch, '/'); ++ char *lib_vers = strrchr(sitelib, '/'); ++ ++ if (arch_vers && isdigit(*++arch_vers)) ++ *arch_vers = 0; ++ else ++ arch_vers = 0; ++ ++ if (lib_vers && isdigit(*++lib_vers)) ++ *lib_vers = 0; ++ else ++ lib_vers = 0; ++ ++ /* there is some duplication here as incpush does something similar ++ internally, but required as sitearch is not a subdirectory of ++ sitelib */ ++ ++ for (p = vers; *p; p++) ++ { ++ if (arch_vers) ++ { ++ strcpy(arch_vers, *p); ++ if (PerlLIO_stat(sitearch, &s) >= 0 && S_ISDIR(s.st_mode)) ++ incpush(sitearch, FALSE, FALSE, TRUE); ++ } ++ ++ if (lib_vers) ++ { ++ strcpy(lib_vers, *p); ++ if (PerlLIO_stat(sitelib, &s) >= 0 && S_ISDIR(s.st_mode)) ++ incpush(sitelib, FALSE, FALSE, TRUE); ++ } ++ } ++} ++#endif ++ + #ifdef PERL_OTHERLIBDIRS + incpush(PERL_OTHERLIBDIRS, TRUE, TRUE, TRUE); + #endif diff --git a/dev-lang/perl/perl-5.8.2.ebuild b/dev-lang/perl/perl-5.8.2.ebuild new file mode 100644 index 000000000000..21c46ce40ce6 --- /dev/null +++ b/dev-lang/perl/perl-5.8.2.ebuild @@ -0,0 +1,310 @@ +# Copyright 1999-2003 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.2.ebuild,v 1.1 2003/11/08 22:53:55 rac Exp $ + +inherit eutils flag-o-matic + +# Perl has problems compiling with -Os in your flags +replace-flags "-Os" "-O2" +# This flag makes compiling crash in interesting ways +filter-flags -malign-double + +# The slot of this binary compat version of libperl.so +PERLSLOT="1" + +SHORT_PV="`echo ${PV} | cut -d. -f1,2`" +DESCRIPTION="Larry Wall's Practical Extraction and Reporting Language" +SAFE_VERSION="2.09" +MY_P="perl-`echo $PV | sed 's/_rc/-RC/'`" +S="${WORKDIR}/${MY_P}" +SRC_URI="ftp://ftp.perl.org/pub/CPAN/src/${MY_P}.tar.gz" +#ftp://ftp.perl.org/pub/CPAN/modules/by-module/DB_File/DB_File-${DB_FILE_VERSION}.tar.gz +#ftp://ftp.perl.org/pub/CPAN/modules/by-module/Safe/Safe-${SAFE_VERSION}.tar.gz" +HOMEPAGE="http://www.perl.org/" +SLOT="0" +LIBPERL="libperl.so.${PERLSLOT}.${SHORT_PV}" +LICENSE="Artistic GPL-2" +KEYWORDS="~x86 ~amd64 ~sparc ~ppc ~alpha ~mips ~hppa ~ia64" +IUSE="berkdb doc gdbm threads" + +DEPEND="sys-apps/groff + berkdb? ( sys-libs/db ) + gdbm? ( >=sys-libs/gdbm-1.8.0 ) + >=sys-apps/portage-2.0.48-r4 + =sys-devel/libperl-${SHORT_PV}* + !<dev-perl/ExtUtils-MakeMaker-6.05-r6 + !<dev-perl/File-Spec-0.84-r1 + !<dev-perl/Test-Simple-0.47-r1" +RDEPEND="berkdb? ( sys-libs/db ) + gdbm? ( >=sys-libs/gdbm-1.8.0 )" + +pkg_setup() { + # I think this should rather be displayed if you *have* 'threads' + # in USE if it could break things ... + if [ -n "`use threads`" ] + then + ewarn "" + ewarn "PLEASE NOTE: You are compiling perl-5.8 with" + ewarn "threading enabled." + ewarn "Threading is not supported by all applications " + ewarn "that compile against perl. You use threading at " + ewarn "your own discretion. " + ewarn "" + sleep 10 + else + ewarn "" + ewarn "PLEASE NOTE: If you want to compile perl-5.8 with" + ewarn "threading enabled , you must restart this emerge" + ewarn "with USE=threads emerge...." + ewarn "Threading is not supported by all applications " + ewarn "that compile against perl. You use threading at " + ewarn "your own discretion. " + ewarn "" + fi + + if [ ! -f /usr/lib/${LIBPERL} ] + then + # Make sure we have libperl installed ... + eerror "Cannot find /usr/lib/${LIBPERL}! Make sure that you" + eerror "have sys-libs/libperl installed properly ..." + die "Cannot find /usr/lib/${LIBPERL}!" + fi +} + +src_unpack() { + + unpack ${A} + + # Get -lpthread linked before -lc. This is needed + # when using glibc >= 2.3, or else runtime signal + # handling breaks. Fixes bug #14380. + # <rac@gentoo.org> (14 Feb 2003) + # reinstated to try to avoid sdl segfaults 03.10.02 + cd ${S}; epatch ${FILESDIR}/${P}-prelink-lpthread.patch + + # Patch perldoc to not abort when it attempts to search + # nonexistent directories; fixes bug #16589. + # <rac@gentoo.org> (28 Feb 2003) + + cd ${S}; epatch ${FILESDIR}/${P}-perldoc-emptydirs.patch + + # this lays the groundwork for solving the issue of what happens + # when people (or ebuilds) install different versiosn of modules + # that are in the core, by rearranging the @INC directory to look + # site -> vendor -> core. + cd ${S}; epatch ${FILESDIR}/${P}-reorder-INC.patch +} + +src_compile() { + + export LC_ALL="C" + local myconf="" + + if [ "`use threads`" ] + then + einfo "using threads" + mythreading="-multi" + myconf="-Dusethreads ${myconf}" + myarch="${CHOST%%-*}-linux-thread" + else + myarch="${CHOST%%-*}-linux" + fi + + if [ "`use gdbm`" ] + then + myconf="${myconf} -Di_gdbm" + fi + if [ "`use berkdb`" ] + then + myconf="${myconf} -Di_db" + + # ndbm.h is only provided by db1 (and perhaps by gdbm in + # error). an alternate approach here would be to check for the + # presence (or some string therein) of /usr/include/ndbm.h + # itself. + + if has_version '=sys-libs/db-1*' + then + myconf="${myconf} -Di_ndbm" + else + myconf="${myconf} -Ui_ndbm" + fi + else + myconf="${myconf} -Ui_db -Ui_ndbm" + fi + if [ "`use mips`" ] + then + # this is needed because gcc 3.3-compiled kernels will hang + # the machine trying to run this test - check with `Kumba + # <rac@gentoo.org> 2003.06.26 + myconf="${myconf} -Dd_u32align" + fi + if [ "`use sparc`" ] + then + myconf="${myconf} -Ud_longdbl" + fi + if [ "`use sparc64`" ] + then + myconf="${myconf} -Ud_longdbl" + fi + + if [ "`use alpha`" -a "${CC}" == "ccc" ] + then + ewarn "Perl will not be built with berkdb support, use gcc if you needed it..." + myconf="${myconf} -Ui_db -Ui_ndbm" + fi + + [ "${ARCH}" = "hppa" ] && append-flags -fPIC + + sh Configure -des \ + -Darchname="${myarch}" \ + -Dcc="${CC:-gcc}" \ + -Dprefix='/usr' \ + -Dvendorprefix='/usr' \ + -Dsiteprefix='/usr' \ + -Dlocincpth=' ' \ + -Doptimize="${CFLAGS}" \ + -Duselargefiles \ + -Dd_dosuid \ + -Dd_semctl_semun \ + -Dscriptdir=/usr/bin \ + -Dman3ext='3pm' \ + -Dcf_by='Gentoo' \ + -Ud_csh \ + ${myconf} || die "Unable to configure" + + MAKEOPTS="${MAKEOPTS} -j1" emake || die "Unable to make" + + emake -i test CCDLFLAGS= +} + +src_install() { + + export LC_ALL="C" + + # Need to do this, else apps do not link to dynamic version of + # the library ... + local coredir="/usr/lib/perl5/${PV}/${myarch}${mythreading}/CORE" + dodir ${coredir} + dosym ../../../../${LIBPERL} ${coredir}/${LIBPERL} + dosym ../../../../${LIBPERL} ${coredir}/libperl.so.${PERLSLOT} + dosym ../../../../${LIBPERL} ${coredir}/libperl.so + + # Fix for "stupid" modules and programs + dodir /usr/lib/perl5/site_perl/${PV}/${myarch}${mythreading} + + make DESTDIR="${D}" \ + INSTALLMAN1DIR="${D}/usr/share/man/man1" \ + INSTALLMAN3DIR="${D}/usr/share/man/man3" \ + install || die "Unable to make install" + + cp -f utils/h2ph utils/h2ph_patched + epatch ${FILESDIR}/perl-5.8.0-RC2-special-h2ph-not-failing-on-machine_ansi_header.patch + + LD_LIBRARY_PATH=. ./perl -Ilib utils/h2ph_patched \ + -a -d ${D}/usr/lib/perl5/${PV}/${myarch}${mythreading} <<EOF +asm/termios.h +syscall.h +syslimits.h +syslog.h +sys/ioctl.h +sys/socket.h +sys/time.h +wait.h +EOF + + # This is to fix a missing c flag for backwards compat + for i in `find ${D}/usr/lib/perl5 -iname "Config.pm"`;do + sed -e "s:ccflags=':ccflags='-DPERL5 :" \ + -e "s:cppflags=':cppflags='-DPERL5 :" \ + ${i} > ${i}.new &&\ + mv ${i}.new ${i} || die "Sed failed" + done + + # A poor fix for the miniperl issues + dosed 's:./miniperl:/usr/bin/perl:' /usr/lib/perl5/${PV}/ExtUtils/xsubpp + fperms 0444 /usr/lib/perl5/${PV}/ExtUtils/xsubpp + dosed 's:./miniperl:/usr/bin/perl:' /usr/bin/xsubpp + fperms 0755 /usr/bin/xsubpp + + ./perl installman \ + --destdir="${D}" --man1ext='1' --man3ext='3' + + # This removes ${D} from Config.pm and .packlist + for i in `find ${D} -iname "Config.pm"` `find ${D} -iname ".packlist"`;do + einfo "Removing ${D} from ${i}..." + sed -e "s:${D}::" ${i} > ${i}.new &&\ + mv ${i}.new ${i} || die "Sed failed" + done + + dodoc Changes* Artistic Copying README Todo* AUTHORS + + if [ -n "`use doc`" ] + then + # HTML Documentation + # We expect errors, warnings, and such with the following. + + dodir /usr/share/doc/${PF}/html + ./perl installhtml \ + --podroot='.' \ + --podpath='lib:ext:pod:vms' \ + --recurse \ + --htmldir="${D}/usr/share/doc/${PF}/html" \ + --libpods='perlfunc:perlguts:perlvar:perlrun:perlop' + fi +} + +pkg_postinst() { + + # Make sure we do not have stale/invalid libperl.so 's ... + if [ -f "${ROOT}usr/lib/libperl.so" -a ! -L "${ROOT}usr/lib/libperl.so" ] + then + mv -f ${ROOT}usr/lib/libperl.so ${ROOT}usr/lib/libperl.so.old + fi + + local perllib="`readlink -f ${ROOT}usr/lib/libperl.so | sed -e 's:^.*/::'`" + + # If we are installing perl, we need the /usr/lib/libperl.so symlink to + # point to the version of perl we are running, else builing something + # against libperl.so will break ... + if [ "${perllib}" != "${LIBPERL}" ] + then + # Delete stale symlinks + rm -f ${ROOT}usr/lib/libperl.so + rm -f ${ROOT}usr/lib/libperl.so.${PERLSLOT} + # Regenerate libperl.so.${PERLSLOT} + ln -snf ${LIBPERL} ${ROOT}usr/lib/libperl.so.${PERLSLOT} + # Create libperl.so (we use the *soname* versioned lib here ..) + ln -snf libperl.so.${PERLSLOT} ${ROOT}usr/lib/libperl.so + fi + + if [ "${ROOT}" = "/" ] + then + ebegin "Converting C header files to the corresponding Perl format" + cd /usr/include; find ./ -name "*.h" -type f -exec h2ph {} \; + fi + + eerror "" + eerror "If this is an upgrade to a perl 5.6.1 system," + eerror "~OR~ an upgrade to a previous Gentoo release" + eerror "of perl 5.8.0, prior to -r8 " + eerror "you may need to recompile applications that" + eerror "were emerged against the old libperl.so" + eerror "" + eerror "${FILESDIR}/libperl_rebuilder " + eerror "is provided to assist with this. " + eerror "PLEASE DO NOT INTERRUPT THE RUNNING OF THIS SCRIPT." + eerror "Part of the rebuilding of applications compiled against " + eerror "your old libperl involves temporarily unmerging" + eerror "them - interruptions could leave you with unmerged" + eerror "packages before they can be remerged." + eerror "" + eerror "If you have run the rebuilder and a package still gives" + eerror "you trouble, and re-emerging it fails to correct" + eerror "the problem, please check http://bugs.gentoo.org/" + eerror "for more information or to report a bug." + eerror "" + eerror "" +} + + |