diff mbox series

[v2,08/28] libjpeg-turbo: Fix build on mips/clang

Message ID 20250520-clang-toolchain-v2-8-db97c2eb3756@gmail.com
State Accepted, archived
Commit 305072dbde8ec5a4f1d455f7fbfa3a631f9f947f
Headers show
Series clang: Add clang C/C++ toolchain | expand

Commit Message

Khem Raj May 21, 2025, 6:19 a.m. UTC
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta/recipes-graphics/jpeg/libjpeg-turbo_3.1.0.bb | 6 ++++++
 1 file changed, 6 insertions(+)

Comments

Ross Burton May 22, 2025, 9:47 a.m. UTC | #1
On 21 May 2025, at 07:19, Khem Raj via lists.openembedded.org <raj.khem=gmail.com@lists.openembedded.org> wrote:
> 
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
> meta/recipes-graphics/jpeg/libjpeg-turbo_3.1.0.bb | 6 ++++++
> 1 file changed, 6 insertions(+)
> 
> diff --git a/meta/recipes-graphics/jpeg/libjpeg-turbo_3.1.0.bb b/meta/recipes-graphics/jpeg/libjpeg-turbo_3.1.0.bb
> index 8533bd8525311e783572cbafb6fccf240db9e0e8..90aa2ef43956f0a1e64f8e08e47d953bf5773e19 100644
> --- a/meta/recipes-graphics/jpeg/libjpeg-turbo_3.1.0.bb
> +++ b/meta/recipes-graphics/jpeg/libjpeg-turbo_3.1.0.bb
> @@ -47,6 +47,12 @@ EXTRA_OECMAKE:append:class-target:powerpc64le = " ${@bb.utils.contains("TUNE_FEA
> DEBUG_OPTIMIZATION:append:armv4 = " ${@bb.utils.contains('TUNE_CCARGS', '-mthumb', '-fomit-frame-pointer', '', d)}"
> DEBUG_OPTIMIZATION:append:armv5 = " ${@bb.utils.contains('TUNE_CCARGS', '-mthumb', '-fomit-frame-pointer', '', d)}"
> 
> +# libjpeg-turbo-2.0.2/simd/mips/jsimd_dspr2.S
> +# <instantiation>:13:5: error: invalid token in expression
> +# .if $17 != 0
> +# ^
> +CFLAGS:append:toolchain-clang:mipsarch = " -no-integrated-as"

The log is from 2.0.2, did you replicate this with 3.1.0 before moving from meta-clang?

Ross
Khem Raj May 22, 2025, 3:36 p.m. UTC | #2
On Thu, May 22, 2025 at 2:47 AM Ross Burton <Ross.Burton@arm.com> wrote:
>
> On 21 May 2025, at 07:19, Khem Raj via lists.openembedded.org <raj.khem=gmail.com@lists.openembedded.org> wrote:
> >
> > Signed-off-by: Khem Raj <raj.khem@gmail.com>
> > ---
> > meta/recipes-graphics/jpeg/libjpeg-turbo_3.1.0.bb | 6 ++++++
> > 1 file changed, 6 insertions(+)
> >
> > diff --git a/meta/recipes-graphics/jpeg/libjpeg-turbo_3.1.0.bb b/meta/recipes-graphics/jpeg/libjpeg-turbo_3.1.0.bb
> > index 8533bd8525311e783572cbafb6fccf240db9e0e8..90aa2ef43956f0a1e64f8e08e47d953bf5773e19 100644
> > --- a/meta/recipes-graphics/jpeg/libjpeg-turbo_3.1.0.bb
> > +++ b/meta/recipes-graphics/jpeg/libjpeg-turbo_3.1.0.bb
> > @@ -47,6 +47,12 @@ EXTRA_OECMAKE:append:class-target:powerpc64le = " ${@bb.utils.contains("TUNE_FEA
> > DEBUG_OPTIMIZATION:append:armv4 = " ${@bb.utils.contains('TUNE_CCARGS', '-mthumb', '-fomit-frame-pointer', '', d)}"
> > DEBUG_OPTIMIZATION:append:armv5 = " ${@bb.utils.contains('TUNE_CCARGS', '-mthumb', '-fomit-frame-pointer', '', d)}"
> >
> > +# libjpeg-turbo-2.0.2/simd/mips/jsimd_dspr2.S
> > +# <instantiation>:13:5: error: invalid token in expression
> > +# .if $17 != 0
> > +# ^
> > +CFLAGS:append:toolchain-clang:mipsarch = " -no-integrated-as"
>
> The log is from 2.0.2, did you replicate this with 3.1.0 before moving from meta-clang?

Yes, I have started with vanilla poky and waded through world builds
for all qemu machines, bringing only the changes which were
still failing and not fixable differently. If this helps.

>
> Ross
>
diff mbox series

Patch

diff --git a/meta/recipes-graphics/jpeg/libjpeg-turbo_3.1.0.bb b/meta/recipes-graphics/jpeg/libjpeg-turbo_3.1.0.bb
index 8533bd8525311e783572cbafb6fccf240db9e0e8..90aa2ef43956f0a1e64f8e08e47d953bf5773e19 100644
--- a/meta/recipes-graphics/jpeg/libjpeg-turbo_3.1.0.bb
+++ b/meta/recipes-graphics/jpeg/libjpeg-turbo_3.1.0.bb
@@ -47,6 +47,12 @@  EXTRA_OECMAKE:append:class-target:powerpc64le = " ${@bb.utils.contains("TUNE_FEA
 DEBUG_OPTIMIZATION:append:armv4 = " ${@bb.utils.contains('TUNE_CCARGS', '-mthumb', '-fomit-frame-pointer', '', d)}"
 DEBUG_OPTIMIZATION:append:armv5 = " ${@bb.utils.contains('TUNE_CCARGS', '-mthumb', '-fomit-frame-pointer', '', d)}"
 
+# libjpeg-turbo-2.0.2/simd/mips/jsimd_dspr2.S
+# <instantiation>:13:5: error: invalid token in expression
+# .if $17 != 0
+# ^
+CFLAGS:append:toolchain-clang:mipsarch = " -no-integrated-as"
+
 PACKAGES =+ "jpeg-tools libturbojpeg"
 
 DESCRIPTION:jpeg-tools = "The jpeg-tools package includes client programs to access libjpeg functionality.  These tools allow for the compression, decompression, transformation and display of JPEG files and benchmarking of the libjpeg library."