Re: Bug#1128189: coq: Please install dllcoqperf_stubs.so on native architectures only

--=-ltlOMBoPD11guQVZJHf/
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

Hi,

On Mon, 2026-02-16 at 09:42 +0100, John Paul Adrian Glaubitz wrote:
> This can be fixed by making the installation of this file conditional wit=
h the help of
> the dh-exec package:
>=20
> diff -Nru debian.orig/control debian/control
> --- debian.orig/control 2025-11-10 10:59:00.000000000 +0100
> +++ debian/control      2026-02-16 09:34:05.257704960 +0100
> @@ -11,6 +11,7 @@
>  Build-Depends:
>   debhelper-compat (=3D 13),
>   dh-coq,
> + dh-exec,
>   dh-ocaml,
>   dh-python,
>   ocaml-dune,
> diff -Nru debian.orig/libcoq-core-ocaml.install.in debian/libcoq-core-oca=
ml.install.in
> --- debian.orig/libcoq-core-ocaml.install.in    2025-08-21 15:13:46.00000=
0000 +0200
> +++ debian/libcoq-core-ocaml.install.in 2026-02-16 09:33:20.257429872 +01=
00
> @@ -1,6 +1,7 @@
> +#!/usr/bin/dh-exec
>  @OCamlStdlibDir@/coq-core/META
>  @OCamlStdlibDir@/rocq-runtime/META
>  @OCamlDllDir@/dllcoqrun_stubs.so
> -@OCamlDllDir@/dllcoqperf_stubs.so
> +[amd64 arm64 armhf i386 ppc64el riscv64 s390x] @OCamlDllDir@/dllcoqperf_=
stubs.so
>  @OCamlStdlibDir@/rocq-runtime/dev/ml_toplevel/include*
>  # *.cmo and *.cmxs files are added by debian/rules
>=20
> Also, make sure that debian/libcoq-core-ocaml.install.in is mode 0755 (ex=
ecutable).

OK, this doesn't work as expected as debian/rules messes with the file as w=
ell.

Let's use this approach then:

--- debian/rules.orig   2025-09-16 23:56:00.000000000 +0200
+++ debian/rules        2026-02-16 10:19:08.882267610 +0100
@@ -60,6 +60,10 @@
        find debian/tmp$(OCAML_STDLIB_DIR)/rocq-runtime -regextype posix-aw=
k \
          -regex '.*\.(a|cmi|cmo|cmt|cmti|cmx|cmxa|ml|mli|o])$$' \
          >> debian/libcoq-core-ocaml-dev.install
+       # remove dllcoqperf_stubs.so for non-native architectures
+       ifeq (,$(filter amd64 arm64 armhf i386 ppc64el riscv64 s390x), $(DE=
B_HOST_ARCH)))
+         sed -i '/.*dllcoqperf_stubs.so/d' debian/libcoq-core-ocaml-dev.in=
stall
+       endif
=20
 override_dh_gencontrol:
        for u in $(PACKAGES); do \

Attaching a patch.

Adrian

--=20
 .''`.  John Paul Adrian Glaubitz
: :' :  Debian Developer
`. `'   Physicist
  `-    GPG: 62FF 8A75 84E0 2956 9546  0006 7426 3B37 F5B5 F913

--=-ltlOMBoPD11guQVZJHf/
Content-Disposition: attachment; filename="coq-fix-dh-install.diff"
Content-Transfer-Encoding: base64
Content-Type: text/x-patch; name="coq-fix-dh-install.diff"; charset="UTF-8"

LS0tIGRlYmlhbi9ydWxlcy5vcmlnCTIwMjUtMDktMTYgMjM6NTY6MDAuMDAwMDAwMDAwICswMjAw
CisrKyBkZWJpYW4vcnVsZXMJMjAyNi0wMi0xNiAxMDoxOTowOC44ODIyNjc2MTAgKzAxMDAKQEAg
LTYwLDYgKzYwLDEwIEBACiAJZmluZCBkZWJpYW4vdG1wJChPQ0FNTF9TVERMSUJfRElSKS9yb2Nx
LXJ1bnRpbWUgLXJlZ2V4dHlwZSBwb3NpeC1hd2sgXAogCSAgLXJlZ2V4ICcuKlwuKGF8Y21pfGNt
b3xjbXR8Y210aXxjbXh8Y214YXxtbHxtbGl8b10pJCQnIFwKIAkgID4+IGRlYmlhbi9saWJjb3Et
Y29yZS1vY2FtbC1kZXYuaW5zdGFsbAorCSMgcmVtb3ZlIGRsbGNvcXBlcmZfc3R1YnMuc28gZm9y
IG5vbi1uYXRpdmUgYXJjaGl0ZWN0dXJlcworCWlmZXEgKCwkKGZpbHRlciBhbWQ2NCBhcm02NCBh
cm1oZiBpMzg2IHBwYzY0ZWwgcmlzY3Y2NCBzMzkweCksICQoREVCX0hPU1RfQVJDSCkpKQorCSAg
c2VkIC1pICcvLipkbGxjb3FwZXJmX3N0dWJzLnNvL2QnIGRlYmlhbi9saWJjb3EtY29yZS1vY2Ft
bC1kZXYuaW5zdGFsbAorCWVuZGlmCiAKIG92ZXJyaWRlX2RoX2dlbmNvbnRyb2w6CiAJZm9yIHUg
aW4gJChQQUNLQUdFUyk7IGRvIFwK


--=-ltlOMBoPD11guQVZJHf/--