Attachment #450836 for bug #134650

View | Details | Raw Unified | Return to bug 134650 | Differences between

and this patch

Lines 9-11 DIST perl-5.22.2-patches-1.tar.xz 19920 SHA256 c128b4d1575f3bcf1952a1526b5725fab Link Here

(-)a/dev-lang/perl/Manifest (+1 lines)
9	DIST perl-5.22.2.tar.bz2 13717881 SHA256 f2322b9b04fe0cdbca9fe755360da04892cb6483d44959457cfebc0bcddc8058 SHA512 1acb77ead47955ef6e8d84903e86cb584ee9415742fb99eb2f1f30772087e8ed0def5f643ce4ee7693df5a1dfe154b108aa85df232d81107f98820bb84a0d71a WHIRLPOOL bdfd1035728619abafeb679cdd3181269a91fad5c30f4995e91d5ae16cb65210ce2c4c47afe85eb192ebde88c0bbc4cd0ed77939acdfd09760b11b57eeace2a6	9	DIST perl-5.22.2.tar.bz2 13717881 SHA256 f2322b9b04fe0cdbca9fe755360da04892cb6483d44959457cfebc0bcddc8058 SHA512 1acb77ead47955ef6e8d84903e86cb584ee9415742fb99eb2f1f30772087e8ed0def5f643ce4ee7693df5a1dfe154b108aa85df232d81107f98820bb84a0d71a WHIRLPOOL bdfd1035728619abafeb679cdd3181269a91fad5c30f4995e91d5ae16cb65210ce2c4c47afe85eb192ebde88c0bbc4cd0ed77939acdfd09760b11b57eeace2a6
10	DIST perl-5.24.0-patches-2.tar.xz 17760 SHA256 8f9ce8895b85d6195cfa10690a28a9b8dbac683cb159ed3f3103e7b5f2bbf18d SHA512 1159dd53d40641f71c301e4be95c8964e6787cdc446578e66e8c97238fc99558c98b1fbc9e89b2d38206364e598ff1544ca1291c14a422d95089f0eea8926cc2 WHIRLPOOL e18ecf63532609dc36c7252f03a1a4d28529b9804dbb9c0d70cc1418a243ff9168a621cadeee52f69919a70312c83232c0857f907f991886cfae870ed4590286	10	DIST perl-5.24.0-patches-2.tar.xz 17760 SHA256 8f9ce8895b85d6195cfa10690a28a9b8dbac683cb159ed3f3103e7b5f2bbf18d SHA512 1159dd53d40641f71c301e4be95c8964e6787cdc446578e66e8c97238fc99558c98b1fbc9e89b2d38206364e598ff1544ca1291c14a422d95089f0eea8926cc2 WHIRLPOOL e18ecf63532609dc36c7252f03a1a4d28529b9804dbb9c0d70cc1418a243ff9168a621cadeee52f69919a70312c83232c0857f907f991886cfae870ed4590286
11	DIST perl-5.24.0.tar.bz2 14155784 SHA256 62328a53d157e8153b33e137594155f6f8b64418f7f9238210feb809585290e0 SHA512 05ecc6774da475d14f426a850be7adf754fcb17a2fa85a67aeaf8ddb9c86ae8b1ee654e803ebae5ccdaa73ad3e35188e3254ac9452b47cd4f8ffe47e67d15f53 WHIRLPOOL 84c98ddb19a5c6d32f40b427ba1f82656f88cfe5b7d3f416fb92579436890af52299f05301a81692dfdae65594b1866081e1fee067623256d796855d87d532ad	11	DIST perl-5.24.0.tar.bz2 14155784 SHA256 62328a53d157e8153b33e137594155f6f8b64418f7f9238210feb809585290e0 SHA512 05ecc6774da475d14f426a850be7adf754fcb17a2fa85a67aeaf8ddb9c86ae8b1ee654e803ebae5ccdaa73ad3e35188e3254ac9452b47cd4f8ffe47e67d15f53 WHIRLPOOL 84c98ddb19a5c6d32f40b427ba1f82656f88cfe5b7d3f416fb92579436890af52299f05301a81692dfdae65594b1866081e1fee067623256d796855d87d532ad
		12	DIST perl-cross-1.1.1.tar.gz 88283 SHA256 8ee72f39119b342f3b911266e5c965914a44a484fd18d9c444d106aca4dd7abc SHA512 8ad958d08d8e7ff2b80333959544aaf0e83a74f2e34c9e8aca543052d039c0f4b00cda694ee940874b192b0d83656a9f6854ebbf2c444b212ba9d4417c576591 WHIRLPOOL e6739ca8fc4dcafa14a20585d75931cf6b6a98fad9c732312d15507b29b926452668afc4f27f2b6c5bb6faa623fc506538a53ed9d303d21897f42d47c26e4924




inherit eutils alternatives flag-o-matic toolchain-funcs multilib multiprocessing

PATCH_VER=2
CROSS_VER=1.1.1

PERL_OLDVERSEN=""
MODULE_AUTHOR=RJBS

	mirror://cpan/authors/id/${MODULE_AUTHOR:0:1}/${MODULE_AUTHOR:0:2}/${MODULE_AUTHOR}/${MY_P}.tar.bz2
	mirror://gentoo/${MY_P}-patches-${PATCH_VER}.tar.xz
	https://dev.gentoo.org/~dilfridge/distfiles/${MY_P}-patches-${PATCH_VER}.tar.xz
	https://github.com/arsv/perl-cross/releases/download/${CROSS_VER}/perl-cross-${CROSS_VER}.tar.gz
"
HOMEPAGE="http://www.perl.org/"



	src_prepare_update_patchlevel_h

	if tc-is-cross-compiler; then
		cp -a ../perl-cross-${CROSS_VER}/* . || die
		touch cpan/CPANPLUS/lib/CPANPLUS.pm || die

		sed -i \
			-e 's/(15 + $CLEANUP)/(13 + $CLEANUP)/' \
			cnf/diffs/perl5-${PV}/makemaker-test.patch || die

		sed -i \
			-e 's/MakeMaker\.pm .*/MakeMaker.pm effd272b3c9224af6fd0f6cae7183f33ec4b1106/' \
			-e 's/MM_Unix\.pm .*/MM_Unix.pm 648f834524bcdef67c3b6bae28e8c1ef443d0fc1/' \
			cnf/diffs/perl5-${PV}/customized.patch || die
	fi

	if ! tc-is-static-only ; then
		ln -s ${LIBPERL} libperl$(get_libname ${SHORT_PV}) || die
		ln -s ${LIBPERL} libperl$(get_libname ) || die
	fi

	if use gdbm; then
		sed -i "s:INC => .*:INC => \"-I${EROOT}usr/include/gdbm\":g" \
			ext/NDBM_File/Makefile.PL || die
	fi

	default
}


	use sparc && myconf -Ud_longdbl

	export BUILD_BZIP2=0
	export BZIP2_INCLUDE=${EROOT}/usr/include
	export BZIP2_LIB=${EROOT}/usr/$(get_libdir)

	export BUILD_ZLIB=False
	export ZLIB_INCLUDE=${EROOT}/usr/include
	export ZLIB_LIB=${EROOT}/usr/$(get_libdir)

	# allow either gdbm to provide ndbm (in <gdbm/ndbm.h>) or db1
	myndbm='U'

	# allow fiddling via EXTRA_ECONF, bug 558070
	eval "local -a EXTRA_ECONF=(${EXTRA_ECONF})"

	myconf \
		-des \
		-Duseshrplib \
		-Darchname="${myarch}" \
		-Dcc="$(tc-getCC)" \
		-Doptimize="${CFLAGS}" \
		-Dldflags="${LDFLAGS}" \
		-Dprefix="${EPREFIX}"'/usr' \
		-Dinstallprefix="${EPREFIX}"'/usr' \
		-Dsiteprefix="${EPREFIX}"'/usr/local' \
		-Dvendorprefix="${EPREFIX}"'/usr' \
		-Dscriptdir="${EPREFIX}"'/usr/bin' \

		-Dcf_by='Gentoo' \
		-Dmyhostname='localhost' \
		-Dperladmin='root@localhost' \
		-Dinstallusrbinperl='n' \
		-Ud_csh \
		-Dsh="${EPREFIX}"/bin/sh \
		-Dtargetsh="${EPREFIX}"/bin/sh \
		-Uusenm \
		"${myconf[@]}" \
		"${EXTRA_ECONF[@]}"

	if tc-is-cross-compiler; then
		./configure \
			--target="${CHOST}" \
			-Dinstallprefix='' \
			-Dinstallusrbinperl='undef' \
			-Dusevendorprefix='define' \
			"${myconf[@]}" \
			|| die "Unable to configure"
	else
		sh Configure \
			-des \
			-Dinstallprefix="${EPREFIX}"'/usr' \
			-Dinstallusrbinperl='n' \
			"${myconf[@]}" \
			|| die "Unable to configure"
	fi
}

src_test() {

Return to bug 134650

Lines 7-12 EAPI=6 Link Here

(-)a/dev-lang/perl/perl-5.24.0-r1.ebuild (-9 / +44 lines)
7	inherit eutils alternatives flag-o-matic toolchain-funcs multilib multiprocessing	7	inherit eutils alternatives flag-o-matic toolchain-funcs multilib multiprocessing
8		8
9	PATCH_VER=2	9	PATCH_VER=2
		10	CROSS_VER=1.1.1
10		11
11	PERL_OLDVERSEN=""	12	PERL_OLDVERSEN=""
12	MODULE_AUTHOR=RJBS	13	MODULE_AUTHOR=RJBS
Lines 22-27 SRC_URI=" Link Here
22	mirror://cpan/authors/id/${MODULE_AUTHOR:0:1}/${MODULE_AUTHOR:0:2}/${MODULE_AUTHOR}/${MY_P}.tar.bz2	23	mirror://cpan/authors/id/${MODULE_AUTHOR:0:1}/${MODULE_AUTHOR:0:2}/${MODULE_AUTHOR}/${MY_P}.tar.bz2
23	mirror://gentoo/${MY_P}-patches-${PATCH_VER}.tar.xz	24	mirror://gentoo/${MY_P}-patches-${PATCH_VER}.tar.xz
24	https://dev.gentoo.org/~dilfridge/distfiles/${MY_P}-patches-${PATCH_VER}.tar.xz	25	https://dev.gentoo.org/~dilfridge/distfiles/${MY_P}-patches-${PATCH_VER}.tar.xz
		26	https://github.com/arsv/perl-cross/releases/download/${CROSS_VER}/perl-cross-${CROSS_VER}.tar.gz
25	"	27	"
26	HOMEPAGE="http://www.perl.org/"	28	HOMEPAGE="http://www.perl.org/"
27		29
Lines 265-275 src_prepare() { Link Here
265		267
266	src_prepare_update_patchlevel_h	268	src_prepare_update_patchlevel_h
267		269
		270	if tc-is-cross-compiler; then
		271	cp -a ../perl-cross-${CROSS_VER}/* . \|\| die
		272	touch cpan/CPANPLUS/lib/CPANPLUS.pm \|\| die
		273
		274	sed -i \
		275	-e 's/(15 + $CLEANUP)/(13 + $CLEANUP)/' \
		276	cnf/diffs/perl5-${PV}/makemaker-test.patch \|\| die
		277
		278	sed -i \
		279	-e 's/MakeMaker\.pm .*/MakeMaker.pm effd272b3c9224af6fd0f6cae7183f33ec4b1106/' \
		280	-e 's/MM_Unix\.pm .*/MM_Unix.pm 648f834524bcdef67c3b6bae28e8c1ef443d0fc1/' \
		281	cnf/diffs/perl5-${PV}/customized.patch \|\| die
		282	fi
		283
268	if ! tc-is-static-only ; then	284	if ! tc-is-static-only ; then
269	ln -s ${LIBPERL} libperl$(get_libname ${SHORT_PV}) \|\| die	285	ln -s ${LIBPERL} libperl$(get_libname ${SHORT_PV}) \|\| die
270	ln -s ${LIBPERL} libperl$(get_libname ) \|\| die	286	ln -s ${LIBPERL} libperl$(get_libname ) \|\| die
271	fi	287	fi
272		288
		289	if use gdbm; then
		290	sed -i "s:INC => .*:INC => \"-I${EROOT}usr/include/gdbm\":g" \
		291	ext/NDBM_File/Makefile.PL \|\| die
		292	fi
		293
273	default	294	default
274	}	295	}
275		296
Lines 302-313 src_configure() { Link Here
302	use sparc && myconf -Ud_longdbl	323	use sparc && myconf -Ud_longdbl
303		324
304	export BUILD_BZIP2=0	325	export BUILD_BZIP2=0
305	export BZIP2_INCLUDE=${EPREFIX}/usr/include	326	export BZIP2_INCLUDE=${EROOT}/usr/include
306	export BZIP2_LIB=${EPREFIX}/usr/$(get_libdir)	327	export BZIP2_LIB=${EROOT}/usr/$(get_libdir)
307		328
308	export BUILD_ZLIB=False	329	export BUILD_ZLIB=False
309	export ZLIB_INCLUDE=${EPREFIX}/usr/include	330	export ZLIB_INCLUDE=${EROOT}/usr/include
310	export ZLIB_LIB=${EPREFIX}/usr/$(get_libdir)	331	export ZLIB_LIB=${EROOT}/usr/$(get_libdir)
311		332
312	# allow either gdbm to provide ndbm (in <gdbm/ndbm.h>) or db1	333	# allow either gdbm to provide ndbm (in <gdbm/ndbm.h>) or db1
313	myndbm='U'	334	myndbm='U'
Lines 384-398 src_configure() { Link Here
384	# allow fiddling via EXTRA_ECONF, bug 558070	405	# allow fiddling via EXTRA_ECONF, bug 558070
385	eval "local -a EXTRA_ECONF=(${EXTRA_ECONF})"	406	eval "local -a EXTRA_ECONF=(${EXTRA_ECONF})"
386		407
387	sh Configure \	408	myconf \
388	-des \
389	-Duseshrplib \	409	-Duseshrplib \
390	-Darchname="${myarch}" \	410	-Darchname="${myarch}" \
391	-Dcc="$(tc-getCC)" \	411	-Dcc="$(tc-getCC)" \
392	-Doptimize="${CFLAGS}" \	412	-Doptimize="${CFLAGS}" \
393	-Dldflags="${LDFLAGS}" \	413	-Dldflags="${LDFLAGS}" \
394	-Dprefix="${EPREFIX}"'/usr' \	414	-Dprefix="${EPREFIX}"'/usr' \
395	-Dinstallprefix="${EPREFIX}"'/usr' \
396	-Dsiteprefix="${EPREFIX}"'/usr/local' \	415	-Dsiteprefix="${EPREFIX}"'/usr/local' \
397	-Dvendorprefix="${EPREFIX}"'/usr' \	416	-Dvendorprefix="${EPREFIX}"'/usr' \
398	-Dscriptdir="${EPREFIX}"'/usr/bin' \	417	-Dscriptdir="${EPREFIX}"'/usr/bin' \
Lines 418-430 src_configure() { Link Here
418	-Dcf_by='Gentoo' \	437	-Dcf_by='Gentoo' \
419	-Dmyhostname='localhost' \	438	-Dmyhostname='localhost' \
420	-Dperladmin='root@localhost' \	439	-Dperladmin='root@localhost' \
421	-Dinstallusrbinperl='n' \
422	-Ud_csh \	440	-Ud_csh \
423	-Dsh="${EPREFIX}"/bin/sh \	441	-Dsh="${EPREFIX}"/bin/sh \
424	-Dtargetsh="${EPREFIX}"/bin/sh \	442	-Dtargetsh="${EPREFIX}"/bin/sh \
425	-Uusenm \	443	-Uusenm \
426	"${myconf[@]}" \	444	"${myconf[@]}" \
427	"${EXTRA_ECONF[@]}" \|\| die "Unable to configure"	445	"${EXTRA_ECONF[@]}"
		446
		447	if tc-is-cross-compiler; then
		448	./configure \
		449	--target="${CHOST}" \
		450	-Dinstallprefix='' \
		451	-Dinstallusrbinperl='undef' \
		452	-Dusevendorprefix='define' \
		453	"${myconf[@]}" \
		454	\|\| die "Unable to configure"
		455	else
		456	sh Configure \
		457	-des \
		458	-Dinstallprefix="${EPREFIX}"'/usr' \
		459	-Dinstallusrbinperl='n' \
		460	"${myconf[@]}" \
		461	\|\| die "Unable to configure"
		462	fi
428	}	463	}
429		464
430	src_test() {	465	src_test() {