Gentoo Archives: gentoo-commits

From: Fabian Groffen <grobian@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/portage:prefix commit in: bin/
Date: Sat, 28 Nov 2020 19:47:45
Message-Id: 1606592700.126b9931af386e5fe185f281595bf2da0156201c.grobian@gentoo
1 commit: 126b9931af386e5fe185f281595bf2da0156201c
2 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
3 AuthorDate: Sat Nov 28 19:45:00 2020 +0000
4 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
5 CommitDate: Sat Nov 28 19:45:00 2020 +0000
6 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=126b9931
7
8 bin/misc-functions: also resolve Frameworks from macOS SDK
9
10 Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
11
12 bin/misc-functions.sh | 4 +++-
13 1 file changed, 3 insertions(+), 1 deletion(-)
14
15 diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh
16 index 8f62cb7f1..c75c478ee 100755
17 --- a/bin/misc-functions.sh
18 +++ b/bin/misc-functions.sh
19 @@ -372,8 +372,10 @@ install_qa_check_macho() {
20 # by looking at the SDK metacaches, TAPI-files, .tbd
21 # text versions of libraries, so just look there
22 local tbd=${lib%.*}.tbd
23 - if [[ -e ${EROOT}/MacOSX.sdk/${tbd} ]] ; then
24 + if [[ -e ${EROOT}/MacOSX.sdk/${lib%.*}.tbd ]] ; then
25 isok=yes # it's in the SDK, so ok
26 + elif [[ -e ${EROOT}/MacOSX.sdk/${lib}.tbd ]] ; then
27 + isok=yes # this happens in case of Framework refs
28 fi
29 fi
30 if [[ ${isok} == no ]] ; then