diff mbox series

[scarthgap,4/4] gcc-cross-canadian.inc: Fix buildpaths error for pthread.h

Message ID d3c294ee0afe4d2eb46320945d41064ebfb5cbff.1741980835.git.steve@sakoman.com
State Accepted
Delegated to: Steve Sakoman
Headers show
Series [scarthgap,1/4] libarchive: patch CVE-2025-1632 and CVE-2025-25724 | expand

Commit Message

Steve Sakoman March 14, 2025, 7:35 p.m. UTC 
From: Sana Kazi <sanakazi720@gmail.com>

Replace the hardcoded path with /not/exist as used for other
options[--with-sysroot] to ensure pthread.h does not contain
hardocded references to TMPDIR:

ERROR: gcc-cross-canadian-x86-64-13.3.0-r0 do_package_qa: QA Issue:
File /usr/local/oe-sdk-hardcoded-buildpath/sysroots/x86_64-pokysdk-linux/
usr/lib/x86_64-poky-linux/gcc/x86_64-poky-linux/13.3.0/include-fixed/
pthread.h in package gcc-cross-canadian-x86-64 contains reference to
TMPDIR [buildpaths]

Signed-off-by: Sana Kazi <sanakazi720@gmail.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
 meta/recipes-devtools/gcc/gcc-cross-canadian.inc | 5 +++++
 1 file changed, 5 insertions(+)

Comments

Ryan Eatmon March 20, 2025, 2:22 p.m. UTC | #1 
I'm seeing build errors in our nightly builds due to this patch.  The 
pthread.h file does not exist and the command is erroring out causing 
do_install to fail.


sed: can't read 
/scratch/jenkins_builds/arago-scarthgap-wip/build/build/arago-tmp-default-baremetal-k3r5/work/x86_64-k3r5-nativesdk-arago-linux/gcc-cross-canadian-arm/13.3.0/image/usr/local/oe-sdk-hardcoded-buildpath/sysroots/x86_64-arago-linux/usr/lib/arm-oe-eabi/gcc/arm-oe-eabi/13.3.0/include-fixed/pthread.h: 
No such file or directory
WARNING: 
/scratch/jenkins_builds/arago-scarthgap-wip/build/build/arago-tmp-default-baremetal-k3r5/work/x86_64-k3r5-nativesdk-arago-linux/gcc-cross-canadian-arm/13.3.0/temp/run.do_install.958706:182 
exit 2 from 'sed -i -e 
"s|/scratch/jenkins_builds/arago-scarthgap-wip/build/build/arago-tmp-default-baremetal-k3r5/work/x86_64-k3r5-nativesdk-arago-linux/gcc-cross-canadian-arm/13.3.0/recipe-sysroot-native|/not/exist|g" 
-e 
"s|/scratch/jenkins_builds/arago-scarthgap-wip/build/build/arago-tmp-default-baremetal-k3r5/work/x86_64-k3r5-nativesdk-arago-linux/gcc-cross-canadian-arm/13.3.0/recipe-sysroot|/not/exist|g" 
/scratch/jenkins_builds/arago-scarthgap-wip/build/build/arago-tmp-default-baremetal-k3r5/work/x86_64-k3r5-nativesdk-arago-linux/gcc-cross-canadian-arm/13.3.0/image/usr/local/oe-sdk-hardcoded-buildpath/sysroots/x86_64-arago-linux/usr/lib/arm-oe-eabi/gcc/arm-oe-eabi/13.3.0/include-fixed/pthread.h'
WARNING: Backtrace (BB generated script):
	#1: do_install, 
/scratch/jenkins_builds/arago-scarthgap-wip/build/build/arago-tmp-default-baremetal-k3r5/work/x86_64-k3r5-nativesdk-arago-linux/gcc-cross-canadian-arm/13.3.0/temp/run.do_install.958706, 
line 182
	#2: main, 
/scratch/jenkins_builds/arago-scarthgap-wip/build/build/arago-tmp-default-baremetal-k3r5/work/x86_64-k3r5-nativesdk-arago-linux/gcc-cross-canadian-arm/13.3.0/temp/run.do_install.958706, 
line 301


And line 182 is the sed line.

Should the sed call be wrapped in an if file exists check?


On 3/14/2025 2:35 PM, Steve Sakoman wrote:
> From: Sana Kazi <sanakazi720@gmail.com>
> 
> Replace the hardcoded path with /not/exist as used for other
> options[--with-sysroot] to ensure pthread.h does not contain
> hardocded references to TMPDIR:
> 
> ERROR: gcc-cross-canadian-x86-64-13.3.0-r0 do_package_qa: QA Issue:
> File /usr/local/oe-sdk-hardcoded-buildpath/sysroots/x86_64-pokysdk-linux/
> usr/lib/x86_64-poky-linux/gcc/x86_64-poky-linux/13.3.0/include-fixed/
> pthread.h in package gcc-cross-canadian-x86-64 contains reference to
> TMPDIR [buildpaths]
> 
> Signed-off-by: Sana Kazi <sanakazi720@gmail.com>
> Signed-off-by: Steve Sakoman <steve@sakoman.com>
> ---
>   meta/recipes-devtools/gcc/gcc-cross-canadian.inc | 5 +++++
>   1 file changed, 5 insertions(+)
> 
> diff --git a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
> index adcaef2b0f..06f0cef864 100644
> --- a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
> +++ b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
> @@ -118,6 +118,11 @@ do_install () {
>   	# We don't care about the gcc-<version> copies
>   	rm -f ${D}${bindir}/*gcc-${BINV}*
>   
> +        # Remove buildpaths from pthread.h
> +        sed -i -e "s|${RECIPE_SYSROOT_NATIVE}|/not/exist|g" \
> +        -e "s|${RECIPE_SYSROOT}|/not/exist|g" \
> +        ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include-fixed/pthread.h
> +
>   	# Cleanup empty directories which are not shipped
>   	# we use rmdir instead of 'rm -f' to ensure the non empty directories are not deleted
>   	# ${D}${libdir}/../lib only seems to appear with SDKMACHINE=i686
> 
> 
> 
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#212863): https://lists.openembedded.org/g/openembedded-core/message/212863
> Mute This Topic: https://lists.openembedded.org/mt/111706016/6551054
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [reatmon@ti.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
Steve Sakoman March 20, 2025, 2:27 p.m. UTC | #2 
On Thu, Mar 20, 2025 at 7:22 AM Ryan Eatmon <reatmon@ti.com> wrote:
>
>
> I'm seeing build errors in our nightly builds due to this patch.  The
> pthread.h file does not exist and the command is erroring out causing
> do_install to fail.
>
>
> sed: can't read
> /scratch/jenkins_builds/arago-scarthgap-wip/build/build/arago-tmp-default-baremetal-k3r5/work/x86_64-k3r5-nativesdk-arago-linux/gcc-cross-canadian-arm/13.3.0/image/usr/local/oe-sdk-hardcoded-buildpath/sysroots/x86_64-arago-linux/usr/lib/arm-oe-eabi/gcc/arm-oe-eabi/13.3.0/include-fixed/pthread.h:
> No such file or directory
> WARNING:
> /scratch/jenkins_builds/arago-scarthgap-wip/build/build/arago-tmp-default-baremetal-k3r5/work/x86_64-k3r5-nativesdk-arago-linux/gcc-cross-canadian-arm/13.3.0/temp/run.do_install.958706:182
> exit 2 from 'sed -i -e
> "s|/scratch/jenkins_builds/arago-scarthgap-wip/build/build/arago-tmp-default-baremetal-k3r5/work/x86_64-k3r5-nativesdk-arago-linux/gcc-cross-canadian-arm/13.3.0/recipe-sysroot-native|/not/exist|g"
> -e
> "s|/scratch/jenkins_builds/arago-scarthgap-wip/build/build/arago-tmp-default-baremetal-k3r5/work/x86_64-k3r5-nativesdk-arago-linux/gcc-cross-canadian-arm/13.3.0/recipe-sysroot|/not/exist|g"
> /scratch/jenkins_builds/arago-scarthgap-wip/build/build/arago-tmp-default-baremetal-k3r5/work/x86_64-k3r5-nativesdk-arago-linux/gcc-cross-canadian-arm/13.3.0/image/usr/local/oe-sdk-hardcoded-buildpath/sysroots/x86_64-arago-linux/usr/lib/arm-oe-eabi/gcc/arm-oe-eabi/13.3.0/include-fixed/pthread.h'
> WARNING: Backtrace (BB generated script):
>         #1: do_install,
> /scratch/jenkins_builds/arago-scarthgap-wip/build/build/arago-tmp-default-baremetal-k3r5/work/x86_64-k3r5-nativesdk-arago-linux/gcc-cross-canadian-arm/13.3.0/temp/run.do_install.958706,
> line 182
>         #2: main,
> /scratch/jenkins_builds/arago-scarthgap-wip/build/build/arago-tmp-default-baremetal-k3r5/work/x86_64-k3r5-nativesdk-arago-linux/gcc-cross-canadian-arm/13.3.0/temp/run.do_install.958706,
> line 301
>
>
> And line 182 is the sed line.
>
> Should the sed call be wrapped in an if file exists check?

I'll revert this patch since it is causing  build failures.

Steve


> On 3/14/2025 2:35 PM, Steve Sakoman wrote:
> > From: Sana Kazi <sanakazi720@gmail.com>
> >
> > Replace the hardcoded path with /not/exist as used for other
> > options[--with-sysroot] to ensure pthread.h does not contain
> > hardocded references to TMPDIR:
> >
> > ERROR: gcc-cross-canadian-x86-64-13.3.0-r0 do_package_qa: QA Issue:
> > File /usr/local/oe-sdk-hardcoded-buildpath/sysroots/x86_64-pokysdk-linux/
> > usr/lib/x86_64-poky-linux/gcc/x86_64-poky-linux/13.3.0/include-fixed/
> > pthread.h in package gcc-cross-canadian-x86-64 contains reference to
> > TMPDIR [buildpaths]
> >
> > Signed-off-by: Sana Kazi <sanakazi720@gmail.com>
> > Signed-off-by: Steve Sakoman <steve@sakoman.com>
> > ---
> >   meta/recipes-devtools/gcc/gcc-cross-canadian.inc | 5 +++++
> >   1 file changed, 5 insertions(+)
> >
> > diff --git a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
> > index adcaef2b0f..06f0cef864 100644
> > --- a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
> > +++ b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
> > @@ -118,6 +118,11 @@ do_install () {
> >       # We don't care about the gcc-<version> copies
> >       rm -f ${D}${bindir}/*gcc-${BINV}*
> >
> > +        # Remove buildpaths from pthread.h
> > +        sed -i -e "s|${RECIPE_SYSROOT_NATIVE}|/not/exist|g" \
> > +        -e "s|${RECIPE_SYSROOT}|/not/exist|g" \
> > +        ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include-fixed/pthread.h
> > +
> >       # Cleanup empty directories which are not shipped
> >       # we use rmdir instead of 'rm -f' to ensure the non empty directories are not deleted
> >       # ${D}${libdir}/../lib only seems to appear with SDKMACHINE=i686
> >
> >
> >
> > -=-=-=-=-=-=-=-=-=-=-=-
> > Links: You receive all messages sent to this group.
> > View/Reply Online (#212863): https://lists.openembedded.org/g/openembedded-core/message/212863
> > Mute This Topic: https://lists.openembedded.org/mt/111706016/6551054
> > Group Owner: openembedded-core+owner@lists.openembedded.org
> > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [reatmon@ti.com]
> > -=-=-=-=-=-=-=-=-=-=-=-
> >
>
> --
> Ryan Eatmon                reatmon@ti.com
> -----------------------------------------
> Texas Instruments, Inc.  -  LCPD  -  MGTS
Martin Jansa March 20, 2025, 2:51 p.m. UTC | #3 
I think we should backport:

https://git.openembedded.org/openembedded-core/commit/?h=styhead&id=350ff7d53f7506de2bc01f0efc569b8294b9afea
https://git.openembedded.org/openembedded-core/commit/?h=styhead&id=9221e4ab8cca4c06dc3d5c1de2fd4ce46477578a

to fix this issue in scarthgap, that's what I did locally in
gcc-cross-canadian bbappend.

Steve: should I send the backports?

On Thu, Mar 20, 2025 at 3:28 PM Steve Sakoman via
lists.openembedded.org <steve=sakoman.com@lists.openembedded.org>
wrote:
>
> On Thu, Mar 20, 2025 at 7:22 AM Ryan Eatmon <reatmon@ti.com> wrote:
> >
> >
> > I'm seeing build errors in our nightly builds due to this patch.  The
> > pthread.h file does not exist and the command is erroring out causing
> > do_install to fail.
> >
> >
> > sed: can't read
> > /scratch/jenkins_builds/arago-scarthgap-wip/build/build/arago-tmp-default-baremetal-k3r5/work/x86_64-k3r5-nativesdk-arago-linux/gcc-cross-canadian-arm/13.3.0/image/usr/local/oe-sdk-hardcoded-buildpath/sysroots/x86_64-arago-linux/usr/lib/arm-oe-eabi/gcc/arm-oe-eabi/13.3.0/include-fixed/pthread.h:
> > No such file or directory
> > WARNING:
> > /scratch/jenkins_builds/arago-scarthgap-wip/build/build/arago-tmp-default-baremetal-k3r5/work/x86_64-k3r5-nativesdk-arago-linux/gcc-cross-canadian-arm/13.3.0/temp/run.do_install.958706:182
> > exit 2 from 'sed -i -e
> > "s|/scratch/jenkins_builds/arago-scarthgap-wip/build/build/arago-tmp-default-baremetal-k3r5/work/x86_64-k3r5-nativesdk-arago-linux/gcc-cross-canadian-arm/13.3.0/recipe-sysroot-native|/not/exist|g"
> > -e
> > "s|/scratch/jenkins_builds/arago-scarthgap-wip/build/build/arago-tmp-default-baremetal-k3r5/work/x86_64-k3r5-nativesdk-arago-linux/gcc-cross-canadian-arm/13.3.0/recipe-sysroot|/not/exist|g"
> > /scratch/jenkins_builds/arago-scarthgap-wip/build/build/arago-tmp-default-baremetal-k3r5/work/x86_64-k3r5-nativesdk-arago-linux/gcc-cross-canadian-arm/13.3.0/image/usr/local/oe-sdk-hardcoded-buildpath/sysroots/x86_64-arago-linux/usr/lib/arm-oe-eabi/gcc/arm-oe-eabi/13.3.0/include-fixed/pthread.h'
> > WARNING: Backtrace (BB generated script):
> >         #1: do_install,
> > /scratch/jenkins_builds/arago-scarthgap-wip/build/build/arago-tmp-default-baremetal-k3r5/work/x86_64-k3r5-nativesdk-arago-linux/gcc-cross-canadian-arm/13.3.0/temp/run.do_install.958706,
> > line 182
> >         #2: main,
> > /scratch/jenkins_builds/arago-scarthgap-wip/build/build/arago-tmp-default-baremetal-k3r5/work/x86_64-k3r5-nativesdk-arago-linux/gcc-cross-canadian-arm/13.3.0/temp/run.do_install.958706,
> > line 301
> >
> >
> > And line 182 is the sed line.
> >
> > Should the sed call be wrapped in an if file exists check?
>
> I'll revert this patch since it is causing  build failures.
>
> Steve
>
>
> > On 3/14/2025 2:35 PM, Steve Sakoman wrote:
> > > From: Sana Kazi <sanakazi720@gmail.com>
> > >
> > > Replace the hardcoded path with /not/exist as used for other
> > > options[--with-sysroot] to ensure pthread.h does not contain
> > > hardocded references to TMPDIR:
> > >
> > > ERROR: gcc-cross-canadian-x86-64-13.3.0-r0 do_package_qa: QA Issue:
> > > File /usr/local/oe-sdk-hardcoded-buildpath/sysroots/x86_64-pokysdk-linux/
> > > usr/lib/x86_64-poky-linux/gcc/x86_64-poky-linux/13.3.0/include-fixed/
> > > pthread.h in package gcc-cross-canadian-x86-64 contains reference to
> > > TMPDIR [buildpaths]
> > >
> > > Signed-off-by: Sana Kazi <sanakazi720@gmail.com>
> > > Signed-off-by: Steve Sakoman <steve@sakoman.com>
> > > ---
> > >   meta/recipes-devtools/gcc/gcc-cross-canadian.inc | 5 +++++
> > >   1 file changed, 5 insertions(+)
> > >
> > > diff --git a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
> > > index adcaef2b0f..06f0cef864 100644
> > > --- a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
> > > +++ b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
> > > @@ -118,6 +118,11 @@ do_install () {
> > >       # We don't care about the gcc-<version> copies
> > >       rm -f ${D}${bindir}/*gcc-${BINV}*
> > >
> > > +        # Remove buildpaths from pthread.h
> > > +        sed -i -e "s|${RECIPE_SYSROOT_NATIVE}|/not/exist|g" \
> > > +        -e "s|${RECIPE_SYSROOT}|/not/exist|g" \
> > > +        ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include-fixed/pthread.h
> > > +
> > >       # Cleanup empty directories which are not shipped
> > >       # we use rmdir instead of 'rm -f' to ensure the non empty directories are not deleted
> > >       # ${D}${libdir}/../lib only seems to appear with SDKMACHINE=i686
> > >
> > >
> > >
> > >
> > >
> >
> > --
> > Ryan Eatmon                reatmon@ti.com
> > -----------------------------------------
> > Texas Instruments, Inc.  -  LCPD  -  MGTS
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#213404): https://lists.openembedded.org/g/openembedded-core/message/213404
> Mute This Topic: https://lists.openembedded.org/mt/111706016/3617156
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [martin.jansa@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
Steve Sakoman March 20, 2025, 4:18 p.m. UTC | #4 
On Thu, Mar 20, 2025 at 7:52 AM Martin Jansa <martin.jansa@gmail.com> wrote:
>
> I think we should backport:
>
> https://git.openembedded.org/openembedded-core/commit/?h=styhead&id=350ff7d53f7506de2bc01f0efc569b8294b9afea
> https://git.openembedded.org/openembedded-core/commit/?h=styhead&id=9221e4ab8cca4c06dc3d5c1de2fd4ce46477578a
>
> to fix this issue in scarthgap, that's what I did locally in
> gcc-cross-canadian bbappend.
>
> Steve: should I send the backports?

Yes, please do!

Steve

>
> On Thu, Mar 20, 2025 at 3:28 PM Steve Sakoman via
> lists.openembedded.org <steve=sakoman.com@lists.openembedded.org>
> wrote:
> >
> > On Thu, Mar 20, 2025 at 7:22 AM Ryan Eatmon <reatmon@ti.com> wrote:
> > >
> > >
> > > I'm seeing build errors in our nightly builds due to this patch.  The
> > > pthread.h file does not exist and the command is erroring out causing
> > > do_install to fail.
> > >
> > >
> > > sed: can't read
> > > /scratch/jenkins_builds/arago-scarthgap-wip/build/build/arago-tmp-default-baremetal-k3r5/work/x86_64-k3r5-nativesdk-arago-linux/gcc-cross-canadian-arm/13.3.0/image/usr/local/oe-sdk-hardcoded-buildpath/sysroots/x86_64-arago-linux/usr/lib/arm-oe-eabi/gcc/arm-oe-eabi/13.3.0/include-fixed/pthread.h:
> > > No such file or directory
> > > WARNING:
> > > /scratch/jenkins_builds/arago-scarthgap-wip/build/build/arago-tmp-default-baremetal-k3r5/work/x86_64-k3r5-nativesdk-arago-linux/gcc-cross-canadian-arm/13.3.0/temp/run.do_install.958706:182
> > > exit 2 from 'sed -i -e
> > > "s|/scratch/jenkins_builds/arago-scarthgap-wip/build/build/arago-tmp-default-baremetal-k3r5/work/x86_64-k3r5-nativesdk-arago-linux/gcc-cross-canadian-arm/13.3.0/recipe-sysroot-native|/not/exist|g"
> > > -e
> > > "s|/scratch/jenkins_builds/arago-scarthgap-wip/build/build/arago-tmp-default-baremetal-k3r5/work/x86_64-k3r5-nativesdk-arago-linux/gcc-cross-canadian-arm/13.3.0/recipe-sysroot|/not/exist|g"
> > > /scratch/jenkins_builds/arago-scarthgap-wip/build/build/arago-tmp-default-baremetal-k3r5/work/x86_64-k3r5-nativesdk-arago-linux/gcc-cross-canadian-arm/13.3.0/image/usr/local/oe-sdk-hardcoded-buildpath/sysroots/x86_64-arago-linux/usr/lib/arm-oe-eabi/gcc/arm-oe-eabi/13.3.0/include-fixed/pthread.h'
> > > WARNING: Backtrace (BB generated script):
> > >         #1: do_install,
> > > /scratch/jenkins_builds/arago-scarthgap-wip/build/build/arago-tmp-default-baremetal-k3r5/work/x86_64-k3r5-nativesdk-arago-linux/gcc-cross-canadian-arm/13.3.0/temp/run.do_install.958706,
> > > line 182
> > >         #2: main,
> > > /scratch/jenkins_builds/arago-scarthgap-wip/build/build/arago-tmp-default-baremetal-k3r5/work/x86_64-k3r5-nativesdk-arago-linux/gcc-cross-canadian-arm/13.3.0/temp/run.do_install.958706,
> > > line 301
> > >
> > >
> > > And line 182 is the sed line.
> > >
> > > Should the sed call be wrapped in an if file exists check?
> >
> > I'll revert this patch since it is causing  build failures.
> >
> > Steve
> >
> >
> > > On 3/14/2025 2:35 PM, Steve Sakoman wrote:
> > > > From: Sana Kazi <sanakazi720@gmail.com>
> > > >
> > > > Replace the hardcoded path with /not/exist as used for other
> > > > options[--with-sysroot] to ensure pthread.h does not contain
> > > > hardocded references to TMPDIR:
> > > >
> > > > ERROR: gcc-cross-canadian-x86-64-13.3.0-r0 do_package_qa: QA Issue:
> > > > File /usr/local/oe-sdk-hardcoded-buildpath/sysroots/x86_64-pokysdk-linux/
> > > > usr/lib/x86_64-poky-linux/gcc/x86_64-poky-linux/13.3.0/include-fixed/
> > > > pthread.h in package gcc-cross-canadian-x86-64 contains reference to
> > > > TMPDIR [buildpaths]
> > > >
> > > > Signed-off-by: Sana Kazi <sanakazi720@gmail.com>
> > > > Signed-off-by: Steve Sakoman <steve@sakoman.com>
> > > > ---
> > > >   meta/recipes-devtools/gcc/gcc-cross-canadian.inc | 5 +++++
> > > >   1 file changed, 5 insertions(+)
> > > >
> > > > diff --git a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
> > > > index adcaef2b0f..06f0cef864 100644
> > > > --- a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
> > > > +++ b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
> > > > @@ -118,6 +118,11 @@ do_install () {
> > > >       # We don't care about the gcc-<version> copies
> > > >       rm -f ${D}${bindir}/*gcc-${BINV}*
> > > >
> > > > +        # Remove buildpaths from pthread.h
> > > > +        sed -i -e "s|${RECIPE_SYSROOT_NATIVE}|/not/exist|g" \
> > > > +        -e "s|${RECIPE_SYSROOT}|/not/exist|g" \
> > > > +        ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include-fixed/pthread.h
> > > > +
> > > >       # Cleanup empty directories which are not shipped
> > > >       # we use rmdir instead of 'rm -f' to ensure the non empty directories are not deleted
> > > >       # ${D}${libdir}/../lib only seems to appear with SDKMACHINE=i686
> > > >
> > > >
> > > >
> > > >
> > > >
> > >
> > > --
> > > Ryan Eatmon                reatmon@ti.com
> > > -----------------------------------------
> > > Texas Instruments, Inc.  -  LCPD  -  MGTS
> >
> > -=-=-=-=-=-=-=-=-=-=-=-
> > Links: You receive all messages sent to this group.
> > View/Reply Online (#213404): https://lists.openembedded.org/g/openembedded-core/message/213404
> > Mute This Topic: https://lists.openembedded.org/mt/111706016/3617156
> > Group Owner: openembedded-core+owner@lists.openembedded.org
> > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [martin.jansa@gmail.com]
> > -=-=-=-=-=-=-=-=-=-=-=-
> >
Martin Jansa March 20, 2025, 4:22 p.m. UTC | #5 
On Thu, Mar 20, 2025 at 5:18 PM Steve Sakoman <steve@sakoman.com> wrote:
>
> On Thu, Mar 20, 2025 at 7:52 AM Martin Jansa <martin.jansa@gmail.com> wrote:
> >
> > I think we should backport:
> >
> > https://git.openembedded.org/openembedded-core/commit/?h=styhead&id=350ff7d53f7506de2bc01f0efc569b8294b9afea
> > https://git.openembedded.org/openembedded-core/commit/?h=styhead&id=9221e4ab8cca4c06dc3d5c1de2fd4ce46477578a
> >
> > to fix this issue in scarthgap, that's what I did locally in
> > gcc-cross-canadian bbappend.
> >
> > Steve: should I send the backports?
>
> Yes, please do!

Actually the first one was already applied in last scarthgap update,
so I've sent the 2nd one.

Cheers,
diff mbox series

Patch

diff --git a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
index adcaef2b0f..06f0cef864 100644
--- a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
+++ b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
@@ -118,6 +118,11 @@  do_install () {
 	# We don't care about the gcc-<version> copies
 	rm -f ${D}${bindir}/*gcc-${BINV}*
 
+        # Remove buildpaths from pthread.h
+        sed -i -e "s|${RECIPE_SYSROOT_NATIVE}|/not/exist|g" \
+        -e "s|${RECIPE_SYSROOT}|/not/exist|g" \
+        ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include-fixed/pthread.h
+
 	# Cleanup empty directories which are not shipped
 	# we use rmdir instead of 'rm -f' to ensure the non empty directories are not deleted
 	# ${D}${libdir}/../lib only seems to appear with SDKMACHINE=i686