Gentoo Archives: gentoo-dev

From: "Michał Górny" <mgorny@g.o>
To: gentoo-dev@l.g.o
Cc: "Michał Górny" <mgorny@g.o>
Subject: [gentoo-dev] [PATCH 2/3] eutils.eclass: prune_libtool_files, make .pc subst errors fatal
Date: Sun, 12 Mar 2017 11:02:11
Message-Id: 20170312110009.3109-3-mgorny@gentoo.org
In Reply to: [gentoo-dev] [PATCH v2] ltprune.eclass by "Michał Górny"
1 Make the substitution errors in prune_libtool_files logic fatal to avoid
2 the dependency of eqawarn. They're extremely unlikely to happen anyway.
3 ---
4 eclass/eutils.eclass | 7 ++++---
5 1 file changed, 4 insertions(+), 3 deletions(-)
6
7 diff --git a/eclass/eutils.eclass b/eclass/eutils.eclass
8 index ab226b236a37..cb472caee1d4 100644
9 --- a/eclass/eutils.eclass
10 +++ b/eclass/eutils.eclass
11 @@ -982,9 +982,10 @@ prune_libtool_files() {
12 for arg in ${libs}; do
13 if [[ ${arg} == -l* ]]; then
14 if [[ ${arg} == '*$*' ]]; then
15 - eqawarn "${FUNCNAME}: variable substitution likely failed in ${pc}"
16 - eqawarn "(arg: ${arg})"
17 - eqawarn "Most likely, you need to add virtual/pkgconfig to DEPEND."
18 + eerror "${FUNCNAME}: variable substitution likely failed in ${pc}"
19 + eerror "(arg: ${arg})"
20 + eerror "Most likely, you need to add virtual/pkgconfig to DEPEND."
21 + die "${FUNCNAME}: unsubstituted variable found in .pc"
22 fi
23
24 pc_libs+=( lib${arg#-l}.la )
25 --
26 2.12.0

Replies