[patch] Fix ebuild to work in prefix

glibc-2.23-r2-prefix-cross.patch (text/plain), 3.65 KB, created by Michael Weiser on 2016-05-16 17:33:48 UTC

diff -ur /usr/local/gentoo/usr/portage/sys-libs/glibc/files/eblits/src_configure.eblit ./files/eblits/src_configure.eblit
--- /usr/local/gentoo/usr/portage/sys-libs/glibc/files/eblits/src_configure.eblit	2016-03-31 00:28:42.000000000 +0200
+++ ./files/eblits/src_configure.eblit	2016-04-06 22:35:29.000000000 +0200
@@ -104,7 +104,7 @@
 		--host=${CTARGET_OPT:-${CTARGET}}
 		$(use_enable profile)
 		$(use_with gd)
-		--with-headers=$(alt_build_headers)
+		--with-headers="${EPREFIX}"$(alt_build_headers)
 		--prefix=/usr
 		--libdir=/usr/$(get_libdir)
 		--mandir=/usr/share/man
@@ -183,6 +183,8 @@
 	mkdir -p "${builddir}"
 	cd "${builddir}"
 
+	export CC="$(tc-getCC ${CTARGET})"
+	if ! $CC -v >/dev/null ; then
 	# if we don't have a compiler yet, we cant really test it now ...
 	# hopefully they don't affect header geneation, so let's hope for
 	# the best here ...
@@ -217,6 +219,8 @@
 		einfo " ${v}"
 		export ${v}
 	done
+	export CC="$(tc-getBUILD_CC)"
+	fi
 
 	# Blow away some random CC settings that screw things up. #550192
 	if [[ -d ${S}/sysdeps/mips ]]; then
@@ -235,7 +239,7 @@
 		--enable-bind-now
 		--build=${CBUILD_OPT:-${CBUILD}}
 		--host=${CTARGET_OPT:-${CTARGET}}
-		--with-headers=$(alt_build_headers)
+		--with-headers="${EPREFIX}"$(alt_build_headers)
 		--prefix=/usr
 		${EXTRA_ECONF}
 	)
@@ -250,7 +254,6 @@
 	# So forcing CC/CFLAGS is sane.
 	set -- "${S}"/configure "${myconf[@]}"
 	echo "$@"
-	CC="$(tc-getBUILD_CC)" \
 	CFLAGS="-O1 -pipe" \
 	CPPFLAGS="-U_FORTIFY_SOURCE" \
 	LDFLAGS="" \
diff -ur /usr/local/gentoo/usr/portage/sys-libs/glibc/files/eblits/src_install.eblit ./files/eblits/src_install.eblit
--- /usr/local/gentoo/usr/portage/sys-libs/glibc/files/eblits/src_install.eblit	2015-08-09 09:11:24.000000000 +0200
+++ ./files/eblits/src_install.eblit	2016-04-05 23:03:36.000000000 +0200
@@ -6,7 +6,7 @@
 	local builddir=$(builddir $(want_linuxthreads && echo linuxthreads || echo nptl))
 	cd "${builddir}"
 
-	emake install_root="${D}$(alt_prefix)" install || die
+	emake install_root="${ED}$(alt_prefix)" install || die
 
 	if want_linuxthreads && want_nptl ; then
 		einfo "Installing NPTL to $(alt_libdir)/tls/..."
@@ -102,7 +102,7 @@
 		has ${ldso_abi} $(get_install_abis) || continue
 
 		ldso_name="$(alt_prefix)${ldso_abi_list[i+1]}"
-		if [[ ! -L ${D}/${ldso_name} && ! -e ${D}/${ldso_name} ]] ; then
+		if [[ ! -L ${ED}/${ldso_name} && ! -e ${ED}/${ldso_name} ]] ; then
 			dosym ../$(get_abi_LIBDIR ${ldso_abi})/${ldso_name##*/} ${ldso_name}
 		fi
 	done
@@ -111,7 +111,7 @@
 	# 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 "${D}" -name pt_chown -exec chmod -s {} +
+		find "${ED}" -name pt_chown -exec chmod -s {} +
 	fi
 
 	#################################################################
@@ -202,7 +202,7 @@
 toolchain-glibc_headers_install() {
 	local builddir=$(builddir "headers")
 	cd "${builddir}"
-	emake install_root="${D}$(alt_prefix)" install-headers || die
+	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
diff -ur /usr/local/gentoo/usr/portage/sys-libs/glibc/glibc-2.23-r2.ebuild ./glibc-2.23-r2.ebuild
--- /usr/local/gentoo/usr/portage/sys-libs/glibc/glibc-2.23-r2.ebuild	2016-04-17 13:26:16.000000000 +0200
+++ ./glibc-2.23-r2.ebuild	2016-05-04 14:31:15.000000000 +0200
@@ -173,6 +173,7 @@
 	cd "${S}"
 
 	epatch "${FILESDIR}"/2.19/${PN}-2.19-ia64-gcc-4.8-reloc-hack.patch #503838
+	epatch "${FILESDIR}"/2.23/${PN}-2.23-case-insensitive-fs.patch
 
 	if use hardened ; then
 		# We don't enable these for non-hardened as the output is very terse --