From 7ffbd5ed6c960e8079beaee9c8d5be570a74e462 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Mon, 12 Aug 2024 20:04:22 -0400 Subject: [PATCH] *: qemu-user-static -> qemu-user --- common/build-helper/gir.sh | 2 +- common/build-helper/qemu.sh | 4 ++-- srcpkgs/aravis/template | 2 +- srcpkgs/glib-bootstrap/template | 2 +- srcpkgs/glib/template | 2 +- srcpkgs/gobject-introspection-bootstrap/template | 2 +- srcpkgs/gobject-introspection/template | 2 +- srcpkgs/libgpg-error/template | 2 +- srcpkgs/libportal/template | 2 +- srcpkgs/php8.2/template | 2 +- srcpkgs/php8.3/template | 2 +- srcpkgs/umockdev/template | 2 +- xbps-src | 2 +- 13 files changed, 14 insertions(+), 14 deletions(-) diff --git a/common/build-helper/gir.sh b/common/build-helper/gir.sh index 70699adb179..e4ecd4f18af 100644 --- a/common/build-helper/gir.sh +++ b/common/build-helper/gir.sh @@ -17,7 +17,7 @@ if [ "$build_option_gir" ] || [[ $build_options != *"gir"* ]]; then if [ "$CROSS_BUILD" ]; then # Required for running binaries produced from g-ir-compiler # via g-ir-scanner-qemuwrapper - hostmakedepends+=" qemu-user-static" + hostmakedepends+=" qemu-user" # Required for running the g-ir-scanner-lddwrapper hostmakedepends+=" prelink-cross" diff --git a/common/build-helper/qemu.sh b/common/build-helper/qemu.sh index d6a4342f5e8..f5c56585101 100644 --- a/common/build-helper/qemu.sh +++ b/common/build-helper/qemu.sh @@ -1,7 +1,7 @@ if [ "$CROSS_BUILD" ]; then export QEMU_LD_PREFIX=${XBPS_CROSS_BASE} - if [[ $hostmakedepends != *"qemu-user-static"* ]]; then - hostmakedepends+=" qemu-user-static" + if [[ $hostmakedepends != *"qemu-user"* ]]; then + hostmakedepends+=" qemu-user" fi fi diff --git a/srcpkgs/aravis/template b/srcpkgs/aravis/template index cbcc7ea10d5..33709983cc8 100644 --- a/srcpkgs/aravis/template +++ b/srcpkgs/aravis/template @@ -18,7 +18,7 @@ checksum=d70b125666b23ca4c0f8986fa0786a3d2b9efb7a56b558b703083cdfaa793f4e make_check=ci-skip if [ "$CROSS_BUILD" ]; then - hostmakedepends+=" glib-devel prelink-cross qemu-user-static" + hostmakedepends+=" glib-devel prelink-cross qemu-user" fi libaravis_package() { diff --git a/srcpkgs/glib-bootstrap/template b/srcpkgs/glib-bootstrap/template index 6693c498138..62db4db2792 100644 --- a/srcpkgs/glib-bootstrap/template +++ b/srcpkgs/glib-bootstrap/template @@ -7,7 +7,7 @@ pkgname=glib-bootstrap version=2.80.3 revision=1 build_style=meson -# static version is necessary for qemu-user-static; +# static version is necessary for qemu-user # also disable LTO, otherwise there are multiple failures when linking qemu configure_args="-Dman=true -Dselinux=disabled --default-library=both -Db_lto=false -Dintrospection=disabled" diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template index c3cf007b7d3..548dc0f3d17 100644 --- a/srcpkgs/glib/template +++ b/srcpkgs/glib/template @@ -5,7 +5,7 @@ version=2.80.3 revision=1 build_style=meson build_helper=qemu -# static version is necessary for qemu-user-static; +# static version is necessary for qemu-user # also disable LTO, otherwise there are multiple failures when linking qemu configure_args="-Dman=true -Dselinux=disabled -Dintrospection=enabled $(vopt_bool gtk_doc documentation) --default-library=both -Db_lto=false" diff --git a/srcpkgs/gobject-introspection-bootstrap/template b/srcpkgs/gobject-introspection-bootstrap/template index 7e69db1be35..1ac8bd90001 100644 --- a/srcpkgs/gobject-introspection-bootstrap/template +++ b/srcpkgs/gobject-introspection-bootstrap/template @@ -27,7 +27,7 @@ conflicts="libgirepository libgirepository-devel gobject-introspection" noverifyrdeps=yes if [ "$CROSS_BUILD" ]; then - hostmakedepends+=" gobject-introspection-bootstrap qemu-user-static prelink-cross" + hostmakedepends+=" gobject-introspection-bootstrap qemu-user prelink-cross" configure_args+=" -Dgi_cross_use_prebuilt_gi=true -Dgi_cross_binary_wrapper=/usr/bin/g-ir-scanner-qemuwrapper -Dgi_cross_ldd_wrapper=/usr/bin/g-ir-scanner-lddwrapper diff --git a/srcpkgs/gobject-introspection/template b/srcpkgs/gobject-introspection/template index b4da5f12023..4a8810a9523 100644 --- a/srcpkgs/gobject-introspection/template +++ b/srcpkgs/gobject-introspection/template @@ -20,7 +20,7 @@ checksum=a1df7c424e15bda1ab639c00e9051b9adf5cea1a9e512f8a603b53cd199bc6d8 python_version=3 if [ "$CROSS_BUILD" ]; then - hostmakedepends+=" gobject-introspection qemu-user-static prelink-cross" + hostmakedepends+=" gobject-introspection qemu-user prelink-cross" configure_args+=" -Dgi_cross_use_prebuilt_gi=true -Dgi_cross_binary_wrapper=/usr/bin/g-ir-scanner-qemuwrapper -Dgi_cross_ldd_wrapper=/usr/bin/g-ir-scanner-lddwrapper diff --git a/srcpkgs/libgpg-error/template b/srcpkgs/libgpg-error/template index 57f80c5e2ab..3c76989aa85 100644 --- a/srcpkgs/libgpg-error/template +++ b/srcpkgs/libgpg-error/template @@ -12,7 +12,7 @@ distfiles="https://www.gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${version}.tar checksum=8b79d54639dbf4abc08b5406fb2f37e669a2dec091dd024fb87dd367131c63a9 if [ "$CROSS_BUILD" ]; then - hostmakedepends="qemu-user-static" + hostmakedepends="qemu-user" fi post_install() { diff --git a/srcpkgs/libportal/template b/srcpkgs/libportal/template index c25d354e5af..bff7620ea3b 100644 --- a/srcpkgs/libportal/template +++ b/srcpkgs/libportal/template @@ -22,7 +22,7 @@ build_options="gir gtk_doc" build_options_default="gir gtk_doc" if [ -n "$CROSS_BUILD" ]; then - hostmakedepends+=" qemu-user-static prelink-cross" + hostmakedepends+=" qemu-user prelink-cross" fi libportal-devel_package() { diff --git a/srcpkgs/php8.2/template b/srcpkgs/php8.2/template index 50e6c851b1c..fe9559e181f 100644 --- a/srcpkgs/php8.2/template +++ b/srcpkgs/php8.2/template @@ -27,7 +27,7 @@ lib32disabled=yes if [ -n "$CROSS_BUILD" ]; then # phar and pear need php to build - hostmakedepends+=" php${_php_version} qemu-user-static" + hostmakedepends+=" php${_php_version} qemu-user" CFLAGS+=" -DHAVE_LIBDL -DHAVE_DLOPEN -DHAVE_DLSYM diff --git a/srcpkgs/php8.3/template b/srcpkgs/php8.3/template index f95ee61e305..ede31751655 100644 --- a/srcpkgs/php8.3/template +++ b/srcpkgs/php8.3/template @@ -27,7 +27,7 @@ lib32disabled=yes if [ -n "$CROSS_BUILD" ]; then # phar and pear need php to build - hostmakedepends+=" php${_php_version} qemu-user-static" + hostmakedepends+=" php${_php_version} qemu-user" CFLAGS+=" -DHAVE_LIBDL -DHAVE_DLOPEN -DHAVE_DLSYM diff --git a/srcpkgs/umockdev/template b/srcpkgs/umockdev/template index 7dc2f512695..4dc52e13c94 100644 --- a/srcpkgs/umockdev/template +++ b/srcpkgs/umockdev/template @@ -14,7 +14,7 @@ distfiles="https://github.com/martinpitt/umockdev/releases/download/${version}/u checksum=6c6ebf6e6209b6a49746e0d91a448d027b54271bab82ed70a132ecf294ca13cf if [ "$CROSS_BUILD" ]; then - hostmakedepends+=" gobject-introspection qemu-user-static" + hostmakedepends+=" gobject-introspection qemu-user" fi umockdev-devel_package() { diff --git a/xbps-src b/xbps-src index f8c21b3b927..00e955fe816 100755 --- a/xbps-src +++ b/xbps-src @@ -166,7 +166,7 @@ Options: -A Use this host machine. Automatically creates masterdir- if it doesn't - already exist. Some host machines may require qemu-user-static and + already exist. Some host machines may require qemu-user and binfmt-support if not natively supported by the processor. Supported hosts: $(print_cross_targets)