Proper handling of ocaml_captures_build_path

[Stéphane Glondu]

Hi Chris,

Le 09/02/2020 à 09:57, Chris Lamb a écrit :
>>> Unfortunately, at quick glance I can't seem to be able to reproduce
>>> this. Take, for example, the 2020-01-29 14:02:00 build of belenios in
>>> unstable/amd64:
>>>
>>>   https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/diffoscope-results/belenios.html
>>>
>>> I you review the .buildinfo file we can see that it was built with the
>>> aforementioned new version of dh-ocaml, ie.:
>>>
>>>   dh-ocaml (= 1.1.1),
>>>
>>> … but we still see build-path related changes between the two builds:
>>>
>>>     camlTool_cmdline__stream_to_list_317():
>>>    -/build/1st/belenios-1.10+dfsg/_build/src/tool/tool_cmdline.ml:28 
>>>    +/build/2/belenios-1.10+dfsg/2nd/_build/src/tool/tool_cmdline.ml:28
>>
>> That's because belenios doesn't include the snippet (one of the few...).
>> But laby, for example, became reproducible in unstable after the change.
> 
> Could you elaborate by what you mean by "snippet" here? src:belenios
> has the following in debian/rules:
> 
>   4 %:
>   5         dh $@ --with ocaml
> […]
>   8 override_dh_auto_build:
>   9         $(MAKE) minimal
> 
> … whilst src:laby has:
> 
>  11 override_dh_auto_build:
>  12         $(MAKE) $(OCAML_BEST)
> […]
>  22 %:
>  23         dh $@ --with ocaml
> 
> §
> 
> Whilst obviously not strictly identical (eg. the use of the `minimal`
> build target), I remain unclear on what the material difference is.

The "snippet" is:

  export BUILD_PATH_PREFIX_MAP ?= .=$(CURDIR)

which is located in /usr/share/ocaml/ocamlvars.mk, which is included in
laby, but not in belenios.


Cheers,

-- 
Stéphane