vapier      15/05/11 03:05:21

  Modified:             toolchain.eclass
  Log:
  use find to run sed on la files so we skip sed when there are no la files 
#548782

Revision  Changes    Path
1.668                eclass/toolchain.eclass

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

Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.667
retrieving revision 1.668
diff -u -r1.667 -r1.668
--- toolchain.eclass    8 May 2015 11:21:02 -0000       1.667
+++ toolchain.eclass    11 May 2015 03:05:21 -0000      1.668
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.667 2015/05/08 
11:21:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.668 2015/05/11 
03:05:21 vapier Exp $
 
 # Maintainer: Toolchain Ninjas <[email protected]>
 
@@ -1827,7 +1827,7 @@
        sed -i \
                -e "/^dependency_libs=/s:/[^ ]*/${allarchives}:${LIBPATH}/\1:g" 
\
                $(find ./${PREFIX}/lib* -maxdepth 3 -name '*.la') \
-               ./${dir}/*.la || die
+               $(find ./${dir}/ -maxdepth 1 -name '*.la') || die
 
        popd >/dev/null
 }




Reply via email to