diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2015-05-08 11:21:02 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2015-05-08 11:21:02 +0000 |
| commit | 7c98de35583a39305fd924957e543c742706b994 (patch) | |
| tree | 801a5b60f74a078cf7239cff0806d92b3404e203 | |
| parent | Add iapbs USE to correctly trigger project internal dependencies (diff) | |
| download | gentoo-2-7c98de35583a39305fd924957e543c742706b994.tar.gz gentoo-2-7c98de35583a39305fd924957e543c742706b994.tar.bz2 gentoo-2-7c98de35583a39305fd924957e543c742706b994.zip | |
use find to run sed on la files so we skip sed when there are no la files #548782
| -rw-r--r-- | eclass/toolchain.eclass | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index 43b3435adc36..cfaf29738651 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -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.666 2015/05/04 05:43:08 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.667 2015/05/08 11:21:02 vapier Exp $ # Maintainer: Toolchain Ninjas <toolchain@gentoo.org> @@ -1821,9 +1821,9 @@ fix_libtool_libdir_paths() { allarchives="\(${allarchives// /\\|}\)" popd >/dev/null - sed -i \ - -e "/^libdir=/s:=.*:='${dir}':" \ - ./${dir}/*.la || die + # The libdir might not have any .la files. #548782 + find "./${dir}" -maxdepth 1 -name '*.la' \ + -exec sed -i -e "/^libdir=/s:=.*:='${dir}':" {} + || die sed -i \ -e "/^dependency_libs=/s:/[^ ]*/${allarchives}:${LIBPATH}/\1:g" \ $(find ./${PREFIX}/lib* -maxdepth 3 -name '*.la') \ |