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

Collapse All | Expand All

(-)glibc-2.26-r4.ebuild.orig (-9 / +22 lines)
Lines 109-114 Link Here
109
# the phases
109
# the phases
110
#
110
#
111
111
112
noncross_eprefix() {
113
	is_crosscompile || echo "${EPREFIX}"
114
}
115
116
cross_eprefix() {
117
	is_crosscompile && echo "${EPREFIX}"
118
}
119
112
pkg_pretend() {
120
pkg_pretend() {
113
	# Make sure devpts is mounted correctly for use w/out setuid pt_chown
121
	# Make sure devpts is mounted correctly for use w/out setuid pt_chown
114
	check_devpts
122
	check_devpts
Lines 236-241 Link Here
236
		einfo "Done."
244
		einfo "Done."
237
	fi
245
	fi
238
246
247
	epatch "${FILESDIR}"/${PN}-2.25-case-insensitive-fs.patch
248
239
	if just_headers ; then
249
	if just_headers ; then
240
		if [[ -e ports/sysdeps/mips/preconfigure ]] ; then
250
		if [[ -e ports/sysdeps/mips/preconfigure ]] ; then
241
			# mips peeps like to screw with us.  if building headers,
251
			# mips peeps like to screw with us.  if building headers,
Lines 398-406 Link Here
398
		$(use_enable profile)
408
		$(use_enable profile)
399
		$(use_with gd)
409
		$(use_with gd)
400
		--with-headers=$(alt_build_headers)
410
		--with-headers=$(alt_build_headers)
401
		--prefix="${EPREFIX}/usr"
411
		--prefix="$(noncross_eprefix)/usr"
402
		--sysconfdir="${EPREFIX}/etc"
412
		--sysconfdir="$(noncross_eprefix)/etc"
403
		--localstatedir="${EPREFIX}/var"
413
		--localstatedir="$(noncross_eprefix)/var"
404
		--libdir='$(prefix)'/$(get_libdir)
414
		--libdir='$(prefix)'/$(get_libdir)
405
		--mandir='$(prefix)'/share/man
415
		--mandir='$(prefix)'/share/man
406
		--infodir='$(prefix)'/share/info
416
		--infodir='$(prefix)'/share/info
Lines 422-429 Link Here
422
432
423
	# There is no configure option for this and we need to export it
433
	# There is no configure option for this and we need to export it
424
	# since the glibc build will re-run configure on itself
434
	# since the glibc build will re-run configure on itself
425
	export libc_cv_rootsbindir="${EPREFIX}/sbin"
435
	export libc_cv_rootsbindir="$(noncross_eprefix)/sbin"
426
	export libc_cv_slibdir="${EPREFIX}/$(get_libdir)"
436
	export libc_cv_slibdir="$(noncross_eprefix)/$(get_libdir)"
427
437
428
	# We take care of patching our binutils to use both hash styles,
438
	# We take care of patching our binutils to use both hash styles,
429
	# and many people like to force gnu hash style only, so disable
439
	# and many people like to force gnu hash style only, so disable
Lines 469-474 Link Here
469
	mkdir -p "${builddir}"
479
	mkdir -p "${builddir}"
470
	cd "${builddir}"
480
	cd "${builddir}"
471
481
482
	export CC="$(tc-getCC ${CTARGET})"
483
	if ! $CC -v >/dev/null ; then
472
	# if we don't have a compiler yet, we can't really test it now ...
484
	# if we don't have a compiler yet, we can't really test it now ...
473
	# hopefully they don't affect header generation, so let's hope for
485
	# hopefully they don't affect header generation, so let's hope for
474
	# the best here ...
486
	# the best here ...
Lines 504-509 Link Here
504
		einfo " ${v}"
516
		einfo " ${v}"
505
		export ${v}
517
		export ${v}
506
	done
518
	done
519
	export CC="$(tc-getBUILD_CC)"
520
	fi
507
521
508
	# Blow away some random CC settings that screw things up. #550192
522
	# Blow away some random CC settings that screw things up. #550192
509
	if [[ -d ${S}/sysdeps/mips ]]; then
523
	if [[ -d ${S}/sysdeps/mips ]]; then
Lines 531-537 Link Here
531
		--build=${CBUILD_OPT:-${CBUILD}}
545
		--build=${CBUILD_OPT:-${CBUILD}}
532
		--host=${CTARGET_OPT:-${CTARGET}}
546
		--host=${CTARGET_OPT:-${CTARGET}}
533
		--with-headers=$(alt_build_headers)
547
		--with-headers=$(alt_build_headers)
534
		--prefix="${EPREFIX}/usr"
548
		--prefix="$(noncross_eprefix)/usr"
535
		${EXTRA_ECONF}
549
		${EXTRA_ECONF}
536
	)
550
	)
537
551
Lines 543-549 Link Here
543
	# So forcing CC/CFLAGS is sane.
557
	# So forcing CC/CFLAGS is sane.
544
	set -- "${S}"/configure "${myconf[@]}"
558
	set -- "${S}"/configure "${myconf[@]}"
545
	echo "$@"
559
	echo "$@"
546
	CC="$(tc-getBUILD_CC)" \
547
	CFLAGS="-O1 -pipe" \
560
	CFLAGS="-O1 -pipe" \
548
	CPPFLAGS="-U_FORTIFY_SOURCE" \
561
	CPPFLAGS="-U_FORTIFY_SOURCE" \
549
	LDFLAGS="" \
562
	LDFLAGS="" \
Lines 599-605 Link Here
599
	local builddir=$(builddir nptl)
612
	local builddir=$(builddir nptl)
600
	cd "${builddir}"
613
	cd "${builddir}"
601
614
602
	emake install_root="${D}$(alt_prefix)" install || die
615
	emake install_root="${D}$(cross_eprefix)$(alt_prefix)" install || die
603
616
604
	# This version (2.26) provides some compatibility libraries for the NIS/NIS+ support
617
	# This version (2.26) provides some compatibility libraries for the NIS/NIS+ support
605
	# which come without headers etc. Only needed for binary packages since the
618
	# which come without headers etc. Only needed for binary packages since the
Lines 762-768 Link Here
762
glibc_headers_install() {
775
glibc_headers_install() {
763
	local builddir=$(builddir "headers")
776
	local builddir=$(builddir "headers")
764
	cd "${builddir}"
777
	cd "${builddir}"
765
	emake install_root="${D}$(alt_prefix)" install-headers
778
	emake install_root="${D}$(cross_eprefix)$(alt_prefix)" install-headers
766
779
767
	insinto $(alt_headers)/gnu
780
	insinto $(alt_headers)/gnu
768
	doins "${S}"/include/gnu/stubs.h
781
	doins "${S}"/include/gnu/stubs.h

Return to bug 583216