commit:     8400f95b08817f1755b5fb8a2443f170bbfc058c
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 12 10:54:48 2017 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Mar 18 07:33:18 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8400f95b

eutils.eclass: prune_libtool_files, make .pc subst errors fatal

Make the substitution errors in prune_libtool_files logic fatal to avoid
the dependency of eqawarn. They're extremely unlikely to happen anyway.

 eclass/eutils.eclass | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/eclass/eutils.eclass b/eclass/eutils.eclass
index ab226b236a3..cb472caee1d 100644
--- a/eclass/eutils.eclass
+++ b/eclass/eutils.eclass
@@ -982,9 +982,10 @@ prune_libtool_files() {
                                                        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."
+                                                                               
eerror "${FUNCNAME}: variable substitution likely failed in ${pc}"
+                                                                               
eerror "(arg: ${arg})"
+                                                                               
eerror "Most likely, you need to add virtual/pkgconfig to DEPEND."
+                                                                               
die "${FUNCNAME}: unsubstituted variable found in .pc"
                                                                        fi
 
                                                                        
pc_libs+=( lib${arg#-l}.la )

Reply via email to