[gentoo-commits] gentoo-x86 commit in sys-libs/glibc/files/eblits: src_install-2.6.eblit

[Mike Frysinger (vapier)]

vapier      08/06/29 16:39:23

  Modified:             src_install-2.6.eblit
  Log:
  Short circuit header building in pkg testing and ABI recursion. (2.6.1 fix #229923)
  (Portage version: 2.2_rc1/cvs/Linux 2.6.25 x86_64)

Revision  Changes    Path
1.2                  sys-libs/glibc/files/eblits/src_install-2.6.eblit

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/glibc/files/eblits/src_install-2.6.eblit?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/glibc/files/eblits/src_install-2.6.eblit?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/glibc/files/eblits/src_install-2.6.eblit?r1=1.1&r2=1.2

Index: src_install-2.6.eblit
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_install-2.6.eblit,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- src_install-2.6.eblit	24 Mar 2008 19:45:15 -0000	1.1
+++ src_install-2.6.eblit	29 Jun 2008 16:39:23 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_install-2.6.eblit,v 1.1 2008/03/24 19:45:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_install-2.6.eblit,v 1.2 2008/06/29 16:39:23 vapier Exp $
 
 toolchain-glibc_src_install() {
 	# These should not be set, else the
@@ -217,6 +217,11 @@
 }
 
 eblit-glibc-src_install() {
+	if just_headers ; then
+		toolchain-glibc_headers_install
+		return
+	fi
+
 	setup_env
 
 	if [[ -z ${OABI} ]] ; then
@@ -240,10 +245,6 @@
 		fi
 	fi
 
-	if just_headers ; then
-		toolchain-glibc_headers_install
-	else
-		toolchain-glibc_src_install
-	fi
+	toolchain-glibc_src_install
 	[[ -z ${OABI} ]] && src_strip
 }



-- 
gentoo-commits@l.g.o mailing list