Attachment #434452 for bug #583216

Lines 104-110 Link Here

(-)/usr/local/gentoo/usr/portage/sys-libs/glibc/files/eblits/src_configure.eblit (-3 / +6 lines)
104	--host=${CTARGET_OPT:-${CTARGET}}	104	--host=${CTARGET_OPT:-${CTARGET}}
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="${EPREFIX}"$(alt_build_headers)
108	--prefix=/usr	108	--prefix=/usr
109	--libdir=/usr/$(get_libdir)	109	--libdir=/usr/$(get_libdir)
110	--mandir=/usr/share/man	110	--mandir=/usr/share/man
Lines 183-188 Link Here
183	mkdir -p "${builddir}"	183	mkdir -p "${builddir}"
184	cd "${builddir}"	184	cd "${builddir}"
185		185
		186	export CC="$(tc-getCC ${CTARGET})"
		187	if ! $CC -v >/dev/null ; then
186	# if we don't have a compiler yet, we cant really test it now ...	188	# if we don't have a compiler yet, we cant really test it now ...
187	# hopefully they don't affect header geneation, so let's hope for	189	# hopefully they don't affect header geneation, so let's hope for
188	# the best here ...	190	# the best here ...
Lines 217-222 Link Here
217	einfo " ${v}"	219	einfo " ${v}"
218	export ${v}	220	export ${v}
219	done	221	done
		222	export CC="$(tc-getBUILD_CC)"
		223	fi
220		224
221	# Blow away some random CC settings that screw things up. #550192	225	# Blow away some random CC settings that screw things up. #550192
222	if [[ -d ${S}/sysdeps/mips ]]; then	226	if [[ -d ${S}/sysdeps/mips ]]; then
Lines 235-241 Link Here
235	--enable-bind-now	239	--enable-bind-now
236	--build=${CBUILD_OPT:-${CBUILD}}	240	--build=${CBUILD_OPT:-${CBUILD}}
237	--host=${CTARGET_OPT:-${CTARGET}}	241	--host=${CTARGET_OPT:-${CTARGET}}
238	--with-headers=$(alt_build_headers)	242	--with-headers="${EPREFIX}"$(alt_build_headers)
239	--prefix=/usr	243	--prefix=/usr
240	${EXTRA_ECONF}	244	${EXTRA_ECONF}
241	)	245	)
Lines 250-256 Link Here
250	# So forcing CC/CFLAGS is sane.	254	# So forcing CC/CFLAGS is sane.
251	set -- "${S}"/configure "${myconf[@]}"	255	set -- "${S}"/configure "${myconf[@]}"
252	echo "$@"	256	echo "$@"
253	CC="$(tc-getBUILD_CC)" \
254	CFLAGS="-O1 -pipe" \	257	CFLAGS="-O1 -pipe" \
255	CPPFLAGS="-U_FORTIFY_SOURCE" \	258	CPPFLAGS="-U_FORTIFY_SOURCE" \
256	LDFLAGS="" \	259	LDFLAGS="" \




	local builddir=$(builddir $(want_linuxthreads && echo linuxthreads || echo nptl))
	cd "${builddir}"

	emake install_root="${ED}$(alt_prefix)" install || die

	if want_linuxthreads && want_nptl ; then
		einfo "Installing NPTL to $(alt_libdir)/tls/..."

		has ${ldso_abi} $(get_install_abis) || continue

		ldso_name="$(alt_prefix)${ldso_abi_list[i+1]}"
		if [[ ! -L ${ED}/${ldso_name} && ! -e ${ED}/${ldso_name} ]] ; then
			dosym ../$(get_abi_LIBDIR ${ldso_abi})/${ldso_name##*/} ${ldso_name}
		fi
	done

	# binary to be setuid.  This is because the default owners/perms will be
	# exactly what we want.
	if in_iuse suid && ! use suid ; then
		find "${ED}" -name pt_chown -exec chmod -s {} +
	fi

	#################################################################

toolchain-glibc_headers_install() {
	local builddir=$(builddir "headers")
	cd "${builddir}"
	emake install_root="${ED}$(alt_prefix)" install-headers || die
	if ! version_is_at_least 2.16 ; then
		insinto $(alt_headers)/bits
		doins bits/stdio_lim.h || die

Lines 173-178 Link Here

(-)/usr/local/gentoo/usr/portage/sys-libs/glibc/glibc-2.23-r2.ebuild (+1 lines)
173	cd "${S}"	173	cd "${S}"
174		174
175	epatch "${FILESDIR}"/2.19/${PN}-2.19-ia64-gcc-4.8-reloc-hack.patch #503838	175	epatch "${FILESDIR}"/2.19/${PN}-2.19-ia64-gcc-4.8-reloc-hack.patch #503838
		176	epatch "${FILESDIR}"/2.23/${PN}-2.23-case-insensitive-fs.patch
176		177
177	if use hardened ; then	178	if use hardened ; then
178	# We don't enable these for non-hardened as the output is very terse --	179	# We don't enable these for non-hardened as the output is very terse --

Return to bug 583216

Lines 6-12 Link Here

(-)/usr/local/gentoo/usr/portage/sys-libs/glibc/files/eblits/src_install.eblit (-4 / +4 lines)
6	local builddir=$(builddir $(want_linuxthreads && echo linuxthreads \|\| echo nptl))	6	local builddir=$(builddir $(want_linuxthreads && echo linuxthreads \|\| echo nptl))
7	cd "${builddir}"	7	cd "${builddir}"
8		8
9	emake install_root="${D}$(alt_prefix)" install \|\| die	9	emake install_root="${ED}$(alt_prefix)" install \|\| die
10		10
11	if want_linuxthreads && want_nptl ; then	11	if want_linuxthreads && want_nptl ; then
12	einfo "Installing NPTL to $(alt_libdir)/tls/..."	12	einfo "Installing NPTL to $(alt_libdir)/tls/..."
Lines 102-108 Link Here
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	#################################################################
Lines 202-208 Link Here
202	toolchain-glibc_headers_install() {	202	toolchain-glibc_headers_install() {
203	local builddir=$(builddir "headers")	203	local builddir=$(builddir "headers")
204	cd "${builddir}"	204	cd "${builddir}"
205	emake install_root="${D}$(alt_prefix)" install-headers \|\| die	205	emake install_root="${ED}$(alt_prefix)" install-headers \|\| die
206	if ! version_is_at_least 2.16 ; then	206	if ! version_is_at_least 2.16 ; then
207	insinto $(alt_headers)/bits	207	insinto $(alt_headers)/bits
208	doins bits/stdio_lim.h \|\| die	208	doins bits/stdio_lim.h \|\| die