*: qemu-user-static -> qemu-user

void-linux · Sep 7, 2024 · b9b025a · b9b025a
1 parent 3e51307
commit b9b025a
Show file tree

Hide file tree

Showing 13 changed files with 14 additions and 14 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -166,7 +166,7 @@ Options:
 
 -A <host>
     Use this host machine. Automatically creates masterdir-<host> 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)