Gentoo Archives: gentoo-dev

From: Adrian Ratiu <adrian.ratiu@×××××××××.com>
To: gentoo-dev@l.g.o
Cc: vapier@××××××××.org, Lars Wendler <polynomial-c@g.o>, Sam James <sam@g.o>
Subject: [gentoo-dev] [PATCH] media-libs/freetype: fix GCC usage during configure
Date: Fri, 07 Jan 2022 13:08:49
Message-Id: 20220107130813.1655260-1-adrian.ratiu@collabora.com
1 If $CC_BUILD is not set, configure defaults to GCC for some
2 of its tests causing clang builds to use a mixture of the
3 two compilers instead of using just clang consistently.
4
5 Here is an example before and after setting CC_BUILD (this
6 is actually from ChromiumOS where this was first detected).
7
8 before:
9
10 checking for x86_64-pc-linux-gnu-gcc... x86_64-pc-linux-gnu-gcc
11 checking for x86_64-pc-linux-gnu-gcc... (cached) x86_64-pc-linux-gnu-gcc
12 checking for x86_64-pc-linux-gnu-gcc... (cached) x86_64-pc-linux-gnu-gcc
13 checking for suffix of native executables...
14
15 after:
16
17 checking for x86_64-pc-linux-gnu-gcc... x86_64-cros-linux-gnu-clang
18 checking for x86_64-pc-linux-gnu-gcc... (cached) x86_64-cros-linux-gnu-clang
19 checking for x86_64-pc-linux-gnu-gcc... (cached) x86_64-cros-linux-gnu-clang
20 checking for suffix of native executables...
21
22 Signed-off-by: Adrian Ratiu <adrian.ratiu@×××××××××.com>
23 ---
24 media-libs/freetype/freetype-2.11.0-r1.ebuild | 2 ++
25 media-libs/freetype/freetype-2.11.0-r2.ebuild | 2 ++
26 media-libs/freetype/freetype-2.11.1.ebuild | 2 ++
27 media-libs/freetype/freetype-9999.ebuild | 2 ++
28 4 files changed, 8 insertions(+)
29
30 diff --git a/media-libs/freetype/freetype-2.11.0-r1.ebuild b/media-libs/freetype/freetype-2.11.0-r1.ebuild
31 index b4e9e81a703..c9d88a7e108 100644
32 --- a/media-libs/freetype/freetype-2.11.0-r1.ebuild
33 +++ b/media-libs/freetype/freetype-2.11.0-r1.ebuild
34 @@ -203,6 +203,8 @@ multilib_src_configure() {
35 *) myeconfargs+=( ac_cv_prog_RC= ac_cv_prog_ac_ct_RC= ) ;;
36 esac
37
38 + export CC_BUILD="$(tc-getBUILD_CC)"
39 +
40 ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
41 }
42
43 diff --git a/media-libs/freetype/freetype-2.11.0-r2.ebuild b/media-libs/freetype/freetype-2.11.0-r2.ebuild
44 index 658322e92af..27f4cfde1ab 100644
45 --- a/media-libs/freetype/freetype-2.11.0-r2.ebuild
46 +++ b/media-libs/freetype/freetype-2.11.0-r2.ebuild
47 @@ -204,6 +204,8 @@ multilib_src_configure() {
48 *) myeconfargs+=( ac_cv_prog_RC= ac_cv_prog_ac_ct_RC= ) ;;
49 esac
50
51 + export CC_BUILD="$(tc-getBUILD_CC)"
52 +
53 ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
54 }
55
56 diff --git a/media-libs/freetype/freetype-2.11.1.ebuild b/media-libs/freetype/freetype-2.11.1.ebuild
57 index d0c71e729b9..7e891890302 100644
58 --- a/media-libs/freetype/freetype-2.11.1.ebuild
59 +++ b/media-libs/freetype/freetype-2.11.1.ebuild
60 @@ -195,6 +195,8 @@ multilib_src_configure() {
61 *) myeconfargs+=( ac_cv_prog_RC= ac_cv_prog_ac_ct_RC= ) ;;
62 esac
63
64 + export CC_BUILD="$(tc-getBUILD_CC)"
65 +
66 ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
67 }
68
69 diff --git a/media-libs/freetype/freetype-9999.ebuild b/media-libs/freetype/freetype-9999.ebuild
70 index d0c71e729b9..7e891890302 100644
71 --- a/media-libs/freetype/freetype-9999.ebuild
72 +++ b/media-libs/freetype/freetype-9999.ebuild
73 @@ -195,6 +195,8 @@ multilib_src_configure() {
74 *) myeconfargs+=( ac_cv_prog_RC= ac_cv_prog_ac_ct_RC= ) ;;
75 esac
76
77 + export CC_BUILD="$(tc-getBUILD_CC)"
78 +
79 ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
80 }
81
82 --
83 2.34.1

Replies