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

Collapse All | Expand All

(-)a/dev-lang/perl/Manifest (+1 lines)
Lines 10-12 DIST perl-5.22.2.tar.bz2 13717881 SHA256 f2322b9b04fe0cdbca9fe755360da04892cb648 Link Here
10
DIST perl-5.24.0-patches-1.tar.xz 17320 SHA256 7be09434e7d73f47be3d1d9f6e6f72f5e705a7b5cfbef07ee9b8b53b2a08ef14 SHA512 430c06d6298cbd5eb8b7db9947ca288fcd747e19652285278ac2a84c90cdf756463505c50e7bd97fbd98bb45119dc898d94c4fb7af50bb57d9c2b959cba0d944 WHIRLPOOL b1f3cf64af35cb9364563ede25d700ff6b0ebaa93f978b7d65a2085498cce0d20d527e00e0a2b17a3d7dc9ef81d85e68985ec0ec00560e9696a8eb3ee61f0383
10
DIST perl-5.24.0-patches-1.tar.xz 17320 SHA256 7be09434e7d73f47be3d1d9f6e6f72f5e705a7b5cfbef07ee9b8b53b2a08ef14 SHA512 430c06d6298cbd5eb8b7db9947ca288fcd747e19652285278ac2a84c90cdf756463505c50e7bd97fbd98bb45119dc898d94c4fb7af50bb57d9c2b959cba0d944 WHIRLPOOL b1f3cf64af35cb9364563ede25d700ff6b0ebaa93f978b7d65a2085498cce0d20d527e00e0a2b17a3d7dc9ef81d85e68985ec0ec00560e9696a8eb3ee61f0383
11
DIST perl-5.24.0-patches-2.tar.xz 17760 SHA256 8f9ce8895b85d6195cfa10690a28a9b8dbac683cb159ed3f3103e7b5f2bbf18d SHA512 1159dd53d40641f71c301e4be95c8964e6787cdc446578e66e8c97238fc99558c98b1fbc9e89b2d38206364e598ff1544ca1291c14a422d95089f0eea8926cc2 WHIRLPOOL e18ecf63532609dc36c7252f03a1a4d28529b9804dbb9c0d70cc1418a243ff9168a621cadeee52f69919a70312c83232c0857f907f991886cfae870ed4590286
11
DIST perl-5.24.0-patches-2.tar.xz 17760 SHA256 8f9ce8895b85d6195cfa10690a28a9b8dbac683cb159ed3f3103e7b5f2bbf18d SHA512 1159dd53d40641f71c301e4be95c8964e6787cdc446578e66e8c97238fc99558c98b1fbc9e89b2d38206364e598ff1544ca1291c14a422d95089f0eea8926cc2 WHIRLPOOL e18ecf63532609dc36c7252f03a1a4d28529b9804dbb9c0d70cc1418a243ff9168a621cadeee52f69919a70312c83232c0857f907f991886cfae870ed4590286
12
DIST perl-5.24.0.tar.bz2 14155784 SHA256 62328a53d157e8153b33e137594155f6f8b64418f7f9238210feb809585290e0 SHA512 05ecc6774da475d14f426a850be7adf754fcb17a2fa85a67aeaf8ddb9c86ae8b1ee654e803ebae5ccdaa73ad3e35188e3254ac9452b47cd4f8ffe47e67d15f53 WHIRLPOOL 84c98ddb19a5c6d32f40b427ba1f82656f88cfe5b7d3f416fb92579436890af52299f05301a81692dfdae65594b1866081e1fee067623256d796855d87d532ad
12
DIST perl-5.24.0.tar.bz2 14155784 SHA256 62328a53d157e8153b33e137594155f6f8b64418f7f9238210feb809585290e0 SHA512 05ecc6774da475d14f426a850be7adf754fcb17a2fa85a67aeaf8ddb9c86ae8b1ee654e803ebae5ccdaa73ad3e35188e3254ac9452b47cd4f8ffe47e67d15f53 WHIRLPOOL 84c98ddb19a5c6d32f40b427ba1f82656f88cfe5b7d3f416fb92579436890af52299f05301a81692dfdae65594b1866081e1fee067623256d796855d87d532ad
13
DIST perl-cross-1.1.0.tar.gz 81414 SHA256 d02e1f60076307655ace2c63fe38832e6d81d6195af84a98221e1c617c6c733d SHA512 4c0f9dafd4d62d5215ffaced4f8fefa3cdfe5eefe30805a5e83311200ff0bb3a40076b5a784270da40f2650f6c5623e6bc829acead1ee83c43698ff2894768c2 WHIRLPOOL 35615a210a1e3c50f936b4655038c550544c1aa66fabb54ceffe1549fa9adf5919a910bda13143b5bf82ba7c3169de21a432e8248a94f11526dde9f37166261f
(-)a/dev-lang/perl/perl-5.24.0-r1.ebuild (-9 / +36 lines)
Lines 7-12 EAPI=6 Link Here
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.0
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
		sed -i 's/MakeMaker\.pm .*/MakeMaker.pm effd272b3c9224af6fd0f6cae7183f33ec4b1106/' cnf/diffs/perl5-${PV}/liblist.patch || die
274
	fi
275
268
	if ! tc-is-static-only ; then
276
	if ! tc-is-static-only ; then
269
		ln -s ${LIBPERL} libperl$(get_libname ${SHORT_PV}) || die
277
		ln -s ${LIBPERL} libperl$(get_libname ${SHORT_PV}) || die
270
		ln -s ${LIBPERL} libperl$(get_libname ) || die
278
		ln -s ${LIBPERL} libperl$(get_libname ) || die
271
	fi
279
	fi
272
280
281
	if use gdbm; then
282
		sed -i "s:INC => .*:INC => \"-I${EROOT}usr/include/gdbm\":g" \
283
			ext/NDBM_File/Makefile.PL || die
284
	fi
285
273
	default
286
	default
274
}
287
}
275
288
Lines 302-313 src_configure() { Link Here
302
	use sparc && myconf -Ud_longdbl
315
	use sparc && myconf -Ud_longdbl
303
316
304
	export BUILD_BZIP2=0
317
	export BUILD_BZIP2=0
305
	export BZIP2_INCLUDE=${EPREFIX}/usr/include
318
	export BZIP2_INCLUDE=${EROOT}/usr/include
306
	export BZIP2_LIB=${EPREFIX}/usr/$(get_libdir)
319
	export BZIP2_LIB=${EROOT}/usr/$(get_libdir)
307
320
308
	export BUILD_ZLIB=False
321
	export BUILD_ZLIB=False
309
	export ZLIB_INCLUDE=${EPREFIX}/usr/include
322
	export ZLIB_INCLUDE=${EROOT}/usr/include
310
	export ZLIB_LIB=${EPREFIX}/usr/$(get_libdir)
323
	export ZLIB_LIB=${EROOT}/usr/$(get_libdir)
311
324
312
	# allow either gdbm to provide ndbm (in <gdbm/ndbm.h>) or db1
325
	# allow either gdbm to provide ndbm (in <gdbm/ndbm.h>) or db1
313
	myndbm='U'
326
	myndbm='U'
Lines 384-398 src_configure() { Link Here
384
	# allow fiddling via EXTRA_ECONF, bug 558070
397
	# allow fiddling via EXTRA_ECONF, bug 558070
385
	eval "local -a EXTRA_ECONF=(${EXTRA_ECONF})"
398
	eval "local -a EXTRA_ECONF=(${EXTRA_ECONF})"
386
399
387
	sh Configure \
400
	myconf \
388
		-des \
389
		-Duseshrplib \
401
		-Duseshrplib \
390
		-Darchname="${myarch}" \
402
		-Darchname="${myarch}" \
391
		-Dcc="$(tc-getCC)" \
403
		-Dcc="$(tc-getCC)" \
392
		-Doptimize="${CFLAGS}" \
404
		-Doptimize="${CFLAGS}" \
393
		-Dldflags="${LDFLAGS}" \
405
		-Dldflags="${LDFLAGS}" \
394
		-Dprefix="${EPREFIX}"'/usr' \
406
		-Dprefix="${EPREFIX}"'/usr' \
395
		-Dinstallprefix="${EPREFIX}"'/usr' \
396
		-Dsiteprefix="${EPREFIX}"'/usr/local' \
407
		-Dsiteprefix="${EPREFIX}"'/usr/local' \
397
		-Dvendorprefix="${EPREFIX}"'/usr' \
408
		-Dvendorprefix="${EPREFIX}"'/usr' \
398
		-Dscriptdir="${EPREFIX}"'/usr/bin' \
409
		-Dscriptdir="${EPREFIX}"'/usr/bin' \
Lines 418-430 src_configure() { Link Here
418
		-Dcf_by='Gentoo' \
429
		-Dcf_by='Gentoo' \
419
		-Dmyhostname='localhost' \
430
		-Dmyhostname='localhost' \
420
		-Dperladmin='root@localhost' \
431
		-Dperladmin='root@localhost' \
421
		-Dinstallusrbinperl='n' \
422
		-Ud_csh \
432
		-Ud_csh \
423
		-Dsh="${EPREFIX}"/bin/sh \
433
		-Dsh="${EPREFIX}"/bin/sh \
424
		-Dtargetsh="${EPREFIX}"/bin/sh \
434
		-Dtargetsh="${EPREFIX}"/bin/sh \
425
		-Uusenm \
435
		-Uusenm \
426
		"${myconf[@]}" \
436
		"${myconf[@]}" \
427
		"${EXTRA_ECONF[@]}" || die "Unable to configure"
437
		"${EXTRA_ECONF[@]}"
438
439
	if tc-is-cross-compiler; then
440
		./configure \
441
			--target="${CHOST}" \
442
			-Dinstallprefix='' \
443
			-Dinstallusrbinperl='undef' \
444
			-Dusevendorprefix='define' \
445
			"${myconf[@]}" \
446
			|| die "Unable to configure"
447
	else
448
		sh Configure \
449
			-des \
450
			-Dinstallprefix="${EPREFIX}"'/usr' \
451
			-Dinstallusrbinperl='n' \
452
			"${myconf[@]}" \
453
			|| die "Unable to configure"
454
	fi
428
}
455
}
429
456
430
src_test() {
457
src_test() {

Return to bug 134650