diff mbox series

llvm: extend llvm-config reproducivility fix to all classes

Message ID 20240716013642.3050435-1-denis@denix.org
State New
Headers show
Series llvm: extend llvm-config reproducivility fix to all classes | expand

Commit Message

Denys Dmytriyenko July 16, 2024, 1:36 a.m. UTC
It's not limited to "target", but also happens to e.g. nativesdk:

ERROR: nativesdk-llvm-18.1.8-r0 do_package_qa: QA Issue: File /usr/local/oe-sdk-hardcoded-buildpath/sysroots/x86_64-pokysdk-linux/usr/bin/llvm-config in package nativesdk-llvm contains reference to TMPDIR [buildpaths]

Signed-off-by: Denys Dmytriyenko <denis@denix.org>
---
 meta/recipes-devtools/llvm/llvm_18.1.8.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Richard Purdie July 16, 2024, 7:12 a.m. UTC | #1
On Mon, 2024-07-15 at 21:36 -0400, Denys Dmytriyenko via
lists.openembedded.org wrote:
> It's not limited to "target", but also happens to e.g. nativesdk:
> 
> ERROR: nativesdk-llvm-18.1.8-r0 do_package_qa: QA Issue: File
> /usr/local/oe-sdk-hardcoded-buildpath/sysroots/x86_64-pokysdk-
> linux/usr/bin/llvm-config in package nativesdk-llvm contains
> reference to TMPDIR [buildpaths]
> 
> Signed-off-by: Denys Dmytriyenko <denis@denix.org>
> ---
>  meta/recipes-devtools/llvm/llvm_18.1.8.bb | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta/recipes-devtools/llvm/llvm_18.1.8.bb
> b/meta/recipes-devtools/llvm/llvm_18.1.8.bb
> index 8dad952923..6afca9c7d7 100644
> --- a/meta/recipes-devtools/llvm/llvm_18.1.8.bb
> +++ b/meta/recipes-devtools/llvm/llvm_18.1.8.bb
> @@ -95,7 +95,7 @@ EXTRA_OECMAKE:append:class-nativesdk = "\
>                   "
>  
>  # patch out build host paths for reproducibility
> -do_compile:prepend:class-target() {
> +do_compile:prepend() {
>          sed -i -e "s,${WORKDIR},,g" ${B}/tools/llvm-
> config/BuildVariables.inc
>  }
>  


Do we need those buildpaths in llvm-native?

Cheers,

Richard
Denys Dmytriyenko July 16, 2024, 10:11 p.m. UTC | #2
On Tue, Jul 16, 2024 at 08:12:25AM +0100, Richard Purdie wrote:
> On Mon, 2024-07-15 at 21:36 -0400, Denys Dmytriyenko via
> lists.openembedded.org wrote:
> > It's not limited to "target", but also happens to e.g. nativesdk:
> > 
> > ERROR: nativesdk-llvm-18.1.8-r0 do_package_qa: QA Issue: File
> > /usr/local/oe-sdk-hardcoded-buildpath/sysroots/x86_64-pokysdk-
> > linux/usr/bin/llvm-config in package nativesdk-llvm contains
> > reference to TMPDIR [buildpaths]
> > 
> > Signed-off-by: Denys Dmytriyenko <denis@denix.org>
> > ---
> >  meta/recipes-devtools/llvm/llvm_18.1.8.bb | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/meta/recipes-devtools/llvm/llvm_18.1.8.bb
> > b/meta/recipes-devtools/llvm/llvm_18.1.8.bb
> > index 8dad952923..6afca9c7d7 100644
> > --- a/meta/recipes-devtools/llvm/llvm_18.1.8.bb
> > +++ b/meta/recipes-devtools/llvm/llvm_18.1.8.bb
> > @@ -95,7 +95,7 @@ EXTRA_OECMAKE:append:class-nativesdk = "\
> >                   "
> >  
> >  # patch out build host paths for reproducibility
> > -do_compile:prepend:class-target() {
> > +do_compile:prepend() {
> >          sed -i -e "s,${WORKDIR},,g" ${B}/tools/llvm-
> > config/BuildVariables.inc
> >  }
> >  
> 
> 
> Do we need those buildpaths in llvm-native?

I'm not really sure, but I can spin up a v2.
Richard Purdie July 16, 2024, 10:20 p.m. UTC | #3
On Tue, 2024-07-16 at 18:11 -0400, Denys Dmytriyenko via
lists.openembedded.org wrote:
> On Tue, Jul 16, 2024 at 08:12:25AM +0100, Richard Purdie wrote:
> > On Mon, 2024-07-15 at 21:36 -0400, Denys Dmytriyenko via
> > lists.openembedded.org wrote:
> > > It's not limited to "target", but also happens to e.g. nativesdk:
> > > 
> > > ERROR: nativesdk-llvm-18.1.8-r0 do_package_qa: QA Issue: File
> > > /usr/local/oe-sdk-hardcoded-buildpath/sysroots/x86_64-pokysdk-
> > > linux/usr/bin/llvm-config in package nativesdk-llvm contains
> > > reference to TMPDIR [buildpaths]
> > > 
> > > Signed-off-by: Denys Dmytriyenko <denis@denix.org>
> > > ---
> > >  meta/recipes-devtools/llvm/llvm_18.1.8.bb | 2 +-
> > >  1 file changed, 1 insertion(+), 1 deletion(-)
> > > 
> > > diff --git a/meta/recipes-devtools/llvm/llvm_18.1.8.bb
> > > b/meta/recipes-devtools/llvm/llvm_18.1.8.bb
> > > index 8dad952923..6afca9c7d7 100644
> > > --- a/meta/recipes-devtools/llvm/llvm_18.1.8.bb
> > > +++ b/meta/recipes-devtools/llvm/llvm_18.1.8.bb
> > > @@ -95,7 +95,7 @@ EXTRA_OECMAKE:append:class-nativesdk = "\
> > >                   "
> > >  
> > >  # patch out build host paths for reproducibility
> > > -do_compile:prepend:class-target() {
> > > +do_compile:prepend() {
> > >          sed -i -e "s,${WORKDIR},,g" ${B}/tools/llvm-
> > > config/BuildVariables.inc
> > >  }
> > >  
> > 
> > 
> > Do we need those buildpaths in llvm-native?
> 
> I'm not really sure, but I can spin up a v2.

I'm just not sure if that is going to break something or not in the
native case. I worry a bit that it might :(

Cheers,

Richard
diff mbox series

Patch

diff --git a/meta/recipes-devtools/llvm/llvm_18.1.8.bb b/meta/recipes-devtools/llvm/llvm_18.1.8.bb
index 8dad952923..6afca9c7d7 100644
--- a/meta/recipes-devtools/llvm/llvm_18.1.8.bb
+++ b/meta/recipes-devtools/llvm/llvm_18.1.8.bb
@@ -95,7 +95,7 @@  EXTRA_OECMAKE:append:class-nativesdk = "\
                  "
 
 # patch out build host paths for reproducibility
-do_compile:prepend:class-target() {
+do_compile:prepend() {
         sed -i -e "s,${WORKDIR},,g" ${B}/tools/llvm-config/BuildVariables.inc
 }