[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog cmake-multilib.eclass multilib-build.eclass multilib-minimal.eclass

[Michal Gorny (mgorny)]

mgorny      14/04/29 20:54:54

  Modified:             ChangeLog cmake-multilib.eclass
                        multilib-build.eclass multilib-minimal.eclass
  Log:
  Move conditionals for enabling wrappers into multilib_prepare_wrappers() and multilib_install_wrappers().

Revision  Changes    Path
1.1228               eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1228&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1228&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1227&r2=1.1228

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1227
retrieving revision 1.1228
diff -u -r1.1227 -r1.1228
--- ChangeLog	28 Apr 2014 17:38:21 -0000	1.1227
+++ ChangeLog	29 Apr 2014 20:54:54 -0000	1.1228
@@ -1,6 +1,11 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1227 2014/04/28 17:38:21 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1228 2014/04/29 20:54:54 mgorny Exp $
+
+  29 Apr 2014; Michał Górny <mgorny@g.o> cmake-multilib.eclass,
+  multilib-build.eclass, multilib-minimal.eclass:
+  Move conditionals for enabling wrappers into multilib_prepare_wrappers() and
+  multilib_install_wrappers().
 
   28 Apr 2014; Michał Górny <mgorny@g.o> multilib-build.eclass:
   Deprecate multilib_build_binaries, and switch the code to use



1.6                  eclass/cmake-multilib.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/cmake-multilib.eclass?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/cmake-multilib.eclass?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/cmake-multilib.eclass?r1=1.5&r2=1.6

Index: cmake-multilib.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/cmake-multilib.eclass,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cmake-multilib.eclass	3 Apr 2014 22:09:36 -0000	1.5
+++ cmake-multilib.eclass	29 Apr 2014 20:54:54 -0000	1.6
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/cmake-multilib.eclass,v 1.5 2014/04/03 22:09:36 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/cmake-multilib.eclass,v 1.6 2014/04/29 20:54:54 mgorny Exp $
 
 # @ECLASS: cmake-multilib.eclass
 # @MAINTAINER:
@@ -50,12 +50,9 @@
 	cmake-multilib_secure_install() {
 		cmake-utils_src_install "${@}"
 
-		# Do multilib magic only when >1 ABI is used.
-		if [[ ${#MULTIBUILD_VARIANTS[@]} -gt 1 ]]; then
-			multilib_prepare_wrappers
-			# Make sure all headers are the same for each ABI.
-			multilib_check_headers
-		fi
+		multilib_prepare_wrappers
+		# Make sure all headers are the same for each ABI.
+		multilib_check_headers
 	}
 
 	multilib_foreach_abi cmake-multilib_secure_install "${@}"



1.41                 eclass/multilib-build.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.41&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.41&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?r1=1.40&r2=1.41

Index: multilib-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- multilib-build.eclass	28 Apr 2014 17:38:21 -0000	1.40
+++ multilib-build.eclass	29 Apr 2014 20:54:54 -0000	1.41
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.40 2014/04/28 17:38:21 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.41 2014/04/29 20:54:54 mgorny Exp $
 
 # @ECLASS: multilib-build.eclass
 # @MAINTAINER:
@@ -295,6 +295,8 @@
 
 	[[ ${#} -le 1 ]] || die "${FUNCNAME}: too many arguments"
 
+	[[ ${#MULTIBUILD_VARIANTS[@]} -le 1 ]] && return
+
 	local root=${1:-${ED}}
 	local f
 
@@ -419,6 +421,8 @@
 
 	[[ ${#} -le 1 ]] || die "${FUNCNAME}: too many arguments"
 
+	[[ ${#MULTIBUILD_VARIANTS[@]} -le 1 ]] && return
+
 	local root=${1:-${ED}}
 
 	if [[ -d "${ED}"/tmp/multilib-include ]]; then



1.8                  eclass/multilib-minimal.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-minimal.eclass?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-minimal.eclass?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-minimal.eclass?r1=1.7&r2=1.8

Index: multilib-minimal.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib-minimal.eclass,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- multilib-minimal.eclass	27 Dec 2013 22:47:14 -0000	1.7
+++ multilib-minimal.eclass	29 Apr 2014 20:54:54 -0000	1.8
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-minimal.eclass,v 1.7 2013/12/27 22:47:14 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-minimal.eclass,v 1.8 2014/04/29 20:54:54 mgorny Exp $
 
 # @ECLASS: multilib-minimal.eclass
 # @MAINTAINER:
@@ -108,11 +108,9 @@
 				emake DESTDIR="${D}" install
 			fi
 		fi
-		# Do multilib magic only when >1 ABI is used.
-		if [[ ${#MULTIBUILD_VARIANTS[@]} -gt 1 ]]; then
-			multilib_prepare_wrappers
-			multilib_check_headers
-		fi
+
+		multilib_prepare_wrappers
+		multilib_check_headers
 		popd >/dev/null || die
 	}
 	multilib_foreach_abi multilib-minimal_abi_src_install