[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog eutils.eclass

[Michal Gorny (mgorny)]

mgorny      13/02/26 14:36:40

  Modified:             ChangeLog eutils.eclass
  Log:
  prune_libtool_files: support running without pkg-config installed, using sed fallback.

Revision  Changes    Path
1.689                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.688
retrieving revision 1.689
diff -u -r1.688 -r1.689
--- ChangeLog	26 Feb 2013 14:35:13 -0000	1.688
+++ ChangeLog	26 Feb 2013 14:36:40 -0000	1.689
@@ -1,6 +1,10 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.688 2013/02/26 14:35:13 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.689 2013/02/26 14:36:40 mgorny Exp $
+
+  26 Feb 2013; Michał Górny <mgorny@g.o> eutils.eclass:
+  prune_libtool_files: support running without pkg-config installed, using sed
+  fallback.
 
   26 Feb 2013; Michał Górny <mgorny@g.o> python-r1.eclass:
   Re-enable split logs, now directly handled by python*_foreach_impl().



1.411                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.410
retrieving revision 1.411
diff -u -r1.410 -r1.411
--- eutils.eclass	10 Feb 2013 11:42:48 -0000	1.410
+++ eutils.eclass	26 Feb 2013 14:36:40 -0000	1.411
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.410 2013/02/10 11:42:48 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.411 2013/02/26 14:36:40 mgorny Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -1407,8 +1407,9 @@
 # that they should not be linked to, i.e. whenever these files
 # correspond to plugins.
 #
-# Note: if your package installs both static libraries and .pc files,
-# you need to add pkg-config to your DEPEND.
+# Note: if your package installs both static libraries and .pc files
+# which use variable substitution for -l flags, you need to add
+# pkg-config to your DEPEND.
 prune_libtool_files() {
 	debug-print-function ${FUNCNAME} "$@"
 
@@ -1473,11 +1474,27 @@
 					local pkgconf=$(tc-getPKG_CONFIG)
 
 					while IFS= read -r -d '' pc; do # for all .pc files
-						local arg
+						local arg libs
 
-						sed -e '/^Requires:/d' "${pc}" > "${tf}"
-						for arg in $("${pkgconf}" --libs "${tf}"); do
-							[[ ${arg} == -l* ]] && pc_libs+=( lib${arg#-l}.la )
+						# Use pkg-config if available (and works),
+						# fallback to sed.
+						if ${pkgconf} --exists "${pc}" &>/dev/null; then
+							sed -e '/^Requires:/d' "${pc}" > "${tf}"
+							libs=$(${pkgconf} --libs "${tf}")
+						else
+							libs=$(sed -ne 's/^Libs://p' "${pc}")
+						fi
+
+						for arg in ${libs}; do
+							if [[ ${arg} == -l* ]]; then
+								if [[ ${arg} == '*$*' ]]; then
+									eqawarn "${FUNCNAME}: variable substitution likely failed in ${pc}"
+									eqawarn "(arg: ${arg})"
+									eqawarn "Most likely, you need to add virtual/pkgconfig to DEPEND."
+								fi
+
+								pc_libs+=( lib${arg#-l}.la )
+							fi
 						done
 					done < <(find "${D}" -type f -name '*.pc' -print0)