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

(-)file_not_specified_in_diff (-9 / +24 lines)
Line  Link Here
0
-- perl-5.16.3.ebuild
0
++ perl-5.16.3.ebuild
Lines 7-12 EAPI=5 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=1
9
PATCH_VER=1
10
CROSS_VER="0.7.4"
10
11
11
PERL_OLDVERSEN="5.16.2 5.16.1 5.16.0"
12
PERL_OLDVERSEN="5.16.2 5.16.1 5.16.0"
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}-${PATCH_VER}.tar.bz2
24
	mirror://gentoo/${MY_P}-${PATCH_VER}.tar.bz2
24
	http://dev.gentoo.org/~tove/distfiles/${CATEGORY}/${PN}/${MY_P}-${PATCH_VER}.tar.bz2
25
	http://dev.gentoo.org/~tove/distfiles/${CATEGORY}/${PN}/${MY_P}-${PATCH_VER}.tar.bz2
26
	${CROSS_VER:+mirror://berlios/perlcross/${P}-cross-${CROSS_VER}.tar.gz}
25
"
27
"
26
HOMEPAGE="http://www.perl.org/"
28
HOMEPAGE="http://www.perl.org/"
27
29
28
-- files/eblits/src_configure-v50160001.eblit
30
++ files/eblits/src_configure-v50160001.eblit
Lines 51-57 eblit-perl-src_configure() { Link Here
51
51
52
	myconf "-${myndbm}i_ndbm" "-${mygdbm}i_gdbm" "-${mydb}i_db"
52
	myconf "-${myndbm}i_ndbm" "-${mygdbm}i_gdbm" "-${mydb}i_db"
53
53
54
	if use alpha && [[ "$(tc-getCC)" = "ccc" ]] ; then
54
	tc-export CC
55
56
	if use alpha && [[ "${CC}" == "ccc" ]] ; then
55
		ewarn "Perl will not be built with berkdb support, use gcc if you needed it..."
57
		ewarn "Perl will not be built with berkdb support, use gcc if you needed it..."
56
		myconf -Ui_db -Ui_ndbm
58
		myconf -Ui_db -Ui_ndbm
57
	fi
59
	fi
Lines 83-89 eblit-perl-src_configure() { Link Here
83
		echo "int main() {}" > "${T}"/t.c
85
		echo "int main() {}" > "${T}"/t.c
84
		# need to ensure dirs contain compatible libs,
86
		# need to ensure dirs contain compatible libs,
85
		# bugs #358875, #400839, use scanelf for #425538
87
		# bugs #358875, #400839, use scanelf for #425538
86
		$(tc-getCC) -o "${T}"/t "${T}"/t.c > /dev/null || die
88
		${CC} -o "${T}"/t "${T}"/t.c > /dev/null || die
87
		local scantool=scanelf
89
		local scantool=scanelf
88
		[[ ${CHOST} == *-darwin* ]] && scantool=scanmacho
90
		[[ ${CHOST} == *-darwin* ]] && scantool=scanmacho
89
		local mtype=$(${scantool} -BF "%M%D#f" "${T}"/t)
91
		local mtype=$(${scantool} -BF "%M%D#f" "${T}"/t)
Lines 104-114 eblit-perl-src_configure() { Link Here
104
	# don't try building ODBM, bug #354453
106
	# don't try building ODBM, bug #354453
105
	myconf -Dnoextensions=ODBM_File
107
	myconf -Dnoextensions=ODBM_File
106
108
107
	sh Configure \
109
	set -- \
108
		-des \
109
		-Duseshrplib \
110
		-Duseshrplib \
110
		-Darchname="${myarch}" \
111
		-Darchname="${myarch}" \
111
		-Dcc="$(tc-getCC)" \
112
		-Dcc="${CC}" \
112
		-Doptimize="${CFLAGS}" \
113
		-Doptimize="${CFLAGS}" \
113
		-Dldflags="${LDFLAGS}" \
114
		-Dldflags="${LDFLAGS}" \
114
		-Dprefix="${EPREFIX}"'/usr' \
115
		-Dprefix="${EPREFIX}"'/usr' \
Lines 138-145 eblit-perl-src_configure() { Link Here
138
		-Dcf_by='Gentoo' \
139
		-Dcf_by='Gentoo' \
139
		-Dmyhostname='localhost' \
140
		-Dmyhostname='localhost' \
140
		-Dperladmin='root@localhost' \
141
		-Dperladmin='root@localhost' \
141
		-Dinstallusrbinperl='n' \
142
		-Dinstallusrbinperl='undef' \
142
		-Ud_csh \
143
		-Ud_csh \
143
		-Uusenm \
144
		-Uusenm \
144
		"${myconf[@]}" || die "Unable to configure"
145
		"${myconf[@]}"
146
	if tc-is-cross-compiler ; then
147
		set -- \
148
		./configure \
149
			--target=${CHOST} \
150
			--sysroot="${SYSROOT:-$(${CC} -print-sysroot)}" \
151
			 "$@"
152
		MAKEOPTS+=" -j1"
153
	else
154
		set -- sh Configure -des "$@"
155
	fi
156
	printf '%q ' "$@"; echo
157
	"$@" || die
145
}
158
}

Return to bug 134650