On 31/08/2019 18:05, Adam D. Barratt wrote:
> On Wed, 2019-08-28 at 12:53 +0200, Emilio Pozuelo Monfort wrote:
>> I'd like to introduce llvm-toolchain-7 into stretch, as it's needed
>> to update rustc to 1.34.2, which in turn is needed for firefox ESR
>> 68.
>>
>> I have already uploaded the package, which is a straight backport
>> from the buster version (see attached debdiff) and I have used it to
>> backport rustc (and used that to build firefox) and it's working
>> well.
>>
>> It'd be good to get this into the next point release to ease the
>> firefox 68 ESR security updates, targetted for October.
>
> That happened, and so far FTBFS on ppc64el and s390x, with an error
> referencing an inability to find "ocamlopt".
>
> I suspect that's due to this change in src:ocaml:
>
> ocaml (4.03.0-2) experimental; urgency=medium
>
> * Add native compilers for ppc64, ppc64el, s390x.
> * Skip native tests on bytecode-only systems.
>
> -- Ximin Luo <infini...@debian.org> Fri, 28 Oct 2016 02:13:18 +0200
>
> stretch has ocaml 4.02.3-9.
I have uploaded a new version to address this by disabling ocaml on said
architectures, see the attached debdiff.
Thanks,
Emilio
diff -Nru llvm-toolchain-7-7.0.1/debian/changelog
llvm-toolchain-7-7.0.1/debian/changelog
--- llvm-toolchain-7-7.0.1/debian/changelog 2019-08-22 11:56:10.000000000
+0200
+++ llvm-toolchain-7-7.0.1/debian/changelog 2019-09-02 10:15:04.000000000
+0200
@@ -1,3 +1,9 @@
+llvm-toolchain-7 (1:7.0.1-8~deb9u2) stretch; urgency=medium
+
+ * Disable ocaml on ppc64el and s390x.
+
+ -- Emilio Pozuelo Monfort <po...@debian.org> Mon, 02 Sep 2019 10:15:04 +0200
+
llvm-toolchain-7 (1:7.0.1-8~deb9u1) stretch; urgency=medium
* Backport to stretch.
diff -Nru llvm-toolchain-7-7.0.1/debian/control
llvm-toolchain-7-7.0.1/debian/control
--- llvm-toolchain-7-7.0.1/debian/control 2019-02-27 10:05:57.000000000
+0100
+++ llvm-toolchain-7-7.0.1/debian/control 2019-09-02 10:14:49.000000000
+0200
@@ -14,10 +14,10 @@
g++-multilib [amd64 i386 kfreebsd-amd64 mips mips64 mips64el mipsel
powerpc ppc64 s390 s390x sparc sparc64 x32],
libjs-mathjax,
doxygen, gfortran,
- ocaml-nox [amd64 arm64 armhf i386 ppc64el s390x],
- ocaml-findlib [amd64 arm64 armhf i386 ppc64el s390x],
- libctypes-ocaml-dev [amd64 arm64 armhf i386 ppc64el s390x],
- dh-ocaml [amd64 arm64 armhf i386 ppc64el s390x],
+ ocaml-nox [amd64 arm64 armhf i386],
+ ocaml-findlib [amd64 arm64 armhf i386],
+ libctypes-ocaml-dev [amd64 arm64 armhf i386],
+ dh-ocaml [amd64 arm64 armhf i386],
Build-Conflicts: oprofile, ocaml, libllvm-3.8-ocaml-dev, libllvm-3.9-ocaml-dev
Standards-Version: 4.2.1
Homepage: https://www.llvm.org/
@@ -314,7 +314,7 @@
Package: libllvm-7-ocaml-dev
Section: ocaml
-Architecture: amd64 arm64 armhf i386 ppc64el s390x
+Architecture: amd64 arm64 armhf i386
Suggests: llvm-7-doc
Depends: ${shlibs:Depends}, ${misc:Depends}, ${ocaml:Depends}, llvm-7-dev (=
${binary:Version})
Replaces: libllvm-x.y-ocaml-dev
diff -Nru llvm-toolchain-7-7.0.1/debian/rules
llvm-toolchain-7-7.0.1/debian/rules
--- llvm-toolchain-7-7.0.1/debian/rules 2019-02-27 10:05:57.000000000 +0100
+++ llvm-toolchain-7-7.0.1/debian/rules 2019-09-02 10:15:00.000000000 +0200
@@ -212,7 +212,7 @@
DH_OPTIONS=
OCAML_ENABLE= no
-OCAML_ARCHS := amd64 arm64 armhf i386 ppc64el s390x
+OCAML_ARCHS := amd64 arm64 armhf i386
ifneq (,$(filter $(DEB_HOST_ARCH),$(OCAML_ARCHS)))
# Enable OCAML for this arch.
OCAML_ENABLE=yes
