[libcamera-ci,v2] Fix debian 13 build with gcc 13
diff mbox series

Message ID 20250725155646.2716399-1-barnabas.pocze@ideasonboard.com
State New
Headers show
Series
  • [libcamera-ci,v2] Fix debian 13 build with gcc 13
Related show

Commit Message

Barnabás Pőcze July 25, 2025, 3:56 p.m. UTC 
Updating the debian 13 container causes linking to fail with gcc 13.
The reason for this is that gcc 13 is not the native compiler, and
the distribution-built packages use gcc 14. So when linking against
gtest or qt6, they will refer to symbols that are not provided by
the gcc 13 libraries.

Fix that by disabling `qcam`, the only user of qt; and forcing meson
to fall back to the wrap dependency for gtest.

Signed-off-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
https://gitlab.freedesktop.org/pobrn/libcamera/-/jobs/81288161

changes in v2:
   * rebuild correct container

v1: https://patchwork.libcamera.org/patch/23966/
---
 gitlab-ci.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--
2.50.1

Comments

Kieran Bingham July 25, 2025, 4:33 p.m. UTC | #1 
Quoting Barnabás Pőcze (2025-07-25 16:56:46)
> Updating the debian 13 container causes linking to fail with gcc 13.
> The reason for this is that gcc 13 is not the native compiler, and
> the distribution-built packages use gcc 14. So when linking against
> gtest or qt6, they will refer to symbols that are not provided by
> the gcc 13 libraries.
> 
> Fix that by disabling `qcam`, the only user of qt; and forcing meson
> to fall back to the wrap dependency for gtest.
> 
> Signed-off-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com>
> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>

> ---
> https://gitlab.freedesktop.org/pobrn/libcamera/-/jobs/81288161
> 
> changes in v2:
>    * rebuild correct container
> 
> v1: https://patchwork.libcamera.org/patch/23966/
> ---
>  gitlab-ci.yml | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/gitlab-ci.yml b/gitlab-ci.yml
> index 885c1b7..7c80f24 100644
> --- a/gitlab-ci.yml
> +++ b/gitlab-ci.yml
> @@ -70,7 +70,7 @@ include:
>  .libcamera-ci.debian:13:
>    variables:
>      FDO_DISTRIBUTION_VERSION: 'trixie'
> -    FDO_DISTRIBUTION_TAG: '2025-02-27.1'
> +    FDO_DISTRIBUTION_TAG: '2025-07-25.1'
> 
>  .container-debian:
>    extends:
> @@ -224,6 +224,8 @@ build-full:debian:13:
>          MESON_OPTIONS: >-
>            ${MESON_ALL_OPTIONS}
>            -D cpp_std=c++20
> +          -D force_fallback_for=['gtest']
> +          -D qcam=disabled
>        - ARCH: amd64
>          CC: gcc-14
>          CXX: g++-14
> --
> 2.50.1

Patch
diff mbox series 

diff --git a/gitlab-ci.yml b/gitlab-ci.yml
index 885c1b7..7c80f24 100644
--- a/gitlab-ci.yml
+++ b/gitlab-ci.yml
@@ -70,7 +70,7 @@  include:
 .libcamera-ci.debian:13:
   variables:
     FDO_DISTRIBUTION_VERSION: 'trixie'
-    FDO_DISTRIBUTION_TAG: '2025-02-27.1'
+    FDO_DISTRIBUTION_TAG: '2025-07-25.1'

 .container-debian:
   extends:
@@ -224,6 +224,8 @@  build-full:debian:13:
         MESON_OPTIONS: >-
           ${MESON_ALL_OPTIONS}
           -D cpp_std=c++20
+          -D force_fallback_for=['gtest']
+          -D qcam=disabled
       - ARCH: amd64
         CC: gcc-14
         CXX: g++-14