[gentoo-commits] repo/gentoo:master commit in: media-libs/freetype/ - gentoo-commits

From:	Lars Wendler <polynomial-c@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] repo/gentoo:master commit in: media-libs/freetype/
Date:	Fri, 07 Jan 2022 21:28:16
Message-Id:	`1641590828.355c5b5715ffcf787c421d03209642d2823cf1f7.polynomial-c@gentoo`

1

commit:     355c5b5715ffcf787c421d03209642d2823cf1f7

2

Author:     Adrian Ratiu <adrian.ratiu <AT> collabora <DOT> com>

3

AuthorDate: Fri Jan  7 13:08:13 2022 +0000

4

Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>

5

CommitDate: Fri Jan  7 21:27:08 2022 +0000

6

URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=355c5b57

7

8

media-libs/freetype: fix GCC usage during configure

9

10

If $CC_BUILD is not set, configure defaults to GCC for some

11

of its tests causing clang builds to use a mixture of the

12

two compilers instead of using just clang consistently.

13

14

Here is an example before and after setting CC_BUILD (this

15

is actually from ChromiumOS where this was first detected).

16

17

before:

18

19

checking for x86_64-pc-linux-gnu-gcc... x86_64-pc-linux-gnu-gcc

20

checking for x86_64-pc-linux-gnu-gcc... (cached) x86_64-pc-linux-gnu-gcc

21

checking for x86_64-pc-linux-gnu-gcc... (cached) x86_64-pc-linux-gnu-gcc

22

checking for suffix of native executables...

23

24

after:

25

26

checking for x86_64-pc-linux-gnu-gcc... x86_64-cros-linux-gnu-clang

27

checking for x86_64-pc-linux-gnu-gcc... (cached) x86_64-cros-linux-gnu-clang

28

checking for x86_64-pc-linux-gnu-gcc... (cached) x86_64-cros-linux-gnu-clang

29

checking for suffix of native executables...

30

31

Signed-off-by: Adrian Ratiu <adrian.ratiu <AT> collabora.com>

32

Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

33

34

 media-libs/freetype/freetype-2.11.0-r1.ebuild | 2 ++

35

 media-libs/freetype/freetype-2.11.0-r2.ebuild | 2 ++

36

 media-libs/freetype/freetype-2.11.1.ebuild    | 2 ++

37

 media-libs/freetype/freetype-9999.ebuild      | 2 ++

38

 4 files changed, 8 insertions(+)

39

40

diff --git a/media-libs/freetype/freetype-2.11.0-r1.ebuild b/media-libs/freetype/freetype-2.11.0-r1.ebuild

41

index b4e9e81a7039..c9d88a7e1080 100644

42

--- a/media-libs/freetype/freetype-2.11.0-r1.ebuild

43

+++ b/media-libs/freetype/freetype-2.11.0-r1.ebuild

44

@@ -203,6 +203,8 @@ multilib_src_configure() {

45

 		*) myeconfargs+=( ac_cv_prog_RC= ac_cv_prog_ac_ct_RC= ) ;;

46

 	esac

47

48

+	export CC_BUILD="$(tc-getBUILD_CC)"

49

+

50

 	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"

51

}

52

53

54

diff --git a/media-libs/freetype/freetype-2.11.0-r2.ebuild b/media-libs/freetype/freetype-2.11.0-r2.ebuild

55

index 658322e92afa..27f4cfde1ab2 100644

56

--- a/media-libs/freetype/freetype-2.11.0-r2.ebuild

57

+++ b/media-libs/freetype/freetype-2.11.0-r2.ebuild

58

@@ -204,6 +204,8 @@ multilib_src_configure() {

59

 		*) myeconfargs+=( ac_cv_prog_RC= ac_cv_prog_ac_ct_RC= ) ;;

60

 	esac

61

62

+	export CC_BUILD="$(tc-getBUILD_CC)"

63

+

64

 	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"

65

}

66

67

68

diff --git a/media-libs/freetype/freetype-2.11.1.ebuild b/media-libs/freetype/freetype-2.11.1.ebuild

69

index d0c71e729b9c..7e8918903023 100644

70

--- a/media-libs/freetype/freetype-2.11.1.ebuild

71

+++ b/media-libs/freetype/freetype-2.11.1.ebuild

72

@@ -195,6 +195,8 @@ multilib_src_configure() {

73

 		*) myeconfargs+=( ac_cv_prog_RC= ac_cv_prog_ac_ct_RC= ) ;;

74

 	esac

75

76

+	export CC_BUILD="$(tc-getBUILD_CC)"

77

+

78

 	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"

79

}

80

81

82

diff --git a/media-libs/freetype/freetype-9999.ebuild b/media-libs/freetype/freetype-9999.ebuild

83

index d0c71e729b9c..7e8918903023 100644

84

--- a/media-libs/freetype/freetype-9999.ebuild

85

+++ b/media-libs/freetype/freetype-9999.ebuild

86

@@ -195,6 +195,8 @@ multilib_src_configure() {

87

 		*) myeconfargs+=( ac_cv_prog_RC= ac_cv_prog_ac_ct_RC= ) ;;

88

 	esac

89

90

+	export CC_BUILD="$(tc-getBUILD_CC)"

91

+

92

 	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"

93

}

1	commit: 355c5b5715ffcf787c421d03209642d2823cf1f7
2	Author: Adrian Ratiu <adrian.ratiu <AT> collabora <DOT> com>
3	AuthorDate: Fri Jan 7 13:08:13 2022 +0000
4	Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5	CommitDate: Fri Jan 7 21:27:08 2022 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=355c5b57
7
8	media-libs/freetype: fix GCC usage during configure
9
10	If $CC_BUILD is not set, configure defaults to GCC for some
11	of its tests causing clang builds to use a mixture of the
12	two compilers instead of using just clang consistently.
13
14	Here is an example before and after setting CC_BUILD (this
15	is actually from ChromiumOS where this was first detected).
16
17	before:
18
19	checking for x86_64-pc-linux-gnu-gcc... x86_64-pc-linux-gnu-gcc
20	checking for x86_64-pc-linux-gnu-gcc... (cached) x86_64-pc-linux-gnu-gcc
21	checking for x86_64-pc-linux-gnu-gcc... (cached) x86_64-pc-linux-gnu-gcc
22	checking for suffix of native executables...
23
24	after:
25
26	checking for x86_64-pc-linux-gnu-gcc... x86_64-cros-linux-gnu-clang
27	checking for x86_64-pc-linux-gnu-gcc... (cached) x86_64-cros-linux-gnu-clang
28	checking for x86_64-pc-linux-gnu-gcc... (cached) x86_64-cros-linux-gnu-clang
29	checking for suffix of native executables...
30
31	Signed-off-by: Adrian Ratiu <adrian.ratiu <AT> collabora.com>
32	Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
33
34	media-libs/freetype/freetype-2.11.0-r1.ebuild \| 2 ++
35	media-libs/freetype/freetype-2.11.0-r2.ebuild \| 2 ++
36	media-libs/freetype/freetype-2.11.1.ebuild \| 2 ++
37	media-libs/freetype/freetype-9999.ebuild \| 2 ++
38	4 files changed, 8 insertions(+)
39
40	diff --git a/media-libs/freetype/freetype-2.11.0-r1.ebuild b/media-libs/freetype/freetype-2.11.0-r1.ebuild
41	index b4e9e81a7039..c9d88a7e1080 100644
42	--- a/media-libs/freetype/freetype-2.11.0-r1.ebuild
43	+++ b/media-libs/freetype/freetype-2.11.0-r1.ebuild
44	@@ -203,6 +203,8 @@ multilib_src_configure() {
45	*) myeconfargs+=( ac_cv_prog_RC= ac_cv_prog_ac_ct_RC= ) ;;
46	esac
47
48	+ export CC_BUILD="$(tc-getBUILD_CC)"
49	+
50	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
51	}
52
53
54	diff --git a/media-libs/freetype/freetype-2.11.0-r2.ebuild b/media-libs/freetype/freetype-2.11.0-r2.ebuild
55	index 658322e92afa..27f4cfde1ab2 100644
56	--- a/media-libs/freetype/freetype-2.11.0-r2.ebuild
57	+++ b/media-libs/freetype/freetype-2.11.0-r2.ebuild
58	@@ -204,6 +204,8 @@ multilib_src_configure() {
59	*) myeconfargs+=( ac_cv_prog_RC= ac_cv_prog_ac_ct_RC= ) ;;
60	esac
61
62	+ export CC_BUILD="$(tc-getBUILD_CC)"
63	+
64	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
65	}
66
67
68	diff --git a/media-libs/freetype/freetype-2.11.1.ebuild b/media-libs/freetype/freetype-2.11.1.ebuild
69	index d0c71e729b9c..7e8918903023 100644
70	--- a/media-libs/freetype/freetype-2.11.1.ebuild
71	+++ b/media-libs/freetype/freetype-2.11.1.ebuild
72	@@ -195,6 +195,8 @@ multilib_src_configure() {
73	*) myeconfargs+=( ac_cv_prog_RC= ac_cv_prog_ac_ct_RC= ) ;;
74	esac
75
76	+ export CC_BUILD="$(tc-getBUILD_CC)"
77	+
78	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
79	}
80
81
82	diff --git a/media-libs/freetype/freetype-9999.ebuild b/media-libs/freetype/freetype-9999.ebuild
83	index d0c71e729b9c..7e8918903023 100644
84	--- a/media-libs/freetype/freetype-9999.ebuild
85	+++ b/media-libs/freetype/freetype-9999.ebuild
86	@@ -195,6 +195,8 @@ multilib_src_configure() {
87	*) myeconfargs+=( ac_cv_prog_RC= ac_cv_prog_ac_ct_RC= ) ;;
88	esac
89
90	+ export CC_BUILD="$(tc-getBUILD_CC)"
91	+
92	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
93	}

Gentoo Archives: gentoo-commits