Attachment #435510 for bug #473728

Lines 27-35 Link Here

(-)eblits.old/common.eblit (-2 / +2 lines)
27	}	27	}
28	alt_build_headers() {	28	alt_build_headers() {
29	if [[ -z ${ALT_BUILD_HEADERS} ]] ; then	29	if [[ -z ${ALT_BUILD_HEADERS} ]] ; then
30	ALT_BUILD_HEADERS=$(alt_headers)	30	ALT_BUILD_HEADERS="${EPREFIX}$(alt_headers)"
31	if tc-is-cross-compiler ; then	31	if tc-is-cross-compiler ; then
32	ALT_BUILD_HEADERS=${SYSROOT}$(alt_headers)	32	ALT_BUILD_HEADERS="${SYSROOT}${EPREFIX}$(alt_headers)"
33	if [[ ! -e ${ALT_BUILD_HEADERS}/linux/version.h ]] ; then	33	if [[ ! -e ${ALT_BUILD_HEADERS}/linux/version.h ]] ; then
34	local header_path=$(echo '#include <linux/version.h>' \| $(tc-getCPP ${CTARGET}) ${CFLAGS} 2>&1 \| grep -o '[^"]*linux/version.h')	34	local header_path=$(echo '#include <linux/version.h>' \| $(tc-getCPP ${CTARGET}) ${CFLAGS} 2>&1 \| grep -o '[^"]*linux/version.h')
35	ALT_BUILD_HEADERS=${header_path%/linux/version.h}	35	ALT_BUILD_HEADERS=${header_path%/linux/version.h}




	# nothing to do if just installing headers
	just_headers && return

	if ! tc-is-cross-compiler && [[ -x ${EROOT}/usr/sbin/iconvconfig ]] ; then
		# Generate fastloading iconv module configuration file.
		"${EROOT}"/usr/sbin/iconvconfig --prefix="${ROOT}"
	fi

	if ! is_crosscompile && [[ ${ROOT} == "/" ]] ; then

		/sbin/telinit U 2>/dev/null

		# if the host locales.gen contains no entries, we'll install everything
		local locale_list="${EROOT}etc/locale.gen"
		if [[ -z $(locale-gen --list --config "${locale_list}") ]] ; then
			ewarn "Generating all locales; edit /etc/locale.gen to save time/space"
			locale_list="${EROOT}usr/share/i18n/SUPPORTED"
		fi
		locale-gen -j $(makeopts_jobs) --config "${locale_list}"
	fi

Lines 11-17 Link Here

(-)eblits.old/pkg_preinst.eblit (-2 / +2 lines)
11	glibc_sanity_check() {	11	glibc_sanity_check() {
12	cd / #228809	12	cd / #228809
13		13
14	# We enter ${D} so to avoid trouble if the path contains	14	# We enter ${ED} so to avoid trouble if the path contains
15	# special characters; for instance if the path contains the	15	# special characters; for instance if the path contains the
16	# colon character (:), then the linker will try to split it	16	# colon character (:), then the linker will try to split it
17	# and look for the libraries in an unexpected place. This can	17	# and look for the libraries in an unexpected place. This can
Lines 53-59 Link Here
53	fi	53	fi
54		54
55	[[ ${ROOT} != "/" ]] && return 0	55	[[ ${ROOT} != "/" ]] && return 0
56	[[ -d ${D}/$(get_libdir) ]] \|\| return 0	56	[[ -d ${ED}/$(get_libdir) ]] \|\| return 0
57	glibc_sanity_check	57	glibc_sanity_check
58		58
59	# For newer EAPIs, this was run in pkg_pretend.	59	# For newer EAPIs, this was run in pkg_pretend.




		$(use_enable profile)
		$(use_with gd)
		--with-headers=$(alt_build_headers)
		--libexecdir="${EPREFIX}/usr/$(get_libdir)/misc/glibc"
		--libdir=/usr/$(get_libdir)
		--mandir=/usr/share/man
		--infodir=/usr/share/info
		--libexecdir=/usr/$(get_libdir)/misc/glibc
		--with-bugurl=http://bugs.gentoo.org/
		--with-pkgversion="$(glibc_banner)"
		$(use_multiarch || echo --disable-multi-arch)


	# There is no configure option for this and we need to export it
	# since the glibc build will re-run configure on itself
	export libc_cv_slibdir="${EPREFIX}/$(get_libdir)"

	# We take care of patching our binutils to use both hash styles,
	# and many people like to force gnu hash style only, so disable

	local builddir=$(builddir "$1")
	mkdir -p "${builddir}"
	cd "${builddir}"
	ECONF_SOURCE="${S}" econf "${myconf[@]}"
	echo "$@"
	"$@" || die "failed to configure glibc"

	# ia64 static cross-compilers are a pita in so much that they
	# can't produce static ELFs (as the libgcc.a is broken).  so

		--build=${CBUILD_OPT:-${CBUILD}}
		--host=${CTARGET_OPT:-${CTARGET}}
		--with-headers=$(alt_build_headers)
		--prefix=/usr
		${EXTRA_ECONF}
	)



	# Nothing is compiled here which would affect the headers for the target.
	# So forcing CC/CFLAGS is sane.
	set -- "${S}"/configure "${myconf[@]}"
	echo "$@"
	CC="$(tc-getBUILD_CC)" \
	CFLAGS="-O1 -pipe" \
	CPPFLAGS="-U_FORTIFY_SOURCE" \
	LDFLAGS="" \
	ECONF_SOURCE="${S}" econf "${myconf[@]}"
}

toolchain-glibc_src_configure() {

Lines 102-108 Link Here

(-)eblits.old/src_install.eblit (-2 / +2 lines)
102	has ${ldso_abi} $(get_install_abis) \|\| continue	102	has ${ldso_abi} $(get_install_abis) \|\| continue
103		103
104	ldso_name="$(alt_prefix)${ldso_abi_list[i+1]}"	104	ldso_name="$(alt_prefix)${ldso_abi_list[i+1]}"
105	if [[ ! -L ${D}/${ldso_name} && ! -e ${D}/${ldso_name} ]] ; then	105	if [[ ! -L ${ED}/${ldso_name} && ! -e ${ED}/${ldso_name} ]] ; then
106	dosym ../$(get_abi_LIBDIR ${ldso_abi})/${ldso_name##*/} ${ldso_name}	106	dosym ../$(get_abi_LIBDIR ${ldso_abi})/${ldso_name##*/} ${ldso_name}
107	fi	107	fi
108	done	108	done
Lines 111-117 Link Here
111	# binary to be setuid. This is because the default owners/perms will be	111	# binary to be setuid. This is because the default owners/perms will be
112	# exactly what we want.	112	# exactly what we want.
113	if in_iuse suid && ! use suid ; then	113	if in_iuse suid && ! use suid ; then
114	find "${D}" -name pt_chown -exec chmod -s {} +	114	find "${ED}" -name pt_chown -exec chmod -s {} +
115	fi	115	fi
116		116
117	#################################################################	117	#################################################################

Return to bug 473728

Lines 6-14 Link Here

(-)eblits.old/pkg_postinst.eblit (-4 / +4 lines)
6	# nothing to do if just installing headers	6	# nothing to do if just installing headers
7	just_headers && return	7	just_headers && return
8		8
9	if ! tc-is-cross-compiler && [[ -x ${ROOT}/usr/sbin/iconvconfig ]] ; then	9	if ! tc-is-cross-compiler && [[ -x ${EROOT}/usr/sbin/iconvconfig ]] ; then
10	# Generate fastloading iconv module configuration file.	10	# Generate fastloading iconv module configuration file.
11	"${ROOT}"/usr/sbin/iconvconfig --prefix="${ROOT}"	11	"${EROOT}"/usr/sbin/iconvconfig --prefix="${ROOT}"
12	fi	12	fi
13		13
14	if ! is_crosscompile && [[ ${ROOT} == "/" ]] ; then	14	if ! is_crosscompile && [[ ${ROOT} == "/" ]] ; then
Lines 17-26 Link Here
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	# if the host locales.gen contains no entries, we'll install everything
20	local locale_list="${ROOT}etc/locale.gen"	20	local locale_list="${EROOT}etc/locale.gen"
21	if [[ -z $(locale-gen --list --config "${locale_list}") ]] ; then	21	if [[ -z $(locale-gen --list --config "${locale_list}") ]] ; then
22	ewarn "Generating all locales; edit /etc/locale.gen to save time/space"	22	ewarn "Generating all locales; edit /etc/locale.gen to save time/space"
23	locale_list="${ROOT}usr/share/i18n/SUPPORTED"	23	locale_list="${EROOT}usr/share/i18n/SUPPORTED"
24	fi	24	fi
25	locale-gen -j $(makeopts_jobs) --config "${locale_list}"	25	locale-gen -j $(makeopts_jobs) --config "${locale_list}"
26	fi	26	fi

Lines 105-115 Link Here

(-)eblits.old/src_configure.eblit (-13 / +4 lines)
105	$(use_enable profile)	105	$(use_enable profile)
106	$(use_with gd)	106	$(use_with gd)
107	--with-headers=$(alt_build_headers)	107	--with-headers=$(alt_build_headers)
108	--prefix=/usr	108	--libexecdir="${EPREFIX}/usr/$(get_libdir)/misc/glibc"
109	--libdir=/usr/$(get_libdir)
110	--mandir=/usr/share/man
111	--infodir=/usr/share/info
112	--libexecdir=/usr/$(get_libdir)/misc/glibc
113	--with-bugurl=http://bugs.gentoo.org/	109	--with-bugurl=http://bugs.gentoo.org/
114	--with-pkgversion="$(glibc_banner)"	110	--with-pkgversion="$(glibc_banner)"
115	$(use_multiarch \|\| echo --disable-multi-arch)	111	$(use_multiarch \|\| echo --disable-multi-arch)
Lines 130-136 Link Here
130		126
131	# There is no configure option for this and we need to export it	127	# There is no configure option for this and we need to export it
132	# since the glibc build will re-run configure on itself	128	# since the glibc build will re-run configure on itself
133	export libc_cv_slibdir=/$(get_libdir)	129	export libc_cv_slibdir="${EPREFIX}/$(get_libdir)"
134		130
135	# We take care of patching our binutils to use both hash styles,	131	# We take care of patching our binutils to use both hash styles,
136	# and many people like to force gnu hash style only, so disable	132	# and many people like to force gnu hash style only, so disable
Lines 147-155 Link Here
147	local builddir=$(builddir "$1")	143	local builddir=$(builddir "$1")
148	mkdir -p "${builddir}"	144	mkdir -p "${builddir}"
149	cd "${builddir}"	145	cd "${builddir}"
150	set -- "${S}"/configure "${myconf[@]}"	146	ECONF_SOURCE="${S}" econf "${myconf[@]}"
151	echo "$@"
152	"$@" \|\| die "failed to configure glibc"
153		147
154	# ia64 static cross-compilers are a pita in so much that they	148	# ia64 static cross-compilers are a pita in so much that they
155	# can't produce static ELFs (as the libgcc.a is broken). so	149	# can't produce static ELFs (as the libgcc.a is broken). so
Lines 236-242 Link Here
236	--build=${CBUILD_OPT:-${CBUILD}}	230	--build=${CBUILD_OPT:-${CBUILD}}
237	--host=${CTARGET_OPT:-${CTARGET}}	231	--host=${CTARGET_OPT:-${CTARGET}}
238	--with-headers=$(alt_build_headers)	232	--with-headers=$(alt_build_headers)
239	--prefix=/usr
240	${EXTRA_ECONF}	233	${EXTRA_ECONF}
241	)	234	)
242		235
Lines 248-260 Link Here
248		241
249	# Nothing is compiled here which would affect the headers for the target.	242	# Nothing is compiled here which would affect the headers for the target.
250	# So forcing CC/CFLAGS is sane.	243	# So forcing CC/CFLAGS is sane.
251	set -- "${S}"/configure "${myconf[@]}"
252	echo "$@"
253	CC="$(tc-getBUILD_CC)" \	244	CC="$(tc-getBUILD_CC)" \
254	CFLAGS="-O1 -pipe" \	245	CFLAGS="-O1 -pipe" \
255	CPPFLAGS="-U_FORTIFY_SOURCE" \	246	CPPFLAGS="-U_FORTIFY_SOURCE" \
256	LDFLAGS="" \	247	LDFLAGS="" \
257	"$@" \|\| die "failed to configure glibc"	248	ECONF_SOURCE="${S}" econf "${myconf[@]}"
258	}	249	}
259		250
260	toolchain-glibc_src_configure() {	251	toolchain-glibc_src_configure() {