Skip to content

Commit

Permalink
llvm-project-source.inc: fix racing on building lib32-llvm-project-so…
Browse files Browse the repository at this point in the history
…urce-19.1.0 and llvm-project-source-19.1.0

While enabling multilib, build lib32-llvm-project-source-19.1.0 and
llvm-project-source-19.1.0 at the same time:

    $ MACHINE = "qemux86-64"
    $ require conf/multilib.conf
    $ MULTILIBS = "multilib:lib32"
    $ DEFAULTTUNE:virtclass-multilib-lib32 = "x86"
    $ bitbake lib32-llvm-project-source-19.1.0 llvm-project-source-19.1.0
    ...
    $ cat tmp/work-shared/llvm-project-source-19.1.0-r0/temp/log.task_order
    20241012-070604.819630 do_recipe_qa (2728706): log.do_recipe_qa.2728706
    20241012-070604.883194 do_recipe_qa (2728707): log.do_recipe_qa.2728707
    20241012-070605.037448 do_fetch (2728779): log.do_fetch.2728779
    20241012-070605.165280 do_fetch (2728848): log.do_fetch.2728848
    20241012-071030.798104 do_unpack (2733554): log.do_unpack.2733554
    20241012-071030.864536 do_unpack (2733559): log.do_unpack.2733559

There are two tasks for do_fetch, do_unpack and others, so there are race issues.

Both of them have the same hardcode 'llvm-project-source-' prefix in ${WORKDIR} and
${S}, explicitly disable lib32-llvm-project-source-19.1.0 for multilib

Set llvm-project-source as BPN of llvm-project-source-19.1.0

Signed-off-by: Hongxu Jia <[email protected]>
  • Loading branch information
hongxu-jia authored and kraj committed Oct 12, 2024
1 parent ebcfaee commit 7cf1f0e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 0 deletions.
2 changes: 2 additions & 0 deletions conf/layer.conf
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,7 @@ CLANGSDK ??= "0"

LLVMVERSION = "19.1.0"

NON_MULTILIB_RECIPES:append = " llvm-project-source"

require conf/nonclangable.conf
require conf/nonscanable.conf
2 changes: 2 additions & 0 deletions recipes-devtools/clang/llvm-project-source.bb
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,6 @@ HOMEPAGE = "https://github.com/llvm/llvm-project"
require llvm-project-source.inc
require clang.inc

BPN = "llvm-project-source"

EXCLUDE_FROM_WORLD = "1"

0 comments on commit 7cf1f0e

Please sign in to comment.