Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 58931 | Differences between
and this patch

Collapse All | Expand All

(-)perl-5.8.7.ebuild (-13 / +15 lines)
Lines 13-23 Link Here
13
S="${WORKDIR}/${MY_P}"
13
S="${WORKDIR}/${MY_P}"
14
SRC_URI="ftp://ftp.perl.org/pub/CPAN/src/${MY_P}.tar.bz2"
14
SRC_URI="ftp://ftp.perl.org/pub/CPAN/src/${MY_P}.tar.bz2"
15
HOMEPAGE="http://www.perl.org/"
15
HOMEPAGE="http://www.perl.org/"
16
LIBPERL="libperl.so.${PERLSLOT}.${SHORT_PV}"
16
LIBPERL="libperl$(get_libname ${PERLSLOT}.${SHORT_PV})"
17
17
18
LICENSE="Artistic GPL-2"
18
LICENSE="Artistic GPL-2"
19
SLOT="0"
19
SLOT="0"
20
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
20
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86"
21
IUSE="berkdb debug doc gdbm ithreads perlsuid build minimal"
21
IUSE="berkdb debug doc gdbm ithreads perlsuid build minimal"
22
PERL_OLDVERSEN="5.8.0 5.8.2 5.8.4 5.8.5 5.8.6"
22
PERL_OLDVERSEN="5.8.0 5.8.2 5.8.4 5.8.5 5.8.6"
23
23
Lines 120-126 Link Here
120
	# with ssp enabled. This become fatal during compile time so we 
120
	# with ssp enabled. This become fatal during compile time so we 
121
	# temporally disable ssp on two regexp files till upstream has a 
121
	# temporally disable ssp on two regexp files till upstream has a 
122
	# chance to work it out. Bug #97452
122
	# chance to work it out. Bug #97452
123
	epatch "${FILESDIR}"/${P}-regexp-nossp.patch
123
	use userland_Darwin || epatch "${FILESDIR}"/${P}-regexp-nossp.patch
124
}
124
}
125
125
126
src_configure() {
126
src_configure() {
Lines 139-148 Link Here
139
139
140
	if [[ ${KERNEL} == "FreeBSD" && "${ELIBC}" = "FreeBSD" ]]; then
140
	if [[ ${KERNEL} == "FreeBSD" && "${ELIBC}" = "FreeBSD" ]]; then
141
		osname="freebsd"
141
		osname="freebsd"
142
	elif [[ ${USERLAND} == "Darwin" ]]; then
143
		osname="darwin"
142
	else
144
	else
143
		# Default setting
145
		# Default setting
144
		osname="linux"
146
		osname="linux"
145
	fi
147
	fi
146
148
147
	if use ithreads
149
	if use ithreads
148
	then
150
	then
Lines 262-269 Link Here
262
	local coredir="/usr/lib/perl5/${PV}/${myarch}${mythreading}/CORE"
265
	local coredir="/usr/lib/perl5/${PV}/${myarch}${mythreading}/CORE"
263
	dodir ${coredir}
266
	dodir ${coredir}
264
	dosym ../../../../../$(get_libdir)/${LIBPERL} ${coredir}/${LIBPERL}
267
	dosym ../../../../../$(get_libdir)/${LIBPERL} ${coredir}/${LIBPERL}
265
	dosym ../../../../../$(get_libdir)/${LIBPERL} ${coredir}/libperl.so.${PERLSLOT}
268
	dosym ../../../../../$(get_libdir)/${LIBPERL} ${coredir}/libperl$(get_libname ${PERLSLOT})
266
	dosym ../../../../../$(get_libdir)/${LIBPERL} ${coredir}/libperl.so
269
	dosym ../../../../../$(get_libdir)/${LIBPERL} ${coredir}/libperl$(get_libname)
267
270
268
	# Fix for "stupid" modules and programs
271
	# Fix for "stupid" modules and programs
269
	dodir /usr/lib/perl5/site_perl/${PV}/${myarch}${mythreading}
272
	dodir /usr/lib/perl5/site_perl/${PV}/${myarch}${mythreading}
Lines 523-534 Link Here
523
526
524
pkg_postinst() {
527
pkg_postinst() {
525
	# Make sure we do not have stale/invalid libperl.so 's ...
528
	# Make sure we do not have stale/invalid libperl.so 's ...
526
	if [ -f "${ROOT}usr/$(get_libdir)/libperl.so" -a ! -L "${ROOT}usr/$(get_libdir)/libperl.so" ]
529
	if [ -f "${ROOT}usr/$(get_libdir)/$(get_libname)" -a ! -L "${ROOT}usr/$(get_libdir)/libperl$(get_libname)" ]
527
	then
530
	then
528
		mv -f ${ROOT}usr/$(get_libdir)/libperl.so ${ROOT}usr/$(get_libdir)/libperl.so.old
531
		mv -f ${ROOT}usr/$(get_libdir)/libperl$(get_libname) ${ROOT}usr/$(get_libdir)/libperl$(get_libname).old
529
	fi
532
	fi
530
533
531
	local perllib="`readlink -f ${ROOT}usr/$(get_libdir)/libperl.so | sed -e 's:^.*/::'`"
534
	local perllib="`readlink -f ${ROOT}usr/$(get_libdir)/libperl$(get_libname) | sed -e 's:^.*/::'`"
532
535
533
	# If we are installing perl, we need the /usr/lib/libperl.so symlink to
536
	# If we are installing perl, we need the /usr/lib/libperl.so symlink to
534
	# point to the version of perl we are running, else builing something
537
	# point to the version of perl we are running, else builing something
Lines 536-547 Link Here
536
	if [ "${perllib}" != "${LIBPERL}" ]
539
	if [ "${perllib}" != "${LIBPERL}" ]
537
	then
540
	then
538
		# Delete stale symlinks
541
		# Delete stale symlinks
539
		rm -f ${ROOT}usr/$(get_libdir)/libperl.so
542
		rm -f ${ROOT}usr/$(get_libdir)/libperl$(get_libname)
540
		rm -f ${ROOT}usr/$(get_libdir)/libperl.so.${PERLSLOT}
543
		rm -f ${ROOT}usr/$(get_libdir)/libperl$(get_libname ${PERLSLOT})
541
		# Regenerate libperl.so.${PERLSLOT}
544
		# Regenerate libperl$(get_libname ${PERLSLOT})
542
		ln -snf ${LIBPERL} ${ROOT}usr/$(get_libdir)/libperl.so.${PERLSLOT}
545
		ln -snf ${LIBPERL} ${ROOT}usr/$(get_libdir)/libperl$(get_libname ${PERLSLOT})
543
		# Create libperl.so (we use the *soname* versioned lib here ..)
546
		# Create libperl.so (we use the *soname* versioned lib here ..)
544
		ln -snf libperl.so.${PERLSLOT} ${ROOT}usr/$(get_libdir)/libperl.so
547
		ln -snf libperl$(get_libname ${PERLSLOT}) ${ROOT}usr/$(get_libdir)/libperl$(get_libname)
545
	fi
548
	fi
546
549
547
	INC=$(perl -e 'for $line (@INC) { next if $line eq "."; next if $line =~ m/'${PV}'|etc|local|perl$/; print "$line\n" }')
550
	INC=$(perl -e 'for $line (@INC) { next if $line eq "."; next if $line =~ m/'${PV}'|etc|local|perl$/; print "$line\n" }')

Return to bug 58931