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

This commit is contained in:
classabbyamp 2024-08-12 20:04:22 -04:00 committed by classabbyamp
parent ec662ff61f
commit 7ffbd5ed6c
13 changed files with 14 additions and 14 deletions

View File

@ -17,7 +17,7 @@ if [ "$build_option_gir" ] || [[ $build_options != *"gir"* ]]; then
if [ "$CROSS_BUILD" ]; then if [ "$CROSS_BUILD" ]; then
# Required for running binaries produced from g-ir-compiler # Required for running binaries produced from g-ir-compiler
# via g-ir-scanner-qemuwrapper # via g-ir-scanner-qemuwrapper
hostmakedepends+=" qemu-user-static" hostmakedepends+=" qemu-user"
# Required for running the g-ir-scanner-lddwrapper # Required for running the g-ir-scanner-lddwrapper
hostmakedepends+=" prelink-cross" hostmakedepends+=" prelink-cross"

View File

@ -1,7 +1,7 @@
if [ "$CROSS_BUILD" ]; then if [ "$CROSS_BUILD" ]; then
export QEMU_LD_PREFIX=${XBPS_CROSS_BASE} export QEMU_LD_PREFIX=${XBPS_CROSS_BASE}
if [[ $hostmakedepends != *"qemu-user-static"* ]]; then if [[ $hostmakedepends != *"qemu-user"* ]]; then
hostmakedepends+=" qemu-user-static" hostmakedepends+=" qemu-user"
fi fi
fi fi

View File

@ -18,7 +18,7 @@ checksum=d70b125666b23ca4c0f8986fa0786a3d2b9efb7a56b558b703083cdfaa793f4e
make_check=ci-skip make_check=ci-skip
if [ "$CROSS_BUILD" ]; then if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" glib-devel prelink-cross qemu-user-static" hostmakedepends+=" glib-devel prelink-cross qemu-user"
fi fi
libaravis_package() { libaravis_package() {

View File

@ -7,7 +7,7 @@ pkgname=glib-bootstrap
version=2.80.3 version=2.80.3
revision=1 revision=1
build_style=meson 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 # also disable LTO, otherwise there are multiple failures when linking qemu
configure_args="-Dman=true -Dselinux=disabled configure_args="-Dman=true -Dselinux=disabled
--default-library=both -Db_lto=false -Dintrospection=disabled" --default-library=both -Db_lto=false -Dintrospection=disabled"

View File

@ -5,7 +5,7 @@ version=2.80.3
revision=1 revision=1
build_style=meson build_style=meson
build_helper=qemu 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 # also disable LTO, otherwise there are multiple failures when linking qemu
configure_args="-Dman=true -Dselinux=disabled -Dintrospection=enabled configure_args="-Dman=true -Dselinux=disabled -Dintrospection=enabled
$(vopt_bool gtk_doc documentation) --default-library=both -Db_lto=false" $(vopt_bool gtk_doc documentation) --default-library=both -Db_lto=false"

View File

@ -27,7 +27,7 @@ conflicts="libgirepository libgirepository-devel gobject-introspection"
noverifyrdeps=yes noverifyrdeps=yes
if [ "$CROSS_BUILD" ]; then 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 configure_args+=" -Dgi_cross_use_prebuilt_gi=true
-Dgi_cross_binary_wrapper=/usr/bin/g-ir-scanner-qemuwrapper -Dgi_cross_binary_wrapper=/usr/bin/g-ir-scanner-qemuwrapper
-Dgi_cross_ldd_wrapper=/usr/bin/g-ir-scanner-lddwrapper -Dgi_cross_ldd_wrapper=/usr/bin/g-ir-scanner-lddwrapper

View File

@ -20,7 +20,7 @@ checksum=a1df7c424e15bda1ab639c00e9051b9adf5cea1a9e512f8a603b53cd199bc6d8
python_version=3 python_version=3
if [ "$CROSS_BUILD" ]; then 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 configure_args+=" -Dgi_cross_use_prebuilt_gi=true
-Dgi_cross_binary_wrapper=/usr/bin/g-ir-scanner-qemuwrapper -Dgi_cross_binary_wrapper=/usr/bin/g-ir-scanner-qemuwrapper
-Dgi_cross_ldd_wrapper=/usr/bin/g-ir-scanner-lddwrapper -Dgi_cross_ldd_wrapper=/usr/bin/g-ir-scanner-lddwrapper

View File

@ -12,7 +12,7 @@ distfiles="https://www.gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${version}.tar
checksum=8b79d54639dbf4abc08b5406fb2f37e669a2dec091dd024fb87dd367131c63a9 checksum=8b79d54639dbf4abc08b5406fb2f37e669a2dec091dd024fb87dd367131c63a9
if [ "$CROSS_BUILD" ]; then if [ "$CROSS_BUILD" ]; then
hostmakedepends="qemu-user-static" hostmakedepends="qemu-user"
fi fi
post_install() { post_install() {

View File

@ -22,7 +22,7 @@ build_options="gir gtk_doc"
build_options_default="gir gtk_doc" build_options_default="gir gtk_doc"
if [ -n "$CROSS_BUILD" ]; then if [ -n "$CROSS_BUILD" ]; then
hostmakedepends+=" qemu-user-static prelink-cross" hostmakedepends+=" qemu-user prelink-cross"
fi fi
libportal-devel_package() { libportal-devel_package() {

View File

@ -27,7 +27,7 @@ lib32disabled=yes
if [ -n "$CROSS_BUILD" ]; then if [ -n "$CROSS_BUILD" ]; then
# phar and pear need php to build # phar and pear need php to build
hostmakedepends+=" php${_php_version} qemu-user-static" hostmakedepends+=" php${_php_version} qemu-user"
CFLAGS+=" -DHAVE_LIBDL CFLAGS+=" -DHAVE_LIBDL
-DHAVE_DLOPEN -DHAVE_DLOPEN
-DHAVE_DLSYM -DHAVE_DLSYM

View File

@ -27,7 +27,7 @@ lib32disabled=yes
if [ -n "$CROSS_BUILD" ]; then if [ -n "$CROSS_BUILD" ]; then
# phar and pear need php to build # phar and pear need php to build
hostmakedepends+=" php${_php_version} qemu-user-static" hostmakedepends+=" php${_php_version} qemu-user"
CFLAGS+=" -DHAVE_LIBDL CFLAGS+=" -DHAVE_LIBDL
-DHAVE_DLOPEN -DHAVE_DLOPEN
-DHAVE_DLSYM -DHAVE_DLSYM

View File

@ -14,7 +14,7 @@ distfiles="https://github.com/martinpitt/umockdev/releases/download/${version}/u
checksum=6c6ebf6e6209b6a49746e0d91a448d027b54271bab82ed70a132ecf294ca13cf checksum=6c6ebf6e6209b6a49746e0d91a448d027b54271bab82ed70a132ecf294ca13cf
if [ "$CROSS_BUILD" ]; then if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" gobject-introspection qemu-user-static" hostmakedepends+=" gobject-introspection qemu-user"
fi fi
umockdev-devel_package() { umockdev-devel_package() {

View File

@ -166,7 +166,7 @@ Options:
-A <host> -A <host>
Use this host machine. Automatically creates masterdir-<host> if it doesn't 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: binfmt-support if not natively supported by the processor. Supported hosts:
$(print_cross_targets) $(print_cross_targets)