perfinion 14/12/05 09:23:03 Modified: selinux-policy-2.eclass Log: fix bug 530178, parallel build on >2.20140311-r7
Revision Changes Path 1.29 eclass/selinux-policy-2.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/selinux-policy-2.eclass?rev=1.29&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/selinux-policy-2.eclass?rev=1.29&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/selinux-policy-2.eclass?r1=1.28&r2=1.29 Index: selinux-policy-2.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/selinux-policy-2.eclass,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- selinux-policy-2.eclass 14 Nov 2014 19:46:05 -0000 1.28 +++ selinux-policy-2.eclass 5 Dec 2014 09:23:03 -0000 1.29 @@ -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/selinux-policy-2.eclass,v 1.28 2014/11/14 19:46:05 swift Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/selinux-policy-2.eclass,v 1.29 2014/12/05 09:23:03 perfinion Exp $ # Eclass for installing SELinux policy, and optionally # reloading the reference-policy based modules. @@ -229,11 +229,16 @@ do use ${useflag} && makeuse="${makeuse} -D use_${useflag}" done + for i in ${POLICY_TYPES}; do # Support USE flags in builds export M4PARAM="${makeuse}" - # Parallel builds are broken, so we need to force -j1 here - emake -j1 NAME=$i -C "${S}"/${i} || die "${i} compile failed" + if [[ ${BASEPOL} == 2.20140311* ]]; then + # Parallel builds are broken in 2.20140311-r7 and earlier, bug 530178 + emake -j1 NAME=$i -C "${S}"/${i} || die "${i} compile failed" + else + emake NAME=$i -C "${S}"/${i} || die "${i} compile failed" + fi done }
