1 |
commit: 32961e61fdd8aef2d28e533c01ca81d90140f7ff |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Jun 18 20:54:19 2021 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jun 18 21:08:29 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32961e61 |
7 |
|
8 |
dev-lang/ocaml: fix installed Portage set libdir target |
9 |
|
10 |
Closes: https://bugs.gentoo.org/796641 |
11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
12 |
|
13 |
.../{ocaml-4.05.0-r5.ebuild => ocaml-4.05.0-r7.ebuild} | 10 ++++++++-- |
14 |
.../{ocaml-4.05.0-r6.ebuild => ocaml-4.05.0-r8.ebuild} | 12 +++++++++--- |
15 |
.../{ocaml-4.09.0-r1.ebuild => ocaml-4.09.0-r2.ebuild} | 11 ++++++++--- |
16 |
.../{ocaml-4.10.2-r1.ebuild => ocaml-4.10.2-r2.ebuild} | 10 +++++++--- |
17 |
.../{ocaml-4.11.2-r1.ebuild => ocaml-4.11.2-r2.ebuild} | 15 ++++++++++----- |
18 |
.../{ocaml-4.12.0-r1.ebuild => ocaml-4.12.0-r2.ebuild} | 14 +++++++++----- |
19 |
6 files changed, 51 insertions(+), 21 deletions(-) |
20 |
|
21 |
diff --git a/dev-lang/ocaml/ocaml-4.05.0-r5.ebuild b/dev-lang/ocaml/ocaml-4.05.0-r7.ebuild |
22 |
similarity index 96% |
23 |
rename from dev-lang/ocaml/ocaml-4.05.0-r5.ebuild |
24 |
rename to dev-lang/ocaml/ocaml-4.05.0-r7.ebuild |
25 |
index 36adb282101..ebd032a4fd8 100644 |
26 |
--- a/dev-lang/ocaml/ocaml-4.05.0-r5.ebuild |
27 |
+++ b/dev-lang/ocaml/ocaml-4.05.0-r7.ebuild |
28 |
@@ -50,6 +50,9 @@ pkg_setup() { |
29 |
|
30 |
src_prepare() { |
31 |
EPATCH_SUFFIX="patch" eapply "${WORKDIR}/patches" |
32 |
+ |
33 |
+ cp "${FILESDIR}"/ocaml.conf "${T}" || die |
34 |
+ |
35 |
default |
36 |
} |
37 |
|
38 |
@@ -133,10 +136,13 @@ src_install() { |
39 |
dodoc Changes README.adoc |
40 |
# Create envd entry for latex input files |
41 |
if use latex ; then |
42 |
- echo "TEXINPUTS=\"${EPREFIX}/usr/$(get_libdir)/ocaml/ocamldoc:\"" > "${T}/99ocamldoc" |
43 |
+ echo "TEXINPUTS=\"${EPREFIX}/usr/$(get_libdir)/ocaml/ocamldoc:\"" > "${T}"/99ocamldoc || die |
44 |
doenvd "${T}/99ocamldoc" |
45 |
fi |
46 |
+ |
47 |
+ sed -i -e "s:lib:$(get_libdir):" "${T}"/ocaml.conf || die |
48 |
+ |
49 |
# Install ocaml-rebuild portage set |
50 |
insinto /usr/share/portage/config/sets |
51 |
- doins "${FILESDIR}/ocaml.conf" |
52 |
+ doins "${T}"/ocaml.conf |
53 |
} |
54 |
|
55 |
diff --git a/dev-lang/ocaml/ocaml-4.05.0-r6.ebuild b/dev-lang/ocaml/ocaml-4.05.0-r8.ebuild |
56 |
similarity index 95% |
57 |
rename from dev-lang/ocaml/ocaml-4.05.0-r6.ebuild |
58 |
rename to dev-lang/ocaml/ocaml-4.05.0-r8.ebuild |
59 |
index ae3120cad72..11c811147b4 100644 |
60 |
--- a/dev-lang/ocaml/ocaml-4.05.0-r6.ebuild |
61 |
+++ b/dev-lang/ocaml/ocaml-4.05.0-r8.ebuild |
62 |
@@ -51,6 +51,9 @@ pkg_setup() { |
63 |
|
64 |
src_prepare() { |
65 |
EPATCH_SUFFIX="patch" eapply "${WORKDIR}/patches" |
66 |
+ |
67 |
+ cp "${FILESDIR}"/ocaml.conf "${T}" || die |
68 |
+ |
69 |
default |
70 |
} |
71 |
|
72 |
@@ -134,10 +137,13 @@ src_install() { |
73 |
dodoc Changes README.adoc |
74 |
# Create envd entry for latex input files |
75 |
if use latex ; then |
76 |
- echo "TEXINPUTS=\"${EPREFIX}/usr/$(get_libdir)/ocaml/ocamldoc:\"" > "${T}/99ocamldoc" |
77 |
- doenvd "${T}/99ocamldoc" |
78 |
+ echo "TEXINPUTS=\"${EPREFIX}/usr/$(get_libdir)/ocaml/ocamldoc:\"" > "${T}"/99ocamldoc || die |
79 |
+ doenvd "${T}"/99ocamldoc |
80 |
fi |
81 |
+ |
82 |
+ sed -i -e "s:lib:$(get_libdir):" "${T}"/ocaml.conf || die |
83 |
+ |
84 |
# Install ocaml-rebuild portage set |
85 |
insinto /usr/share/portage/config/sets |
86 |
- doins "${FILESDIR}/ocaml.conf" |
87 |
+ doins "${T}"/ocaml.conf |
88 |
} |
89 |
|
90 |
diff --git a/dev-lang/ocaml/ocaml-4.09.0-r1.ebuild b/dev-lang/ocaml/ocaml-4.09.0-r2.ebuild |
91 |
similarity index 92% |
92 |
rename from dev-lang/ocaml/ocaml-4.09.0-r1.ebuild |
93 |
rename to dev-lang/ocaml/ocaml-4.09.0-r2.ebuild |
94 |
index 14dc7a908b0..23d27276013 100644 |
95 |
--- a/dev-lang/ocaml/ocaml-4.09.0-r1.ebuild |
96 |
+++ b/dev-lang/ocaml/ocaml-4.09.0-r2.ebuild |
97 |
@@ -26,6 +26,8 @@ PATCHES=("${FILESDIR}"/${PN}-4.09.0-gcc-10.patch) |
98 |
src_prepare() { |
99 |
default |
100 |
|
101 |
+ cp "${FILESDIR}"/ocaml.conf "${T}" || die |
102 |
+ |
103 |
# OCaml generates textrels on 32-bit arches |
104 |
# We can't do anything about it, but disabling it means that tests |
105 |
# for OCaml-based packages won't fail on unexpected output |
106 |
@@ -80,10 +82,13 @@ src_install() { |
107 |
dodoc Changes README.adoc |
108 |
# Create envd entry for latex input files |
109 |
if use latex ; then |
110 |
- echo "TEXINPUTS=\"${EPREFIX}/usr/$(get_libdir)/ocaml/ocamldoc:\"" > "${T}/99ocamldoc" |
111 |
- doenvd "${T}/99ocamldoc" |
112 |
+ echo "TEXINPUTS=\"${EPREFIX}/usr/$(get_libdir)/ocaml/ocamldoc:\"" > "${T}"/99ocamldoc || die |
113 |
+ doenvd "${T}"/99ocamldoc |
114 |
fi |
115 |
+ |
116 |
+ sed -i -e "s:lib:$(get_libdir):" "${T}"/ocaml.conf || die |
117 |
+ |
118 |
# Install ocaml-rebuild portage set |
119 |
insinto /usr/share/portage/config/sets |
120 |
- doins "${FILESDIR}/ocaml.conf" |
121 |
+ doins "${T}"/ocaml.conf |
122 |
} |
123 |
|
124 |
diff --git a/dev-lang/ocaml/ocaml-4.10.2-r1.ebuild b/dev-lang/ocaml/ocaml-4.10.2-r2.ebuild |
125 |
similarity index 92% |
126 |
rename from dev-lang/ocaml/ocaml-4.10.2-r1.ebuild |
127 |
rename to dev-lang/ocaml/ocaml-4.10.2-r2.ebuild |
128 |
index e1ca18aa961..7203dec65d6 100644 |
129 |
--- a/dev-lang/ocaml/ocaml-4.10.2-r1.ebuild |
130 |
+++ b/dev-lang/ocaml/ocaml-4.10.2-r2.ebuild |
131 |
@@ -24,6 +24,8 @@ PDEPEND="emacs? ( app-emacs/ocaml-mode ) |
132 |
src_prepare() { |
133 |
default |
134 |
|
135 |
+ cp "${FILESDIR}"/ocaml.conf "${T}" || die |
136 |
+ |
137 |
# OCaml generates textrels on 32-bit arches |
138 |
# We can't do anything about it, but disabling it means that tests |
139 |
# for OCaml-based packages won't fail on unexpected output |
140 |
@@ -80,11 +82,13 @@ src_install() { |
141 |
|
142 |
# Create envd entry for latex input files |
143 |
if use latex ; then |
144 |
- echo "TEXINPUTS=\"${EPREFIX}/usr/$(get_libdir)/ocaml/ocamldoc:\"" > "${T}/99ocamldoc" |
145 |
- doenvd "${T}/99ocamldoc" |
146 |
+ echo "TEXINPUTS=\"${EPREFIX}/usr/$(get_libdir)/ocaml/ocamldoc:\"" > "${T}/99ocamldoc" || die |
147 |
+ doenvd "${T}"/99ocamldoc |
148 |
fi |
149 |
|
150 |
+ sed -i -e "s:lib:$(get_libdir):" "${T}"/ocaml.conf || die |
151 |
+ |
152 |
# Install ocaml-rebuild portage set |
153 |
insinto /usr/share/portage/config/sets |
154 |
- doins "${FILESDIR}/ocaml.conf" |
155 |
+ doins "${T}"/ocaml.conf |
156 |
} |
157 |
|
158 |
diff --git a/dev-lang/ocaml/ocaml-4.11.2-r1.ebuild b/dev-lang/ocaml/ocaml-4.11.2-r2.ebuild |
159 |
similarity index 90% |
160 |
rename from dev-lang/ocaml/ocaml-4.11.2-r1.ebuild |
161 |
rename to dev-lang/ocaml/ocaml-4.11.2-r2.ebuild |
162 |
index f1ad43dbf99..3ef5a4d1015 100644 |
163 |
--- a/dev-lang/ocaml/ocaml-4.11.2-r1.ebuild |
164 |
+++ b/dev-lang/ocaml/ocaml-4.11.2-r2.ebuild |
165 |
@@ -24,13 +24,15 @@ PDEPEND="emacs? ( app-emacs/ocaml-mode ) |
166 |
src_prepare() { |
167 |
default |
168 |
|
169 |
+ cp "${FILESDIR}"/ocaml.conf "${T}" || die |
170 |
+ |
171 |
# OCaml generates textrels on 32-bit arches |
172 |
# We can't do anything about it, but disabling it means that tests |
173 |
# for OCaml-based packages won't fail on unexpected output |
174 |
# bug #773226 |
175 |
- #if use arm || use ppc || use x86 ; then |
176 |
+ if use arm || use ppc || use x86 ; then |
177 |
append-ldflags "-Wl,-z,notext" |
178 |
- #fi |
179 |
+ fi |
180 |
|
181 |
# Upstream build ignores LDFLAGS in several places. |
182 |
sed -i -e 's/\(^MKDLL=.*\)/\1 $(LDFLAGS)/' \ |
183 |
@@ -76,10 +78,13 @@ src_install() { |
184 |
dodoc Changes README.adoc |
185 |
# Create envd entry for latex input files |
186 |
if use latex ; then |
187 |
- echo "TEXINPUTS=\"${EPREFIX}/usr/$(get_libdir)/ocaml/ocamldoc:\"" > "${T}/99ocamldoc" |
188 |
- doenvd "${T}/99ocamldoc" |
189 |
+ echo "TEXINPUTS=\"${EPREFIX}/usr/$(get_libdir)/ocaml/ocamldoc:\"" > "${T}"/99ocamldoc || die |
190 |
+ doenvd "${T}"/99ocamldoc |
191 |
fi |
192 |
+ |
193 |
+ sed -i -e "s:lib:$(get_libdir):" "${T}"/ocaml.conf || die |
194 |
+ |
195 |
# Install ocaml-rebuild portage set |
196 |
insinto /usr/share/portage/config/sets |
197 |
- doins "${FILESDIR}/ocaml.conf" |
198 |
+ doins "${T}"/ocaml.conf |
199 |
} |
200 |
|
201 |
diff --git a/dev-lang/ocaml/ocaml-4.12.0-r1.ebuild b/dev-lang/ocaml/ocaml-4.12.0-r2.ebuild |
202 |
similarity index 90% |
203 |
rename from dev-lang/ocaml/ocaml-4.12.0-r1.ebuild |
204 |
rename to dev-lang/ocaml/ocaml-4.12.0-r2.ebuild |
205 |
index 137a6160e45..da99522c6e3 100644 |
206 |
--- a/dev-lang/ocaml/ocaml-4.12.0-r1.ebuild |
207 |
+++ b/dev-lang/ocaml/ocaml-4.12.0-r2.ebuild |
208 |
@@ -23,13 +23,15 @@ PDEPEND="emacs? ( app-emacs/ocaml-mode ) |
209 |
src_prepare() { |
210 |
default |
211 |
|
212 |
+ cp "${FILESDIR}"/ocaml.conf "${T}" || die |
213 |
+ |
214 |
# OCaml generates textrels on 32-bit arches |
215 |
# We can't do anything about it, but disabling it means that tests |
216 |
# for OCaml-based packages won't fail on unexpected output |
217 |
# bug #773226 |
218 |
- #if use arm || use ppc || use x86 ; then |
219 |
+ if use arm || use ppc || use x86 ; then |
220 |
append-ldflags "-Wl,-z,notext" |
221 |
- #fi |
222 |
+ fi |
223 |
|
224 |
# Upstream build ignores LDFLAGS in several places. |
225 |
sed -i -e 's/\(^MKDLL=.*\)/\1 $(LDFLAGS)/' \ |
226 |
@@ -83,11 +85,13 @@ src_install() { |
227 |
|
228 |
# Create envd entry for latex input files |
229 |
if use latex ; then |
230 |
- echo "TEXINPUTS=\"${EPREFIX}/usr/$(get_libdir)/ocaml/ocamldoc:\"" > "${T}/99ocamldoc" || die |
231 |
- doenvd "${T}/99ocamldoc" |
232 |
+ echo "TEXINPUTS=\"${EPREFIX}/usr/$(get_libdir)/ocaml/ocamldoc:\"" > "${T}"/99ocamldoc || die |
233 |
+ doenvd "${T}"/99ocamldoc |
234 |
fi |
235 |
|
236 |
+ sed -i -e "s:lib:$(get_libdir):" "${T}"/ocaml.conf || die |
237 |
+ |
238 |
# Install ocaml-rebuild portage set |
239 |
insinto /usr/share/portage/config/sets |
240 |
- doins "${FILESDIR}/ocaml.conf" |
241 |
+ doins "${T}"/ocaml.conf |
242 |
} |