Attachment #383286 for bug #134650

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

and this patch

Lines 7-12 Link Here

(-)perl-5.18.2-r1.ebuild.orig (+2 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="0.8.5"
10		11
11	PERL_OLDVERSEN="5.18.0 5.18.1"	12	PERL_OLDVERSEN="5.18.0 5.18.1"
12	MODULE_AUTHOR=RJBS	13	MODULE_AUTHOR=RJBS
Lines 22-27 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.bz2	24	mirror://gentoo/${MY_P}-patches-${PATCH_VER}.tar.bz2
24	http://dev.gentoo.org/~civil/distfiles/${CATEGORY}/${PN}/${MY_P}-patches-${PATCH_VER}.tar.bz2	25	http://dev.gentoo.org/~civil/distfiles/${CATEGORY}/${PN}/${MY_P}-patches-${PATCH_VER}.tar.bz2
		26	https://raw.github.com/arsv/${PN}-cross/releases/${P}-cross-${CROSS_VER}.tar.gz
25	"	27	"
26	HOMEPAGE="http://www.perl.org/"	28	HOMEPAGE="http://www.perl.org/"
27		29

Lines 66-70 Link Here

(-)files/eblits/src_prepare-v50160001.eblit.orig (-1 / +5 lines)
66	ln -s ${LIBPERL} libperl$(get_libname ${SHORT_PV}) \|\| die	66	ln -s ${LIBPERL} libperl$(get_libname ${SHORT_PV}) \|\| die
67	ln -s ${LIBPERL} libperl$(get_libname ) \|\| die	67	ln -s ${LIBPERL} libperl$(get_libname ) \|\| die
68	fi	68	fi
69	}
70		69
		70	if use gdbm; then
		71	sed -i "s:INC => .*:INC => \"-I${EROOT}usr/include/gdbm\":g" \
		72	ext/NDBM_File/Makefile.PL \|\| die
		73	fi
		74	}




	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



	myconf -Dnoextensions="${disabled_extensions}"

	set -- \
		-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 \
		-Uusenm \
		"${myconf[@]}"

	if tc-is-cross-compiler; then
		MAKEOPTS+=" -j1"

		set -- \
		./configure \
			--target="${CHOST}" \
			-Dinstallprefix='' \
			-Dinstallusrbinperl='undef' \
			-Dusevendorprefix='define' \
			"${@}"
	else
		set -- \
		sh Configure \
			-des \
			-Dinstallprefix="${EPREFIX}"'/usr' \
			-Dinstallusrbinperl='n' \
			"${@}"
	fi

	printf '%q ' "${@}"; echo
	"${@}" || die "Unable to configure"
}

Return to bug 134650

Lines 27-38 Link Here

(-)files/eblits/src_configure-v50180002.eblit.orig (-9 / +28 lines)
27	use sparc && myconf -Ud_longdbl	27	use sparc && myconf -Ud_longdbl
28		28
29	export BUILD_BZIP2=0	29	export BUILD_BZIP2=0
30	export BZIP2_INCLUDE=${EPREFIX}/usr/include	30	export BZIP2_INCLUDE=${EROOT}usr/include
31	export BZIP2_LIB=${EPREFIX}/usr/$(get_libdir)	31	export BZIP2_LIB=${EROOT}usr/$(get_libdir)
32		32
33	export BUILD_ZLIB=False	33	export BUILD_ZLIB=False
34	export ZLIB_INCLUDE=${EPREFIX}/usr/include	34	export ZLIB_INCLUDE=${EROOT}usr/include
35	export ZLIB_LIB=${EPREFIX}/usr/$(get_libdir)	35	export ZLIB_LIB=${EROOT}usr/$(get_libdir)
36		36
37	# allow either gdbm to provide ndbm (in <gdbm/ndbm.h>) or db1	37	# allow either gdbm to provide ndbm (in <gdbm/ndbm.h>) or db1
38		38
Lines 102-116 Link Here
102		102
103	myconf -Dnoextensions="${disabled_extensions}"	103	myconf -Dnoextensions="${disabled_extensions}"
104		104
105	sh Configure \	105	set -- \
106	-des \
107	-Duseshrplib \	106	-Duseshrplib \
108	-Darchname="${myarch}" \	107	-Darchname="${myarch}" \
109	-Dcc="$(tc-getCC)" \	108	-Dcc="$(tc-getCC)" \
110	-Doptimize="${CFLAGS}" \	109	-Doptimize="${CFLAGS}" \
111	-Dldflags="${LDFLAGS}" \	110	-Dldflags="${LDFLAGS}" \
112	-Dprefix="${EPREFIX}"'/usr' \	111	-Dprefix="${EPREFIX}"'/usr' \
113	-Dinstallprefix="${EPREFIX}"'/usr' \
114	-Dsiteprefix="${EPREFIX}"'/usr/local' \	112	-Dsiteprefix="${EPREFIX}"'/usr/local' \
115	-Dvendorprefix="${EPREFIX}"'/usr' \	113	-Dvendorprefix="${EPREFIX}"'/usr' \
116	-Dscriptdir="${EPREFIX}"'/usr/bin' \	114	-Dscriptdir="${EPREFIX}"'/usr/bin' \
Lines 136-143 Link Here
136	-Dcf_by='Gentoo' \	134	-Dcf_by='Gentoo' \
137	-Dmyhostname='localhost' \	135	-Dmyhostname='localhost' \
138	-Dperladmin='root@localhost' \	136	-Dperladmin='root@localhost' \
139	-Dinstallusrbinperl='n' \
140	-Ud_csh \	137	-Ud_csh \
141	-Uusenm \	138	-Uusenm \
142	"${myconf[@]}" \|\| die "Unable to configure"	139	"${myconf[@]}"
		140
		141	if tc-is-cross-compiler; then
		142	MAKEOPTS+=" -j1"
		143
		144	set -- \
		145	./configure \
		146	--target="${CHOST}" \
		147	-Dinstallprefix='' \
		148	-Dinstallusrbinperl='undef' \
		149	-Dusevendorprefix='define' \
		150	"${@}"
		151	else
		152	set -- \
		153	sh Configure \
		154	-des \
		155	-Dinstallprefix="${EPREFIX}"'/usr' \
		156	-Dinstallusrbinperl='n' \
		157	"${@}"
		158	fi
		159
		160	printf '%q ' "${@}"; echo
		161	"${@}" \|\| die "Unable to configure"
143	}	162	}