[gentoo-commits] repo/gentoo:master commit in: dev-libs/protobuf/ - gentoo-commits

From:	Sam James <sam@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] repo/gentoo:master commit in: dev-libs/protobuf/
Date:	Tue, 04 Jan 2022 10:08:02
Message-Id:	`1641290859.a792e455bfcba4b7a462d1cadb1eab2ed1c3f7fc.sam@gentoo`

1

commit:     a792e455bfcba4b7a462d1cadb1eab2ed1c3f7fc

2

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

3

AuthorDate: Mon Dec  6 12:30:24 2021 +0000

4

Commit:     Sam James <sam <AT> gentoo <DOT> org>

5

CommitDate: Tue Jan  4 10:07:39 2022 +0000

6

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

7

8

dev-libs/protobuf: fix Objective-C compiler selection

9

10

During the protobuf configure phase, autotools gives priority

11

to GCC if $OBJC is unset, thus leading to cases where GCC is

12

used for Objective-C even though Clang is used for the rest

13

of the build, so we set OBJC to correctly picks up CC values.

14

15

Closes: https://bugs.gentoo.org/830584

16

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

17

Closes: https://github.com/gentoo/gentoo/pull/23197

18

Signed-off-by: Sam James <sam <AT> gentoo.org>

19

20

 dev-libs/protobuf/protobuf-3.16.0.ebuild | 3 ++-

21

 dev-libs/protobuf/protobuf-3.17.0.ebuild | 3 ++-

22

 dev-libs/protobuf/protobuf-3.17.1.ebuild | 3 ++-

23

 dev-libs/protobuf/protobuf-3.17.2.ebuild | 3 ++-

24

 dev-libs/protobuf/protobuf-3.17.3.ebuild | 3 ++-

25

 dev-libs/protobuf/protobuf-3.19.1.ebuild | 3 ++-

26

 dev-libs/protobuf/protobuf-9999.ebuild   | 3 ++-

27

 7 files changed, 14 insertions(+), 7 deletions(-)

28

29

diff --git a/dev-libs/protobuf/protobuf-3.16.0.ebuild b/dev-libs/protobuf/protobuf-3.16.0.ebuild

30

index ed6e85a966fb..68eb4507463b 100644

31

--- a/dev-libs/protobuf/protobuf-3.16.0.ebuild

32

+++ b/dev-libs/protobuf/protobuf-3.16.0.ebuild

33

@@ -1,4 +1,4 @@

34

-# Copyright 2008-2021 Gentoo Authors

35

+# Copyright 2008-2022 Gentoo Authors

36

 # Distributed under the terms of the GNU General Public License v2

37

38

 EAPI="7"

39

@@ -74,6 +74,7 @@ src_configure() {

40

41

 multilib_src_configure() {

42

 	local options=(

43

+		OBJC="$(tc-getBUILD_CC)"

44

 		$(use_enable static-libs static)

45

 		$(use_with zlib)

46

)

47

48

diff --git a/dev-libs/protobuf/protobuf-3.17.0.ebuild b/dev-libs/protobuf/protobuf-3.17.0.ebuild

49

index 6391fd499f34..390df7df0b7c 100644

50

--- a/dev-libs/protobuf/protobuf-3.17.0.ebuild

51

+++ b/dev-libs/protobuf/protobuf-3.17.0.ebuild

52

@@ -1,4 +1,4 @@

53

-# Copyright 2008-2021 Gentoo Authors

54

+# Copyright 2008-2022 Gentoo Authors

55

 # Distributed under the terms of the GNU General Public License v2

56

57

 EAPI="7"

58

@@ -74,6 +74,7 @@ src_configure() {

59

60

 multilib_src_configure() {

61

 	local options=(

62

+		OBJC="$(tc-getBUILD_CC)"

63

 		$(use_enable static-libs static)

64

 		$(use_with zlib)

65

)

66

67

diff --git a/dev-libs/protobuf/protobuf-3.17.1.ebuild b/dev-libs/protobuf/protobuf-3.17.1.ebuild

68

index 6391fd499f34..390df7df0b7c 100644

69

--- a/dev-libs/protobuf/protobuf-3.17.1.ebuild

70

+++ b/dev-libs/protobuf/protobuf-3.17.1.ebuild

71

@@ -1,4 +1,4 @@

72

-# Copyright 2008-2021 Gentoo Authors

73

+# Copyright 2008-2022 Gentoo Authors

74

 # Distributed under the terms of the GNU General Public License v2

75

76

 EAPI="7"

77

@@ -74,6 +74,7 @@ src_configure() {

78

79

 multilib_src_configure() {

80

 	local options=(

81

+		OBJC="$(tc-getBUILD_CC)"

82

 		$(use_enable static-libs static)

83

 		$(use_with zlib)

84

)

85

86

diff --git a/dev-libs/protobuf/protobuf-3.17.2.ebuild b/dev-libs/protobuf/protobuf-3.17.2.ebuild

87

index 6391fd499f34..390df7df0b7c 100644

88

--- a/dev-libs/protobuf/protobuf-3.17.2.ebuild

89

+++ b/dev-libs/protobuf/protobuf-3.17.2.ebuild

90

@@ -1,4 +1,4 @@

91

-# Copyright 2008-2021 Gentoo Authors

92

+# Copyright 2008-2022 Gentoo Authors

93

 # Distributed under the terms of the GNU General Public License v2

94

95

 EAPI="7"

96

@@ -74,6 +74,7 @@ src_configure() {

97

98

 multilib_src_configure() {

99

 	local options=(

100

+		OBJC="$(tc-getBUILD_CC)"

101

 		$(use_enable static-libs static)

102

 		$(use_with zlib)

103

)

104

105

diff --git a/dev-libs/protobuf/protobuf-3.17.3.ebuild b/dev-libs/protobuf/protobuf-3.17.3.ebuild

106

index 1254928d7c06..a29ab8dcb86c 100644

107

--- a/dev-libs/protobuf/protobuf-3.17.3.ebuild

108

+++ b/dev-libs/protobuf/protobuf-3.17.3.ebuild

109

@@ -1,4 +1,4 @@

110

-# Copyright 2008-2021 Gentoo Authors

111

+# Copyright 2008-2022 Gentoo Authors

112

 # Distributed under the terms of the GNU General Public License v2

113

114

 EAPI="7"

115

@@ -74,6 +74,7 @@ src_configure() {

116

117

 multilib_src_configure() {

118

 	local options=(

119

+		OBJC="$(tc-getBUILD_CC)"

120

 		$(use_enable static-libs static)

121

 		$(use_with zlib)

122

)

123

124

diff --git a/dev-libs/protobuf/protobuf-3.19.1.ebuild b/dev-libs/protobuf/protobuf-3.19.1.ebuild

125

index 534446b5f41a..41c154dc9b6a 100644

126

--- a/dev-libs/protobuf/protobuf-3.19.1.ebuild

127

+++ b/dev-libs/protobuf/protobuf-3.19.1.ebuild

128

@@ -1,4 +1,4 @@

129

-# Copyright 2008-2021 Gentoo Authors

130

+# Copyright 2008-2022 Gentoo Authors

131

 # Distributed under the terms of the GNU General Public License v2

132

133

 EAPI=7

134

@@ -71,6 +71,7 @@ src_configure() {

135

136

 multilib_src_configure() {

137

 	local options=(

138

+		OBJC="$(tc-getBUILD_CC)"

139

 		$(use_enable static-libs static)

140

 		$(use_with zlib)

141

)

142

143

diff --git a/dev-libs/protobuf/protobuf-9999.ebuild b/dev-libs/protobuf/protobuf-9999.ebuild

144

index cfe56720a1a3..f2b413703d21 100644

145

--- a/dev-libs/protobuf/protobuf-9999.ebuild

146

+++ b/dev-libs/protobuf/protobuf-9999.ebuild

147

@@ -1,4 +1,4 @@

148

-# Copyright 2008-2021 Gentoo Authors

149

+# Copyright 2008-2022 Gentoo Authors

150

 # Distributed under the terms of the GNU General Public License v2

151

152

 EAPI="7"

153

@@ -52,6 +52,7 @@ src_configure() {

154

155

 multilib_src_configure() {

156

 	local options=(

157

+		OBJC="$(tc-getBUILD_CC)"

158

 		$(use_enable static-libs static)

159

 		$(use_with zlib)

160

)

1	commit: a792e455bfcba4b7a462d1cadb1eab2ed1c3f7fc
2	Author: Adrian Ratiu <adrian.ratiu <AT> collabora <DOT> com>
3	AuthorDate: Mon Dec 6 12:30:24 2021 +0000
4	Commit: Sam James <sam <AT> gentoo <DOT> org>
5	CommitDate: Tue Jan 4 10:07:39 2022 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a792e455
7
8	dev-libs/protobuf: fix Objective-C compiler selection
9
10	During the protobuf configure phase, autotools gives priority
11	to GCC if $OBJC is unset, thus leading to cases where GCC is
12	used for Objective-C even though Clang is used for the rest
13	of the build, so we set OBJC to correctly picks up CC values.
14
15	Closes: https://bugs.gentoo.org/830584
16	Signed-off-by: Adrian Ratiu <adrian.ratiu <AT> collabora.com>
17	Closes: https://github.com/gentoo/gentoo/pull/23197
18	Signed-off-by: Sam James <sam <AT> gentoo.org>
19
20	dev-libs/protobuf/protobuf-3.16.0.ebuild \| 3 ++-
21	dev-libs/protobuf/protobuf-3.17.0.ebuild \| 3 ++-
22	dev-libs/protobuf/protobuf-3.17.1.ebuild \| 3 ++-
23	dev-libs/protobuf/protobuf-3.17.2.ebuild \| 3 ++-
24	dev-libs/protobuf/protobuf-3.17.3.ebuild \| 3 ++-
25	dev-libs/protobuf/protobuf-3.19.1.ebuild \| 3 ++-
26	dev-libs/protobuf/protobuf-9999.ebuild \| 3 ++-
27	7 files changed, 14 insertions(+), 7 deletions(-)
28
29	diff --git a/dev-libs/protobuf/protobuf-3.16.0.ebuild b/dev-libs/protobuf/protobuf-3.16.0.ebuild
30	index ed6e85a966fb..68eb4507463b 100644
31	--- a/dev-libs/protobuf/protobuf-3.16.0.ebuild
32	+++ b/dev-libs/protobuf/protobuf-3.16.0.ebuild
33	@@ -1,4 +1,4 @@
34	-# Copyright 2008-2021 Gentoo Authors
35	+# Copyright 2008-2022 Gentoo Authors
36	# Distributed under the terms of the GNU General Public License v2
37
38	EAPI="7"
39	@@ -74,6 +74,7 @@ src_configure() {
40
41	multilib_src_configure() {
42	local options=(
43	+ OBJC="$(tc-getBUILD_CC)"
44	$(use_enable static-libs static)
45	$(use_with zlib)
46	)
47
48	diff --git a/dev-libs/protobuf/protobuf-3.17.0.ebuild b/dev-libs/protobuf/protobuf-3.17.0.ebuild
49	index 6391fd499f34..390df7df0b7c 100644
50	--- a/dev-libs/protobuf/protobuf-3.17.0.ebuild
51	+++ b/dev-libs/protobuf/protobuf-3.17.0.ebuild
52	@@ -1,4 +1,4 @@
53	-# Copyright 2008-2021 Gentoo Authors
54	+# Copyright 2008-2022 Gentoo Authors
55	# Distributed under the terms of the GNU General Public License v2
56
57	EAPI="7"
58	@@ -74,6 +74,7 @@ src_configure() {
59
60	multilib_src_configure() {
61	local options=(
62	+ OBJC="$(tc-getBUILD_CC)"
63	$(use_enable static-libs static)
64	$(use_with zlib)
65	)
66
67	diff --git a/dev-libs/protobuf/protobuf-3.17.1.ebuild b/dev-libs/protobuf/protobuf-3.17.1.ebuild
68	index 6391fd499f34..390df7df0b7c 100644
69	--- a/dev-libs/protobuf/protobuf-3.17.1.ebuild
70	+++ b/dev-libs/protobuf/protobuf-3.17.1.ebuild
71	@@ -1,4 +1,4 @@
72	-# Copyright 2008-2021 Gentoo Authors
73	+# Copyright 2008-2022 Gentoo Authors
74	# Distributed under the terms of the GNU General Public License v2
75
76	EAPI="7"
77	@@ -74,6 +74,7 @@ src_configure() {
78
79	multilib_src_configure() {
80	local options=(
81	+ OBJC="$(tc-getBUILD_CC)"
82	$(use_enable static-libs static)
83	$(use_with zlib)
84	)
85
86	diff --git a/dev-libs/protobuf/protobuf-3.17.2.ebuild b/dev-libs/protobuf/protobuf-3.17.2.ebuild
87	index 6391fd499f34..390df7df0b7c 100644
88	--- a/dev-libs/protobuf/protobuf-3.17.2.ebuild
89	+++ b/dev-libs/protobuf/protobuf-3.17.2.ebuild
90	@@ -1,4 +1,4 @@
91	-# Copyright 2008-2021 Gentoo Authors
92	+# Copyright 2008-2022 Gentoo Authors
93	# Distributed under the terms of the GNU General Public License v2
94
95	EAPI="7"
96	@@ -74,6 +74,7 @@ src_configure() {
97
98	multilib_src_configure() {
99	local options=(
100	+ OBJC="$(tc-getBUILD_CC)"
101	$(use_enable static-libs static)
102	$(use_with zlib)
103	)
104
105	diff --git a/dev-libs/protobuf/protobuf-3.17.3.ebuild b/dev-libs/protobuf/protobuf-3.17.3.ebuild
106	index 1254928d7c06..a29ab8dcb86c 100644
107	--- a/dev-libs/protobuf/protobuf-3.17.3.ebuild
108	+++ b/dev-libs/protobuf/protobuf-3.17.3.ebuild
109	@@ -1,4 +1,4 @@
110	-# Copyright 2008-2021 Gentoo Authors
111	+# Copyright 2008-2022 Gentoo Authors
112	# Distributed under the terms of the GNU General Public License v2
113
114	EAPI="7"
115	@@ -74,6 +74,7 @@ src_configure() {
116
117	multilib_src_configure() {
118	local options=(
119	+ OBJC="$(tc-getBUILD_CC)"
120	$(use_enable static-libs static)
121	$(use_with zlib)
122	)
123
124	diff --git a/dev-libs/protobuf/protobuf-3.19.1.ebuild b/dev-libs/protobuf/protobuf-3.19.1.ebuild
125	index 534446b5f41a..41c154dc9b6a 100644
126	--- a/dev-libs/protobuf/protobuf-3.19.1.ebuild
127	+++ b/dev-libs/protobuf/protobuf-3.19.1.ebuild
128	@@ -1,4 +1,4 @@
129	-# Copyright 2008-2021 Gentoo Authors
130	+# Copyright 2008-2022 Gentoo Authors
131	# Distributed under the terms of the GNU General Public License v2
132
133	EAPI=7
134	@@ -71,6 +71,7 @@ src_configure() {
135
136	multilib_src_configure() {
137	local options=(
138	+ OBJC="$(tc-getBUILD_CC)"
139	$(use_enable static-libs static)
140	$(use_with zlib)
141	)
142
143	diff --git a/dev-libs/protobuf/protobuf-9999.ebuild b/dev-libs/protobuf/protobuf-9999.ebuild
144	index cfe56720a1a3..f2b413703d21 100644
145	--- a/dev-libs/protobuf/protobuf-9999.ebuild
146	+++ b/dev-libs/protobuf/protobuf-9999.ebuild
147	@@ -1,4 +1,4 @@
148	-# Copyright 2008-2021 Gentoo Authors
149	+# Copyright 2008-2022 Gentoo Authors
150	# Distributed under the terms of the GNU General Public License v2
151
152	EAPI="7"
153	@@ -52,6 +52,7 @@ src_configure() {
154
155	multilib_src_configure() {
156	local options=(
157	+ OBJC="$(tc-getBUILD_CC)"
158	$(use_enable static-libs static)
159	$(use_with zlib)
160	)

Gentoo Archives: gentoo-commits