| Message ID | 20220622204701.254358-1-luca.ceresoli@bootlin.com |
|---|---|
| State | Accepted, archived |
| Commit | 78b6a08db4e8eb3b4e1d52fcdb39a5b3415f5a3f |
| Headers | show |
| Series | llvm: add PACKAGECONFIG[optviewer] | expand |
On Wed, 2022-06-22 at 22:47 +0200, Luca Ceresoli via lists.openembedded.org wrote: > Currently the CMake configuration for llvm finds the python pygments and > pyyaml if they are installed on the host. This makes builds > non-reproducible across different machines, some having those modules > installed and some others not. > > This has been causing a 'reproducible' failure on one of the autobuilders: > > AssertionError: The following deb packages are missing or different and not in exclusion list: /home/pokybuild/yocto-worker/reproducible/build/build-st/reproducibleB/tmp/deploy/deb/./core2-64/llvm-dev_14.0.4-r0_amd64.deb > The following ipk packages are missing or different and not in exclusion list: /home/pokybuild/yocto-worker/reproducible/build/build-st/reproducibleB/tmp/deploy/ipk/./core2-64/llvm-dev_14.0.4-r0_core2-64.ipk > The following rpm packages are missing or different and not in exclusion list: /home/pokybuild/yocto-worker/reproducible/build/build-st/reproducibleB/tmp/deploy/rpm/./core2_64/llvm-dev-14.0.4-r0.core2_64.rpm > > Fix by adding an explicit PACKAGECONFIG to control the > LLVM_HAVE_OPT_VIEWER_MODULES option in CMake. If unset, it forces CMake to > ignore pygments and pyyaml, no matter it they are available on the host. If > set, it DEPENDS on the pygments and pyyaml modules so that CMake will find > and use them. > > Based on suggestions from Stefan and Markus -- thanks. > > Proposed-by: "Stefan Herbrechtsmeier" <stefan.herbrechtsmeier-oss@weidmueller.com> > Proposed-by: "Markus Volk" <f_l_k@t-online.de> > Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com> Just wanted to say thanks for the help on this one, I think we ended up with a better fix than I'd originally thought we'd have! It is one less issue to cause problems on the infrastructure too :) Cheers, Richard
diff --git a/meta/recipes-devtools/llvm/llvm_git.bb b/meta/recipes-devtools/llvm/llvm_git.bb index 67ed1eab00fe..d06341f06388 100644 --- a/meta/recipes-devtools/llvm/llvm_git.bb +++ b/meta/recipes-devtools/llvm/llvm_git.bb @@ -56,6 +56,10 @@ def get_llvm_arch(bb, d, arch_var): def get_llvm_host_arch(bb, d): return get_llvm_arch(bb, d, 'HOST_ARCH') +PACKAGECONFIG ??= "" +# if optviewer OFF, force the modules to be not found or the ones on the host would be found +PACKAGECONFIG[optviewer] = ",-DPY_PYGMENTS_FOUND=OFF -DPY_PYGMENTS_LEXERS_C_CPP_FOUND=OFF -DPY_YAML_FOUND=OFF,python3-pygments python3-pyyaml" + # # Default to build all OE-Core supported target arches (user overridable). #
Currently the CMake configuration for llvm finds the python pygments and pyyaml if they are installed on the host. This makes builds non-reproducible across different machines, some having those modules installed and some others not. This has been causing a 'reproducible' failure on one of the autobuilders: AssertionError: The following deb packages are missing or different and not in exclusion list: /home/pokybuild/yocto-worker/reproducible/build/build-st/reproducibleB/tmp/deploy/deb/./core2-64/llvm-dev_14.0.4-r0_amd64.deb The following ipk packages are missing or different and not in exclusion list: /home/pokybuild/yocto-worker/reproducible/build/build-st/reproducibleB/tmp/deploy/ipk/./core2-64/llvm-dev_14.0.4-r0_core2-64.ipk The following rpm packages are missing or different and not in exclusion list: /home/pokybuild/yocto-worker/reproducible/build/build-st/reproducibleB/tmp/deploy/rpm/./core2_64/llvm-dev-14.0.4-r0.core2_64.rpm Fix by adding an explicit PACKAGECONFIG to control the LLVM_HAVE_OPT_VIEWER_MODULES option in CMake. If unset, it forces CMake to ignore pygments and pyyaml, no matter it they are available on the host. If set, it DEPENDS on the pygments and pyyaml modules so that CMake will find and use them. Based on suggestions from Stefan and Markus -- thanks. Proposed-by: "Stefan Herbrechtsmeier" <stefan.herbrechtsmeier-oss@weidmueller.com> Proposed-by: "Markus Volk" <f_l_k@t-online.de> Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com> --- meta/recipes-devtools/llvm/llvm_git.bb | 4 ++++ 1 file changed, 4 insertions(+)