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

Collapse All | Expand All

(-)glibc-2.14.ebuild (-1 / +1 lines)
Lines 39-45 LT_VER="" Link Here
39
NPTL_KERN_VER=${NPTL_KERN_VER:-"2.6.9"}        # min kernel version nptl requires
39
NPTL_KERN_VER=${NPTL_KERN_VER:-"2.6.9"}        # min kernel version nptl requires
40
#LT_KERN_VER=${LT_KERN_VER:-"2.4.1"}           # min kernel version linuxthreads requires
40
#LT_KERN_VER=${LT_KERN_VER:-"2.4.1"}           # min kernel version linuxthreads requires
41
41
42
IUSE="debug gd glibc-omitfp hardened multilib nls selinux profile vanilla crosscompile_opts_headers-only ${LT_VER:+glibc-compat20 nptl nptlonly}"
42
IUSE="compile-locales debug gd glibc-omitfp hardened multilib nls profile selinux vanilla crosscompile_opts_headers-only ${LT_VER:+glibc-compat20 nptl nptlonly}"
43
[[ -n ${RELEASE_VER} ]] && S=${WORKDIR}/glibc-${RELEASE_VER}${SNAP_VER:+-${SNAP_VER}}
43
[[ -n ${RELEASE_VER} ]] && S=${WORKDIR}/glibc-${RELEASE_VER}${SNAP_VER:+-${SNAP_VER}}
44
44
45
# Here's how the cross-compile logic breaks down ...
45
# Here's how the cross-compile logic breaks down ...
(-)metadata.xml (-2 / +5 lines)
Lines 3-10 Link Here
3
<pkgmetadata>
3
<pkgmetadata>
4
<herd>toolchain</herd>
4
<herd>toolchain</herd>
5
<use>
5
<use>
6
	<flag name='glibc-omitfp'>Configure glibc with --enable-omitfp which lets
6
	<flag name='compile-locales'>build *all* locales in src_install; this
7
		the build system determine when it is safe to use
7
		is generally meant for stage building only as it ignores the user's
8
		/etc/locale.gen file and can be pretty slow</flag>
9
	<flag name='glibc-omitfp'>Configure glibc with --enable-omitfp which
10
		lets the build system determine when it is safe to use
8
		-fomit-frame-pointer</flag>
11
		-fomit-frame-pointer</flag>
9
</use>
12
</use>
10
</pkgmetadata>
13
</pkgmetadata>
(-)files/eblits/common.eblit (+14 lines)
Lines 287-292 setup_env() { Link Here
287
	export __GLIBC_CC CC="${__GLIBC_CC} ${!VAR}"
287
	export __GLIBC_CC CC="${__GLIBC_CC} ${!VAR}"
288
}
288
}
289
289
290
run_locale_gen() {
291
	# if the host locales.gen contains no entries, we'll install everything
292
	local root="$1"
293
	local locale_list="${root}/etc/locale.gen"
294
	if [[ -z $(locale-gen --list --config "${locale_list}") ]] ; then
295
		ewarn "Generating all locales; edit /etc/locale.gen to save time/space"
296
		locale_list="${root}/usr/share/i18n/SUPPORTED"
297
	fi
298
299
	local x jobs
300
	for x in ${MAKEOPTS} ; do [[ ${x} == -j* ]] && jobs=${x#-j} ; done
301
	locale-gen -j ${jobs:-1} --config "${locale_list}"
302
}
303
290
just_headers() {
304
just_headers() {
291
	is_crosscompile && use crosscompile_opts_headers-only
305
	is_crosscompile && use crosscompile_opts_headers-only
292
}
306
}
(-)files/eblits/pkg_postinst.eblit (-9 / +1 lines)
Lines 16-29 eblit-glibc-pkg_postinst() { Link Here
16
		# errors from this step #253697
16
		# errors from this step #253697
17
		/sbin/telinit U 2>/dev/null
17
		/sbin/telinit U 2>/dev/null
18
18
19
		# if the host locales.gen contains no entries, we'll install everything
19
		use compile-locales || run_locale_gen "${ROOT}"
20
		local locale_list="${ROOT}etc/locale.gen"
21
		if [[ -z $(locale-gen --list --config "${locale_list}") ]] ; then
22
			ewarn "Generating all locales; edit /etc/locale.gen to save time/space"
23
			locale_list="${ROOT}usr/share/i18n/SUPPORTED"
24
		fi
25
		local x jobs
26
		for x in ${MAKEOPTS} ; do [[ ${x} == -j* ]] && jobs=${x#-j} ; done
27
		locale-gen -j ${jobs:-1} --config "${locale_list}"
28
	fi
20
	fi
29
}
21
}
(-)files/eblits/src_install.eblit (+5 lines)
Lines 170-175 toolchain-glibc_src_install() { Link Here
170
	# Prevent overwriting of the /etc/localtime symlink.  We'll handle the
170
	# Prevent overwriting of the /etc/localtime symlink.  We'll handle the
171
	# creation of the "factory" symlink in pkg_postinst().
171
	# creation of the "factory" symlink in pkg_postinst().
172
	rm -f "${D}"/etc/localtime
172
	rm -f "${D}"/etc/localtime
173
174
	# Generate all locales if this is a native build as locale generation
175
	if use compile-locales && ! is_crosscompile ; then
176
		run_locale_gen "${D}"
177
	fi
173
}
178
}
174
179
175
toolchain-glibc_headers_install() {
180
toolchain-glibc_headers_install() {

Return to bug 146882