eutils.eclass: prune_libtool_files, make .pc subst errors fatal
authorMichał Górny <mgorny@gentoo.org>
Sun, 12 Mar 2017 10:54:48 +0000 (11:54 +0100)
committerMichał Górny <mgorny@gentoo.org>
Sat, 18 Mar 2017 07:33:18 +0000 (08:33 +0100)
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

index ab226b236a3787d3b25cbcb018c5d8709c1d3e8e..cb472caee1d4d403c56ed650810ed0deff4e4b19 100644 (file)
@@ -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 )