diff mbox series

gitlab: Drop --static from s390x linux-user build

Message ID 20240506202020.422514-1-richard.henderson@linaro.org
State Superseded
Headers show
Series gitlab: Drop --static from s390x linux-user build | expand

Commit Message

Richard Henderson May 6, 2024, 8:20 p.m. UTC
The host does not have the correct libraries installed for static pie,
which causes host/guest address space interference for some tests.
There's no real gain from linking statically, so drop it.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
Per my suggestion in

https://lore.kernel.org/qemu-devel/50c27a9f-fd75-4f8e-9a2d-488d8df4f9b9@linaro.org


r~
---
 .gitlab-ci.d/custom-runners/ubuntu-22.04-s390x.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Thomas Huth May 7, 2024, 6:03 a.m. UTC | #1
On 06/05/2024 22.20, Richard Henderson wrote:
> The host does not have the correct libraries installed for static pie,
> which causes host/guest address space interference for some tests.
> There's no real gain from linking statically, so drop it.
> 
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
> Per my suggestion in
> 
> https://lore.kernel.org/qemu-devel/50c27a9f-fd75-4f8e-9a2d-488d8df4f9b9@linaro.org
> 
> 
> r~
> ---
>   .gitlab-ci.d/custom-runners/ubuntu-22.04-s390x.yml | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/.gitlab-ci.d/custom-runners/ubuntu-22.04-s390x.yml b/.gitlab-ci.d/custom-runners/ubuntu-22.04-s390x.yml
> index 105981879f..3a2b1e1d24 100644
> --- a/.gitlab-ci.d/custom-runners/ubuntu-22.04-s390x.yml
> +++ b/.gitlab-ci.d/custom-runners/ubuntu-22.04-s390x.yml
> @@ -2,7 +2,7 @@
>   # setup by the scripts/ci/setup/build-environment.yml task
>   # "Install basic packages to build QEMU on Ubuntu 22.04"
>   
> -ubuntu-22.04-s390x-all-linux-static:
> +ubuntu-22.04-s390x-all-linux:
>    extends: .custom_runner_template
>    needs: []
>    stage: build
> @@ -15,7 +15,7 @@ ubuntu-22.04-s390x-all-linux-static:
>    script:
>    - mkdir build
>    - cd build
> - - ../configure --enable-debug --static --disable-system
> + - ../configure --enable-debug-tcg --disable-system --disable-tools --disable-docs

Maybe mention the --disable-tools and --disable-docs in the commit message, too?

Anyway:
Reviewed-by: Thomas Huth <thuth@redhat.com>
Peter Maydell May 7, 2024, 9:22 a.m. UTC | #2
On Mon, 6 May 2024 at 21:21, Richard Henderson
<richard.henderson@linaro.org> wrote:
>
> The host does not have the correct libraries installed for static pie,
> which causes host/guest address space interference for some tests.
> There's no real gain from linking statically, so drop it.
>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---

The lack of rcrt1.o seems to be a bug in the Ubuntu Jammy (22.04) libc6-dev
packages. It is present in the versions in Mantic (23.04) and Noble
(24.04).

thanks
-- PMM
diff mbox series

Patch

diff --git a/.gitlab-ci.d/custom-runners/ubuntu-22.04-s390x.yml b/.gitlab-ci.d/custom-runners/ubuntu-22.04-s390x.yml
index 105981879f..3a2b1e1d24 100644
--- a/.gitlab-ci.d/custom-runners/ubuntu-22.04-s390x.yml
+++ b/.gitlab-ci.d/custom-runners/ubuntu-22.04-s390x.yml
@@ -2,7 +2,7 @@ 
 # setup by the scripts/ci/setup/build-environment.yml task
 # "Install basic packages to build QEMU on Ubuntu 22.04"
 
-ubuntu-22.04-s390x-all-linux-static:
+ubuntu-22.04-s390x-all-linux:
  extends: .custom_runner_template
  needs: []
  stage: build
@@ -15,7 +15,7 @@  ubuntu-22.04-s390x-all-linux-static:
  script:
  - mkdir build
  - cd build
- - ../configure --enable-debug --static --disable-system
+ - ../configure --enable-debug-tcg --disable-system --disable-tools --disable-docs
    || { cat config.log meson-logs/meson-log.txt; exit 1; }
  - make --output-sync -j`nproc`
  - make --output-sync check-tcg