[gentoo-commits] repo/gentoo:master commit in: app-arch/zstd/ - gentoo-commits

From:	Lars Wendler <polynomial-c@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] repo/gentoo:master commit in: app-arch/zstd/
Date:	Wed, 17 Apr 2019 13:21:10
Message-Id:	`1555507260.60b3ee89cdb77a16333e04f024306c07478f4237.polynomial-c@gentoo`

1

commit:     60b3ee89cdb77a16333e04f024306c07478f4237

2

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

3

AuthorDate: Wed Apr 17 13:19:07 2019 +0000

4

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

5

CommitDate: Wed Apr 17 13:21:00 2019 +0000

6

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

7

8

app-arch/zstd: Simplified multilib ebuilds

9

10

Package-Manager: Portage-2.3.63, Repoman-2.3.12

11

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

12

13

 app-arch/zstd/zstd-1.3.7-r1.ebuild | 40 +++++++++++++-------------------------

14

 app-arch/zstd/zstd-1.3.8.ebuild    | 40 +++++++++++++-------------------------

15

 app-arch/zstd/zstd-1.4.0.ebuild    | 40 +++++++++++++-------------------------

16

 3 files changed, 39 insertions(+), 81 deletions(-)

17

18

diff --git a/app-arch/zstd/zstd-1.3.7-r1.ebuild b/app-arch/zstd/zstd-1.3.7-r1.ebuild

19

index 86934ff67a4..1561c0dd4a5 100644

20

--- a/app-arch/zstd/zstd-1.3.7-r1.ebuild

21

+++ b/app-arch/zstd/zstd-1.3.7-r1.ebuild

22

@@ -23,47 +23,33 @@ src_prepare() {

23

 	multilib_copy_sources

24

}

25

26

-multilib_src_compile() {

27

-	emake -C lib \

28

+mymake() {

29

+	emake \

30

 		CC="$(tc-getCC)" \

31

+		CXX="$(tc-getCXX)" \

32

 		AR="$(tc-getAR)" \

33

 		PREFIX="${EPREFIX}/usr" \

34

 		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \

35

-		libzstd libzstd.a libzstd.pc

36

+		"${@}"

37

+}

38

+

39

+multilib_src_compile() {

40

+	mymake -C lib libzstd libzstd.a libzstd.pc

41

42

 	if multilib_is_native_abi ; then

43

-		emake \

44

-			CC="$(tc-getCC)" \

45

-			AR="$(tc-getAR)" \

46

-			HAVE_LZ4=$(usex lz4 1 0) \

47

-			PREFIX="${EPREFIX}/usr" \

48

-			LIBDIR="${EPREFIX}/usr/$(get_libdir)" zstd

49

+		mymake zstd

50

51

-		emake -C contrib/pzstd \

52

-			CC="$(tc-getCC)" \

53

-			CXX="$(tc-getCXX)" \

54

-			AR="$(tc-getAR)" \

55

-			PREFIX="${EPREFIX}/usr" \

56

-			LIBDIR="${EPREFIX}/usr/$(get_libdir)"

57

+		mymake -C contrib/pzstd

58

fi

59

}

60

61

 multilib_src_install() {

62

-	emake -C lib \

63

-		DESTDIR="${D}" \

64

-		PREFIX="${EPREFIX}/usr" \

65

-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" install

66

+	mymake -C lib DESTDIR="${D}" install

67

68

 	if multilib_is_native_abi ; then

69

-		emake -C programs \

70

-			DESTDIR="${D}" \

71

-			PREFIX="${EPREFIX}/usr" \

72

-			LIBDIR="${EPREFIX}/usr/$(get_libdir)" install

73

+		mymake -C programs DESTDIR="${D}" install

74

75

-		emake -C contrib/pzstd \

76

-			DESTDIR="${D}" \

77

-			PREFIX="${EPREFIX}/usr" \

78

-			LIBDIR="${EPREFIX}/usr/$(get_libdir)" install

79

+		mymake -C contrib/pzstd DESTDIR="${D}" install

80

fi

81

}

82

83

84

diff --git a/app-arch/zstd/zstd-1.3.8.ebuild b/app-arch/zstd/zstd-1.3.8.ebuild

85

index 51e41cc42c0..2704ae6a18f 100644

86

--- a/app-arch/zstd/zstd-1.3.8.ebuild

87

+++ b/app-arch/zstd/zstd-1.3.8.ebuild

88

@@ -23,47 +23,33 @@ src_prepare() {

89

 	multilib_copy_sources

90

}

91

92

-multilib_src_compile() {

93

-	emake -C lib \

94

+mymake() {

95

+	emake \

96

 		CC="$(tc-getCC)" \

97

+		CXX="$(tc-getCXX)" \

98

 		AR="$(tc-getAR)" \

99

 		PREFIX="${EPREFIX}/usr" \

100

 		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \

101

-		libzstd libzstd.a libzstd.pc

102

+		"${@}"

103

+}

104

+

105

+multilib_src_compile() {

106

+	mymake -C lib libzstd libzstd.a libzstd.pc

107

108

 	if multilib_is_native_abi ; then

109

-		emake \

110

-			CC="$(tc-getCC)" \

111

-			AR="$(tc-getAR)" \

112

-			HAVE_LZ4=$(usex lz4 1 0) \

113

-			PREFIX="${EPREFIX}/usr" \

114

-			LIBDIR="${EPREFIX}/usr/$(get_libdir)" zstd

115

+		mymake zstd

116

117

-		emake -C contrib/pzstd \

118

-			CC="$(tc-getCC)" \

119

-			CXX="$(tc-getCXX)" \

120

-			AR="$(tc-getAR)" \

121

-			PREFIX="${EPREFIX}/usr" \

122

-			LIBDIR="${EPREFIX}/usr/$(get_libdir)"

123

+		mymake -C contrib/pzstd

124

fi

125

}

126

127

 multilib_src_install() {

128

-	emake -C lib \

129

-		DESTDIR="${D}" \

130

-		PREFIX="${EPREFIX}/usr" \

131

-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" install

132

+	mymake -C lib DESTDIR="${D}" install

133

134

 	if multilib_is_native_abi ; then

135

-		emake -C programs \

136

-			DESTDIR="${D}" \

137

-			PREFIX="${EPREFIX}/usr" \

138

-			LIBDIR="${EPREFIX}/usr/$(get_libdir)" install

139

+		mymake -C programs DESTDIR="${D}" install

140

141

-		emake -C contrib/pzstd \

142

-			DESTDIR="${D}" \

143

-			PREFIX="${EPREFIX}/usr" \

144

-			LIBDIR="${EPREFIX}/usr/$(get_libdir)" install

145

+		mymake -C contrib/pzstd DESTDIR="${D}" install

146

fi

147

}

148

149

150

diff --git a/app-arch/zstd/zstd-1.4.0.ebuild b/app-arch/zstd/zstd-1.4.0.ebuild

151

index 51e41cc42c0..2704ae6a18f 100644

152

--- a/app-arch/zstd/zstd-1.4.0.ebuild

153

+++ b/app-arch/zstd/zstd-1.4.0.ebuild

154

@@ -23,47 +23,33 @@ src_prepare() {

155

 	multilib_copy_sources

156

}

157

158

-multilib_src_compile() {

159

-	emake -C lib \

160

+mymake() {

161

+	emake \

162

 		CC="$(tc-getCC)" \

163

+		CXX="$(tc-getCXX)" \

164

 		AR="$(tc-getAR)" \

165

 		PREFIX="${EPREFIX}/usr" \

166

 		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \

167

-		libzstd libzstd.a libzstd.pc

168

+		"${@}"

169

+}

170

+

171

+multilib_src_compile() {

172

+	mymake -C lib libzstd libzstd.a libzstd.pc

173

174

 	if multilib_is_native_abi ; then

175

-		emake \

176

-			CC="$(tc-getCC)" \

177

-			AR="$(tc-getAR)" \

178

-			HAVE_LZ4=$(usex lz4 1 0) \

179

-			PREFIX="${EPREFIX}/usr" \

180

-			LIBDIR="${EPREFIX}/usr/$(get_libdir)" zstd

181

+		mymake zstd

182

183

-		emake -C contrib/pzstd \

184

-			CC="$(tc-getCC)" \

185

-			CXX="$(tc-getCXX)" \

186

-			AR="$(tc-getAR)" \

187

-			PREFIX="${EPREFIX}/usr" \

188

-			LIBDIR="${EPREFIX}/usr/$(get_libdir)"

189

+		mymake -C contrib/pzstd

190

fi

191

}

192

193

 multilib_src_install() {

194

-	emake -C lib \

195

-		DESTDIR="${D}" \

196

-		PREFIX="${EPREFIX}/usr" \

197

-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" install

198

+	mymake -C lib DESTDIR="${D}" install

199

200

 	if multilib_is_native_abi ; then

201

-		emake -C programs \

202

-			DESTDIR="${D}" \

203

-			PREFIX="${EPREFIX}/usr" \

204

-			LIBDIR="${EPREFIX}/usr/$(get_libdir)" install

205

+		mymake -C programs DESTDIR="${D}" install

206

207

-		emake -C contrib/pzstd \

208

-			DESTDIR="${D}" \

209

-			PREFIX="${EPREFIX}/usr" \

210

-			LIBDIR="${EPREFIX}/usr/$(get_libdir)" install

211

+		mymake -C contrib/pzstd DESTDIR="${D}" install

212

fi

213

}

1	commit: 60b3ee89cdb77a16333e04f024306c07478f4237
2	Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3	AuthorDate: Wed Apr 17 13:19:07 2019 +0000
4	Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5	CommitDate: Wed Apr 17 13:21:00 2019 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60b3ee89
7
8	app-arch/zstd: Simplified multilib ebuilds
9
10	Package-Manager: Portage-2.3.63, Repoman-2.3.12
11	Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
12
13	app-arch/zstd/zstd-1.3.7-r1.ebuild \| 40 +++++++++++++-------------------------
14	app-arch/zstd/zstd-1.3.8.ebuild \| 40 +++++++++++++-------------------------
15	app-arch/zstd/zstd-1.4.0.ebuild \| 40 +++++++++++++-------------------------
16	3 files changed, 39 insertions(+), 81 deletions(-)
17
18	diff --git a/app-arch/zstd/zstd-1.3.7-r1.ebuild b/app-arch/zstd/zstd-1.3.7-r1.ebuild
19	index 86934ff67a4..1561c0dd4a5 100644
20	--- a/app-arch/zstd/zstd-1.3.7-r1.ebuild
21	+++ b/app-arch/zstd/zstd-1.3.7-r1.ebuild
22	@@ -23,47 +23,33 @@ src_prepare() {
23	multilib_copy_sources
24	}
25
26	-multilib_src_compile() {
27	- emake -C lib \
28	+mymake() {
29	+ emake \
30	CC="$(tc-getCC)" \
31	+ CXX="$(tc-getCXX)" \
32	AR="$(tc-getAR)" \
33	PREFIX="${EPREFIX}/usr" \
34	LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
35	- libzstd libzstd.a libzstd.pc
36	+ "${@}"
37	+}
38	+
39	+multilib_src_compile() {
40	+ mymake -C lib libzstd libzstd.a libzstd.pc
41
42	if multilib_is_native_abi ; then
43	- emake \
44	- CC="$(tc-getCC)" \
45	- AR="$(tc-getAR)" \
46	- HAVE_LZ4=$(usex lz4 1 0) \
47	- PREFIX="${EPREFIX}/usr" \
48	- LIBDIR="${EPREFIX}/usr/$(get_libdir)" zstd
49	+ mymake zstd
50
51	- emake -C contrib/pzstd \
52	- CC="$(tc-getCC)" \
53	- CXX="$(tc-getCXX)" \
54	- AR="$(tc-getAR)" \
55	- PREFIX="${EPREFIX}/usr" \
56	- LIBDIR="${EPREFIX}/usr/$(get_libdir)"
57	+ mymake -C contrib/pzstd
58	fi
59	}
60
61	multilib_src_install() {
62	- emake -C lib \
63	- DESTDIR="${D}" \
64	- PREFIX="${EPREFIX}/usr" \
65	- LIBDIR="${EPREFIX}/usr/$(get_libdir)" install
66	+ mymake -C lib DESTDIR="${D}" install
67
68	if multilib_is_native_abi ; then
69	- emake -C programs \
70	- DESTDIR="${D}" \
71	- PREFIX="${EPREFIX}/usr" \
72	- LIBDIR="${EPREFIX}/usr/$(get_libdir)" install
73	+ mymake -C programs DESTDIR="${D}" install
74
75	- emake -C contrib/pzstd \
76	- DESTDIR="${D}" \
77	- PREFIX="${EPREFIX}/usr" \
78	- LIBDIR="${EPREFIX}/usr/$(get_libdir)" install
79	+ mymake -C contrib/pzstd DESTDIR="${D}" install
80	fi
81	}
82
83
84	diff --git a/app-arch/zstd/zstd-1.3.8.ebuild b/app-arch/zstd/zstd-1.3.8.ebuild
85	index 51e41cc42c0..2704ae6a18f 100644
86	--- a/app-arch/zstd/zstd-1.3.8.ebuild
87	+++ b/app-arch/zstd/zstd-1.3.8.ebuild
88	@@ -23,47 +23,33 @@ src_prepare() {
89	multilib_copy_sources
90	}
91
92	-multilib_src_compile() {
93	- emake -C lib \
94	+mymake() {
95	+ emake \
96	CC="$(tc-getCC)" \
97	+ CXX="$(tc-getCXX)" \
98	AR="$(tc-getAR)" \
99	PREFIX="${EPREFIX}/usr" \
100	LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
101	- libzstd libzstd.a libzstd.pc
102	+ "${@}"
103	+}
104	+
105	+multilib_src_compile() {
106	+ mymake -C lib libzstd libzstd.a libzstd.pc
107
108	if multilib_is_native_abi ; then
109	- emake \
110	- CC="$(tc-getCC)" \
111	- AR="$(tc-getAR)" \
112	- HAVE_LZ4=$(usex lz4 1 0) \
113	- PREFIX="${EPREFIX}/usr" \
114	- LIBDIR="${EPREFIX}/usr/$(get_libdir)" zstd
115	+ mymake zstd
116
117	- emake -C contrib/pzstd \
118	- CC="$(tc-getCC)" \
119	- CXX="$(tc-getCXX)" \
120	- AR="$(tc-getAR)" \
121	- PREFIX="${EPREFIX}/usr" \
122	- LIBDIR="${EPREFIX}/usr/$(get_libdir)"
123	+ mymake -C contrib/pzstd
124	fi
125	}
126
127	multilib_src_install() {
128	- emake -C lib \
129	- DESTDIR="${D}" \
130	- PREFIX="${EPREFIX}/usr" \
131	- LIBDIR="${EPREFIX}/usr/$(get_libdir)" install
132	+ mymake -C lib DESTDIR="${D}" install
133
134	if multilib_is_native_abi ; then
135	- emake -C programs \
136	- DESTDIR="${D}" \
137	- PREFIX="${EPREFIX}/usr" \
138	- LIBDIR="${EPREFIX}/usr/$(get_libdir)" install
139	+ mymake -C programs DESTDIR="${D}" install
140
141	- emake -C contrib/pzstd \
142	- DESTDIR="${D}" \
143	- PREFIX="${EPREFIX}/usr" \
144	- LIBDIR="${EPREFIX}/usr/$(get_libdir)" install
145	+ mymake -C contrib/pzstd DESTDIR="${D}" install
146	fi
147	}
148
149
150	diff --git a/app-arch/zstd/zstd-1.4.0.ebuild b/app-arch/zstd/zstd-1.4.0.ebuild
151	index 51e41cc42c0..2704ae6a18f 100644
152	--- a/app-arch/zstd/zstd-1.4.0.ebuild
153	+++ b/app-arch/zstd/zstd-1.4.0.ebuild
154	@@ -23,47 +23,33 @@ src_prepare() {
155	multilib_copy_sources
156	}
157
158	-multilib_src_compile() {
159	- emake -C lib \
160	+mymake() {
161	+ emake \
162	CC="$(tc-getCC)" \
163	+ CXX="$(tc-getCXX)" \
164	AR="$(tc-getAR)" \
165	PREFIX="${EPREFIX}/usr" \
166	LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
167	- libzstd libzstd.a libzstd.pc
168	+ "${@}"
169	+}
170	+
171	+multilib_src_compile() {
172	+ mymake -C lib libzstd libzstd.a libzstd.pc
173
174	if multilib_is_native_abi ; then
175	- emake \
176	- CC="$(tc-getCC)" \
177	- AR="$(tc-getAR)" \
178	- HAVE_LZ4=$(usex lz4 1 0) \
179	- PREFIX="${EPREFIX}/usr" \
180	- LIBDIR="${EPREFIX}/usr/$(get_libdir)" zstd
181	+ mymake zstd
182
183	- emake -C contrib/pzstd \
184	- CC="$(tc-getCC)" \
185	- CXX="$(tc-getCXX)" \
186	- AR="$(tc-getAR)" \
187	- PREFIX="${EPREFIX}/usr" \
188	- LIBDIR="${EPREFIX}/usr/$(get_libdir)"
189	+ mymake -C contrib/pzstd
190	fi
191	}
192
193	multilib_src_install() {
194	- emake -C lib \
195	- DESTDIR="${D}" \
196	- PREFIX="${EPREFIX}/usr" \
197	- LIBDIR="${EPREFIX}/usr/$(get_libdir)" install
198	+ mymake -C lib DESTDIR="${D}" install
199
200	if multilib_is_native_abi ; then
201	- emake -C programs \
202	- DESTDIR="${D}" \
203	- PREFIX="${EPREFIX}/usr" \
204	- LIBDIR="${EPREFIX}/usr/$(get_libdir)" install
205	+ mymake -C programs DESTDIR="${D}" install
206
207	- emake -C contrib/pzstd \
208	- DESTDIR="${D}" \
209	- PREFIX="${EPREFIX}/usr" \
210	- LIBDIR="${EPREFIX}/usr/$(get_libdir)" install
211	+ mymake -C contrib/pzstd DESTDIR="${D}" install
212	fi
213	}

Gentoo Archives: gentoo-commits