[patch] FIx gconvdir for multilib arches

glibc-2.3.4-ebuild-gconvdir.patch (text/plain), 1.07 KB, created by Danny van Dyk (RETIRED) on 2005-03-27 06:17:09 UTC

Index: glibc-2.3.4.20050125-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20050125-r1.ebuild,v
retrieving revision 1.32
diff -u -b -B -r1.32 glibc-2.3.4.20050125-r1.ebuild
--- glibc-2.3.4.20050125-r1.ebuild	25 Mar 2005 06:17:28 -0000	1.32
+++ glibc-2.3.4.20050125-r1.ebuild	27 Mar 2005 14:06:03 -0000
@@ -228,17 +228,20 @@
 }
 
 toolchain-glibc_src_compile() {
+	# Set gconvdir to /usr/$(get_libdir)/gconv on archs with multiple ABIs
+	has_multilib_profile && MAKEFLAGS="gconvdir=$(alt_usrlibdir)/gconv"
+
 	if want_linuxthreads ; then
 		glibc_do_configure linuxthreads
 		einfo "Building GLIBC with linuxthreads..."
-		make PARALLELMFLAGS="${MAKEOPTS}" || die
+		make PARALLELMFLAGS="${MAKEOPTS}" ${MAKEFLAGS} || die
 	fi
 	if want_nptl ; then
 		# ... and then do the optional nptl build
 		unset LD_ASSUME_KERNEL || :
 		glibc_do_configure nptl
 		einfo "Building GLIBC with NPTL..."
-		make PARALLELMFLAGS="${MAKEOPTS}" || die
+		make PARALLELMFLAGS="${MAKEOPTS}" ${MAKEFLAGS} || die
 	fi
 }