* [PR PATCH] common/build-helper/qemu: only install the relevant user emulator
@ 2024-09-18 4:09 classabbyamp
2024-09-18 8:44 ` [PR REVIEW] " sgn
` (6 more replies)
0 siblings, 7 replies; 8+ messages in thread
From: classabbyamp @ 2024-09-18 4:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 696 bytes --]
There is a new pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages qemu-helper-slim
https://github.com/void-linux/void-packages/pull/52254
common/build-helper/qemu: only install the relevant user emulator
now that the package is split, we don't have to install every emulator under the sun. also, clean up templates that explicitly hostmakedepend on qemu-user.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
A patch file from https://github.com/void-linux/void-packages/pull/52254.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qemu-helper-slim-52254.patch --]
[-- Type: text/x-diff, Size: 10849 bytes --]
From 5ee9a3369f7fd02eaf2544d4087f9015e068d2c3 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 18 Sep 2024 00:04:30 -0400
Subject: [PATCH 01/10] common/build-helper/qemu: only install the relevant
user emulator
now that the package is split, we don't have to install every emulator
under the sun.
---
common/build-helper/qemu.sh | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/common/build-helper/qemu.sh b/common/build-helper/qemu.sh
index f5c5658510102d..4fbd5fb86dde0c 100644
--- a/common/build-helper/qemu.sh
+++ b/common/build-helper/qemu.sh
@@ -1,8 +1,6 @@
if [ "$CROSS_BUILD" ]; then
export QEMU_LD_PREFIX=${XBPS_CROSS_BASE}
- if [[ $hostmakedepends != *"qemu-user"* ]]; then
- hostmakedepends+=" qemu-user"
- fi
+ hostmakedepends+=" qemu-user-${XBPS_TARGET_QEMU_MACHINE/x86_64/amd64}"
fi
vtargetrun() {
From f552a1f7d5458cb8a756140adb2ed820e42d5edd Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 18 Sep 2024 00:07:39 -0400
Subject: [PATCH 02/10] aravis: use qemu build helper instead of depending on
qemu-user
---
srcpkgs/aravis/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/aravis/template b/srcpkgs/aravis/template
index 33709983cc8bd7..4de49eb625d858 100644
--- a/srcpkgs/aravis/template
+++ b/srcpkgs/aravis/template
@@ -3,6 +3,7 @@ pkgname=aravis
version=0.8.33
revision=1
build_style=meson
+build_helper="qemu"
configure_args="-Ddocumentation=enabled"
hostmakedepends="pkg-config gobject-introspection gi-docgen gettext"
makedepends="gtk+3-devel glib-devel libusb-devel zlib-devel libxml2-devel
@@ -18,7 +19,7 @@ checksum=d70b125666b23ca4c0f8986fa0786a3d2b9efb7a56b558b703083cdfaa793f4e
make_check=ci-skip
if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" glib-devel prelink-cross qemu-user"
+ hostmakedepends+=" glib-devel prelink-cross"
fi
libaravis_package() {
From 43e5ce50837396fa3289f6db95992d89e6f0652b Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 18 Sep 2024 00:07:41 -0400
Subject: [PATCH 03/10] glib: use qemu build helper instead of depending on
qemu-user
---
srcpkgs/glib/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index 548dc0f3d17557..bbcf1e94915281 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -4,7 +4,7 @@ pkgname=glib
version=2.80.3
revision=1
build_style=meson
-build_helper=qemu
+build_helper="qemu"
# 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
From eb25b4b6a754832fbec25c925c6d0c464da3da11 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 18 Sep 2024 00:07:42 -0400
Subject: [PATCH 04/10] gobject-introspection-bootstrap: use qemu build helper
instead of depending on qemu-user
---
srcpkgs/gobject-introspection-bootstrap/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/gobject-introspection-bootstrap/template b/srcpkgs/gobject-introspection-bootstrap/template
index 1ac8bd90001ae3..86801942e3af72 100644
--- a/srcpkgs/gobject-introspection-bootstrap/template
+++ b/srcpkgs/gobject-introspection-bootstrap/template
@@ -7,6 +7,7 @@ pkgname=gobject-introspection-bootstrap
version=1.80.1
revision=2
build_style=meson
+build_helper="qemu"
configure_args="-Dbuild_introspection_data=false"
pycompile_dirs="usr/lib/gobject-introspection/giscanner"
hostmakedepends="flex pkg-config"
@@ -27,7 +28,7 @@ conflicts="libgirepository libgirepository-devel gobject-introspection"
noverifyrdeps=yes
if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" gobject-introspection-bootstrap qemu-user prelink-cross"
+ hostmakedepends+=" gobject-introspection-bootstrap 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
From 9a70034f2e84368f0784fe4b587c2fb04212b5d9 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 18 Sep 2024 00:07:42 -0400
Subject: [PATCH 05/10] gobject-introspection: use qemu build helper instead of
depending on qemu-user
---
srcpkgs/gobject-introspection/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/gobject-introspection/template b/srcpkgs/gobject-introspection/template
index 4a8810a95238fa..d39c7710cd4e69 100644
--- a/srcpkgs/gobject-introspection/template
+++ b/srcpkgs/gobject-introspection/template
@@ -4,6 +4,7 @@ pkgname=gobject-introspection
version=1.80.1
revision=2
build_style=meson
+build_helper="qemu"
pycompile_dirs="usr/lib/gobject-introspection/giscanner"
hostmakedepends="flex pkg-config"
# won't run tests with cairo to avoid cyclical deps
@@ -20,7 +21,7 @@ checksum=a1df7c424e15bda1ab639c00e9051b9adf5cea1a9e512f8a603b53cd199bc6d8
python_version=3
if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" gobject-introspection qemu-user prelink-cross"
+ hostmakedepends+=" gobject-introspection 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
From 7a41fb07bebd7aaf6cab16e73f6ea08a5c770f1f Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 18 Sep 2024 00:07:43 -0400
Subject: [PATCH 06/10] libgpg-error: use qemu build helper instead of
depending on qemu-user
---
srcpkgs/libgpg-error/template | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/srcpkgs/libgpg-error/template b/srcpkgs/libgpg-error/template
index 3c76989aa855d5..fd00c2177961be 100644
--- a/srcpkgs/libgpg-error/template
+++ b/srcpkgs/libgpg-error/template
@@ -3,6 +3,7 @@ pkgname=libgpg-error
version=1.49
revision=1
build_style=gnu-configure
+build_helper="qemu"
configure_args="--enable-install-gpg-error-config"
short_desc="Library for error values used by GnuPG component"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -11,10 +12,6 @@ homepage="https://www.gnupg.org"
distfiles="https://www.gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${version}.tar.bz2"
checksum=8b79d54639dbf4abc08b5406fb2f37e669a2dec091dd024fb87dd367131c63a9
-if [ "$CROSS_BUILD" ]; then
- hostmakedepends="qemu-user"
-fi
-
post_install() {
rm -r ${DESTDIR}/usr/share/common-lisp
}
From 6fd719f5b0daa0664537fb9cbeff06efc0e43f4d Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 18 Sep 2024 00:07:44 -0400
Subject: [PATCH 07/10] libportal: use qemu build helper instead of depending
on qemu-user
---
srcpkgs/libportal/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/libportal/template b/srcpkgs/libportal/template
index bff7620ea3b7ac..73a3a09ba50505 100644
--- a/srcpkgs/libportal/template
+++ b/srcpkgs/libportal/template
@@ -3,6 +3,7 @@ pkgname=libportal
version=0.7.1
revision=1
build_style=meson
+build_helper="qemu"
configure_args="$(vopt_bool gtk_doc docs) $(vopt_bool gir vapi)
-Dbackend-gtk3=enabled -Dbackend-gtk4=enabled -Dbackend-qt5=enabled"
hostmakedepends="pkg-config glib-devel gobject-introspection $(vopt_if gir vala)
@@ -22,7 +23,7 @@ build_options="gir gtk_doc"
build_options_default="gir gtk_doc"
if [ -n "$CROSS_BUILD" ]; then
- hostmakedepends+=" qemu-user prelink-cross"
+ hostmakedepends+=" prelink-cross"
fi
libportal-devel_package() {
From d6dd579196ed34b1d976b47c89eb5d280265324e Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 18 Sep 2024 00:07:44 -0400
Subject: [PATCH 08/10] php8.2: use qemu build helper instead of depending on
qemu-user
---
srcpkgs/php8.2/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/php8.2/template b/srcpkgs/php8.2/template
index fe9559e181f2c8..4fe20834f2b2d8 100644
--- a/srcpkgs/php8.2/template
+++ b/srcpkgs/php8.2/template
@@ -4,6 +4,7 @@ pkgname=php8.2
version=8.2.22
revision=1
_php_version=8.2
+build_helper="qemu"
hostmakedepends="bison pkg-config apache-devel"
makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
gmp-devel libcurl-devel libjpeg-turbo-devel libmariadbclient-devel
@@ -27,7 +28,7 @@ lib32disabled=yes
if [ -n "$CROSS_BUILD" ]; then
# phar and pear need php to build
- hostmakedepends+=" php${_php_version} qemu-user"
+ hostmakedepends+=" php${_php_version}"
CFLAGS+=" -DHAVE_LIBDL
-DHAVE_DLOPEN
-DHAVE_DLSYM
From 07eeb880c6a537924b65211147510aa29cee5eb1 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 18 Sep 2024 00:07:45 -0400
Subject: [PATCH 09/10] php8.3: use qemu build helper instead of depending on
qemu-user
---
srcpkgs/php8.3/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/php8.3/template b/srcpkgs/php8.3/template
index ede31751655581..9a415922f01fc9 100644
--- a/srcpkgs/php8.3/template
+++ b/srcpkgs/php8.3/template
@@ -4,6 +4,7 @@ pkgname=php8.3
version=8.3.10
revision=1
_php_version=8.3
+build_helper="qemu"
hostmakedepends="bison pkg-config apache-devel"
makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
gmp-devel libcurl-devel libjpeg-turbo-devel libmariadbclient-devel
@@ -27,7 +28,7 @@ lib32disabled=yes
if [ -n "$CROSS_BUILD" ]; then
# phar and pear need php to build
- hostmakedepends+=" php${_php_version} qemu-user"
+ hostmakedepends+=" php${_php_version}"
CFLAGS+=" -DHAVE_LIBDL
-DHAVE_DLOPEN
-DHAVE_DLSYM
From 0929f704d9a47e657da6e4d16cc384e03796c94c Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 18 Sep 2024 00:07:45 -0400
Subject: [PATCH 10/10] umockdev: use qemu build helper instead of depending on
qemu-user
---
srcpkgs/umockdev/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/umockdev/template b/srcpkgs/umockdev/template
index 4dc52e13c94fa0..517ed470554f91 100644
--- a/srcpkgs/umockdev/template
+++ b/srcpkgs/umockdev/template
@@ -3,6 +3,7 @@ pkgname=umockdev
version=0.17.13
revision=1
build_style=meson
+build_helper="qemu"
hostmakedepends="pkg-config vala"
makedepends="vala-devel eudev-libudev-devel libpcap-devel gobject-introspection"
checkdepends="eudev which gphoto2 libgudev-devel python3-gobject usbutils xz"
@@ -14,7 +15,7 @@ distfiles="https://github.com/martinpitt/umockdev/releases/download/${version}/u
checksum=6c6ebf6e6209b6a49746e0d91a448d027b54271bab82ed70a132ecf294ca13cf
if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" gobject-introspection qemu-user"
+ hostmakedepends+=" gobject-introspection"
fi
umockdev-devel_package() {
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR REVIEW] common/build-helper/qemu: only install the relevant user emulator
2024-09-18 4:09 [PR PATCH] common/build-helper/qemu: only install the relevant user emulator classabbyamp
@ 2024-09-18 8:44 ` sgn
2024-09-18 8:44 ` sgn
` (5 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: sgn @ 2024-09-18 8:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 194 bytes --]
New review comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/52254#discussion_r1764642383
Comment:
Ditto, `build_helper="gir"` and remove this block!
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR REVIEW] common/build-helper/qemu: only install the relevant user emulator
2024-09-18 4:09 [PR PATCH] common/build-helper/qemu: only install the relevant user emulator classabbyamp
2024-09-18 8:44 ` [PR REVIEW] " sgn
@ 2024-09-18 8:44 ` sgn
2024-09-18 8:44 ` sgn
` (4 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: sgn @ 2024-09-18 8:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 167 bytes --]
New review comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/52254#discussion_r1764645540
Comment:
`build_helper=gir` too.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR REVIEW] common/build-helper/qemu: only install the relevant user emulator
2024-09-18 4:09 [PR PATCH] common/build-helper/qemu: only install the relevant user emulator classabbyamp
2024-09-18 8:44 ` [PR REVIEW] " sgn
2024-09-18 8:44 ` sgn
@ 2024-09-18 8:44 ` sgn
2024-09-18 15:34 ` [PR PATCH] [Updated] " classabbyamp
` (3 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: sgn @ 2024-09-18 8:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 250 bytes --]
New review comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/52254#discussion_r1764638261
Comment:
Sound likes `gir` build helper with `glib-devel` in `hostmakedepends` and `libglib-devel` in `makedepends`
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Updated] common/build-helper/qemu: only install the relevant user emulator
2024-09-18 4:09 [PR PATCH] common/build-helper/qemu: only install the relevant user emulator classabbyamp
` (2 preceding siblings ...)
2024-09-18 8:44 ` sgn
@ 2024-09-18 15:34 ` classabbyamp
2024-09-18 16:09 ` classabbyamp
` (2 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: classabbyamp @ 2024-09-18 15:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 701 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages qemu-helper-slim
https://github.com/void-linux/void-packages/pull/52254
common/build-helper/qemu: only install the relevant user emulator
now that the package is split, we don't have to install every emulator under the sun. also, clean up templates that explicitly hostmakedepend on qemu-user.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
A patch file from https://github.com/void-linux/void-packages/pull/52254.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qemu-helper-slim-52254.patch --]
[-- Type: text/x-diff, Size: 12427 bytes --]
From 5ee9a3369f7fd02eaf2544d4087f9015e068d2c3 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 18 Sep 2024 00:04:30 -0400
Subject: [PATCH 01/11] common/build-helper/qemu: only install the relevant
user emulator
now that the package is split, we don't have to install every emulator
under the sun.
---
common/build-helper/qemu.sh | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/common/build-helper/qemu.sh b/common/build-helper/qemu.sh
index f5c5658510102d..4fbd5fb86dde0c 100644
--- a/common/build-helper/qemu.sh
+++ b/common/build-helper/qemu.sh
@@ -1,8 +1,6 @@
if [ "$CROSS_BUILD" ]; then
export QEMU_LD_PREFIX=${XBPS_CROSS_BASE}
- if [[ $hostmakedepends != *"qemu-user"* ]]; then
- hostmakedepends+=" qemu-user"
- fi
+ hostmakedepends+=" qemu-user-${XBPS_TARGET_QEMU_MACHINE/x86_64/amd64}"
fi
vtargetrun() {
From 51b1fea5596bb4bd210389147707c5134d3120db Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 18 Sep 2024 11:33:43 -0400
Subject: [PATCH 02/11] common/build-helper/gir: only install the relevent user
emulator
---
common/build-helper/gir.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/common/build-helper/gir.sh b/common/build-helper/gir.sh
index e4ecd4f18af485..720aa94d95ee6b 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"
+ hostmakedepends+=" qemu-user-${XBPS_TARGET_QEMU_MACHINE/x86_64/amd64}"
# Required for running the g-ir-scanner-lddwrapper
hostmakedepends+=" prelink-cross"
From 25f6a68c5d7df16af32dd6a5dea88519337722a5 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 18 Sep 2024 00:07:39 -0400
Subject: [PATCH 03/11] aravis: use qemu build helper instead of depending on
qemu-user
---
srcpkgs/aravis/template | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/aravis/template b/srcpkgs/aravis/template
index 33709983cc8bd7..5cc13d301815c2 100644
--- a/srcpkgs/aravis/template
+++ b/srcpkgs/aravis/template
@@ -3,9 +3,10 @@ pkgname=aravis
version=0.8.33
revision=1
build_style=meson
+build_helper="gir"
configure_args="-Ddocumentation=enabled"
-hostmakedepends="pkg-config gobject-introspection gi-docgen gettext"
-makedepends="gtk+3-devel glib-devel libusb-devel zlib-devel libxml2-devel
+hostmakedepends="pkg-config gobject-introspection gi-docgen gettext glib-devel"
+makedepends="gtk+3-devel libglib-devel libusb-devel zlib-devel libxml2-devel
gstreamer1-devel gst-plugins-base1-devel gi-docgen"
checkdepends="python3-gobject"
short_desc="Vision utilities for genicam based cameras"
@@ -17,10 +18,6 @@ checksum=d70b125666b23ca4c0f8986fa0786a3d2b9efb7a56b558b703083cdfaa793f4e
# Network test causes timeout in CI
make_check=ci-skip
-if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" glib-devel prelink-cross qemu-user"
-fi
-
libaravis_package() {
short_desc="Vision library for genicam-based cameras"
pkg_install() {
From d0e0570f35b303fe2a7db793c97c99a8647d2abc Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 18 Sep 2024 00:07:41 -0400
Subject: [PATCH 04/11] glib: use qemu build helper instead of depending on
qemu-user
---
srcpkgs/glib/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index 548dc0f3d17557..bbcf1e94915281 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -4,7 +4,7 @@ pkgname=glib
version=2.80.3
revision=1
build_style=meson
-build_helper=qemu
+build_helper="qemu"
# 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
From 8befc43995dd753604b9aac7e607469fe8a2c635 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 18 Sep 2024 00:07:42 -0400
Subject: [PATCH 05/11] gobject-introspection-bootstrap: use qemu build helper
instead of depending on qemu-user
---
srcpkgs/gobject-introspection-bootstrap/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/gobject-introspection-bootstrap/template b/srcpkgs/gobject-introspection-bootstrap/template
index 1ac8bd90001ae3..86801942e3af72 100644
--- a/srcpkgs/gobject-introspection-bootstrap/template
+++ b/srcpkgs/gobject-introspection-bootstrap/template
@@ -7,6 +7,7 @@ pkgname=gobject-introspection-bootstrap
version=1.80.1
revision=2
build_style=meson
+build_helper="qemu"
configure_args="-Dbuild_introspection_data=false"
pycompile_dirs="usr/lib/gobject-introspection/giscanner"
hostmakedepends="flex pkg-config"
@@ -27,7 +28,7 @@ conflicts="libgirepository libgirepository-devel gobject-introspection"
noverifyrdeps=yes
if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" gobject-introspection-bootstrap qemu-user prelink-cross"
+ hostmakedepends+=" gobject-introspection-bootstrap 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
From ac4a7bb5a1aa737146197f76eb16b46c0bee17b6 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 18 Sep 2024 00:07:42 -0400
Subject: [PATCH 06/11] gobject-introspection: use qemu build helper instead of
depending on qemu-user
---
srcpkgs/gobject-introspection/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/gobject-introspection/template b/srcpkgs/gobject-introspection/template
index 4a8810a95238fa..d39c7710cd4e69 100644
--- a/srcpkgs/gobject-introspection/template
+++ b/srcpkgs/gobject-introspection/template
@@ -4,6 +4,7 @@ pkgname=gobject-introspection
version=1.80.1
revision=2
build_style=meson
+build_helper="qemu"
pycompile_dirs="usr/lib/gobject-introspection/giscanner"
hostmakedepends="flex pkg-config"
# won't run tests with cairo to avoid cyclical deps
@@ -20,7 +21,7 @@ checksum=a1df7c424e15bda1ab639c00e9051b9adf5cea1a9e512f8a603b53cd199bc6d8
python_version=3
if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" gobject-introspection qemu-user prelink-cross"
+ hostmakedepends+=" gobject-introspection 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
From 6171e6c9d2a43c33af6d41d50a260f78a6a85a37 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 18 Sep 2024 00:07:43 -0400
Subject: [PATCH 07/11] libgpg-error: use qemu build helper instead of
depending on qemu-user
---
srcpkgs/libgpg-error/template | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/srcpkgs/libgpg-error/template b/srcpkgs/libgpg-error/template
index 3c76989aa855d5..fd00c2177961be 100644
--- a/srcpkgs/libgpg-error/template
+++ b/srcpkgs/libgpg-error/template
@@ -3,6 +3,7 @@ pkgname=libgpg-error
version=1.49
revision=1
build_style=gnu-configure
+build_helper="qemu"
configure_args="--enable-install-gpg-error-config"
short_desc="Library for error values used by GnuPG component"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -11,10 +12,6 @@ homepage="https://www.gnupg.org"
distfiles="https://www.gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${version}.tar.bz2"
checksum=8b79d54639dbf4abc08b5406fb2f37e669a2dec091dd024fb87dd367131c63a9
-if [ "$CROSS_BUILD" ]; then
- hostmakedepends="qemu-user"
-fi
-
post_install() {
rm -r ${DESTDIR}/usr/share/common-lisp
}
From 826839859e758a785eebba873534b8aa5900a66e Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 18 Sep 2024 00:07:44 -0400
Subject: [PATCH 08/11] libportal: use qemu build helper instead of depending
on qemu-user
---
srcpkgs/libportal/template | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/libportal/template b/srcpkgs/libportal/template
index bff7620ea3b7ac..54bfb0dd6b1990 100644
--- a/srcpkgs/libportal/template
+++ b/srcpkgs/libportal/template
@@ -3,6 +3,7 @@ pkgname=libportal
version=0.7.1
revision=1
build_style=meson
+build_helper="gir"
configure_args="$(vopt_bool gtk_doc docs) $(vopt_bool gir vapi)
-Dbackend-gtk3=enabled -Dbackend-gtk4=enabled -Dbackend-qt5=enabled"
hostmakedepends="pkg-config glib-devel gobject-introspection $(vopt_if gir vala)
@@ -21,11 +22,7 @@ make_check_pre="xvfb-run"
build_options="gir gtk_doc"
build_options_default="gir gtk_doc"
-if [ -n "$CROSS_BUILD" ]; then
- hostmakedepends+=" qemu-user prelink-cross"
-fi
-
-libportal-devel_package() {
+if [ -n "$CROSS_BUILD" ]; tlibportal-devel_package() {
depends="libportal>=${version}_${revision} glib-devel"
short_desc+=" - development files"
pkg_install() {
From 87a05507061b6cfff0bcb4b52fdc5613f40219d5 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 18 Sep 2024 00:07:44 -0400
Subject: [PATCH 09/11] php8.2: use qemu build helper instead of depending on
qemu-user
---
srcpkgs/php8.2/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/php8.2/template b/srcpkgs/php8.2/template
index fe9559e181f2c8..4fe20834f2b2d8 100644
--- a/srcpkgs/php8.2/template
+++ b/srcpkgs/php8.2/template
@@ -4,6 +4,7 @@ pkgname=php8.2
version=8.2.22
revision=1
_php_version=8.2
+build_helper="qemu"
hostmakedepends="bison pkg-config apache-devel"
makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
gmp-devel libcurl-devel libjpeg-turbo-devel libmariadbclient-devel
@@ -27,7 +28,7 @@ lib32disabled=yes
if [ -n "$CROSS_BUILD" ]; then
# phar and pear need php to build
- hostmakedepends+=" php${_php_version} qemu-user"
+ hostmakedepends+=" php${_php_version}"
CFLAGS+=" -DHAVE_LIBDL
-DHAVE_DLOPEN
-DHAVE_DLSYM
From 5e62f8afc946e56e3b2c38893973de8b479eb947 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 18 Sep 2024 00:07:45 -0400
Subject: [PATCH 10/11] php8.3: use qemu build helper instead of depending on
qemu-user
---
srcpkgs/php8.3/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/php8.3/template b/srcpkgs/php8.3/template
index ede31751655581..9a415922f01fc9 100644
--- a/srcpkgs/php8.3/template
+++ b/srcpkgs/php8.3/template
@@ -4,6 +4,7 @@ pkgname=php8.3
version=8.3.10
revision=1
_php_version=8.3
+build_helper="qemu"
hostmakedepends="bison pkg-config apache-devel"
makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
gmp-devel libcurl-devel libjpeg-turbo-devel libmariadbclient-devel
@@ -27,7 +28,7 @@ lib32disabled=yes
if [ -n "$CROSS_BUILD" ]; then
# phar and pear need php to build
- hostmakedepends+=" php${_php_version} qemu-user"
+ hostmakedepends+=" php${_php_version}"
CFLAGS+=" -DHAVE_LIBDL
-DHAVE_DLOPEN
-DHAVE_DLSYM
From 33b0383d4159d931d48f96354dd688ffd5081603 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 18 Sep 2024 00:07:45 -0400
Subject: [PATCH 11/11] umockdev: use qemu build helper instead of depending on
qemu-user
---
srcpkgs/umockdev/template | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/srcpkgs/umockdev/template b/srcpkgs/umockdev/template
index 4dc52e13c94fa0..1439c8e603dd5e 100644
--- a/srcpkgs/umockdev/template
+++ b/srcpkgs/umockdev/template
@@ -3,6 +3,7 @@ pkgname=umockdev
version=0.17.13
revision=1
build_style=meson
+build_helper="gir"
hostmakedepends="pkg-config vala"
makedepends="vala-devel eudev-libudev-devel libpcap-devel gobject-introspection"
checkdepends="eudev which gphoto2 libgudev-devel python3-gobject usbutils xz"
@@ -13,10 +14,6 @@ homepage="https://github.com/martinpitt/umockdev"
distfiles="https://github.com/martinpitt/umockdev/releases/download/${version}/umockdev-${version}.tar.xz"
checksum=6c6ebf6e6209b6a49746e0d91a448d027b54271bab82ed70a132ecf294ca13cf
-if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" gobject-introspection qemu-user"
-fi
-
umockdev-devel_package() {
depends="umockdev>=${version}_${revision}"
short_desc+=" - development files"
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Updated] common/build-helper/qemu: only install the relevant user emulator
2024-09-18 4:09 [PR PATCH] common/build-helper/qemu: only install the relevant user emulator classabbyamp
` (3 preceding siblings ...)
2024-09-18 15:34 ` [PR PATCH] [Updated] " classabbyamp
@ 2024-09-18 16:09 ` classabbyamp
2024-09-20 7:58 ` classabbyamp
2024-09-20 7:58 ` [PR PATCH] [Merged]: " classabbyamp
6 siblings, 0 replies; 8+ messages in thread
From: classabbyamp @ 2024-09-18 16:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 701 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages qemu-helper-slim
https://github.com/void-linux/void-packages/pull/52254
common/build-helper/qemu: only install the relevant user emulator
now that the package is split, we don't have to install every emulator under the sun. also, clean up templates that explicitly hostmakedepend on qemu-user.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
A patch file from https://github.com/void-linux/void-packages/pull/52254.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qemu-helper-slim-52254.patch --]
[-- Type: text/x-diff, Size: 12350 bytes --]
From 5ee9a3369f7fd02eaf2544d4087f9015e068d2c3 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 18 Sep 2024 00:04:30 -0400
Subject: [PATCH 01/11] common/build-helper/qemu: only install the relevant
user emulator
now that the package is split, we don't have to install every emulator
under the sun.
---
common/build-helper/qemu.sh | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/common/build-helper/qemu.sh b/common/build-helper/qemu.sh
index f5c5658510102d..4fbd5fb86dde0c 100644
--- a/common/build-helper/qemu.sh
+++ b/common/build-helper/qemu.sh
@@ -1,8 +1,6 @@
if [ "$CROSS_BUILD" ]; then
export QEMU_LD_PREFIX=${XBPS_CROSS_BASE}
- if [[ $hostmakedepends != *"qemu-user"* ]]; then
- hostmakedepends+=" qemu-user"
- fi
+ hostmakedepends+=" qemu-user-${XBPS_TARGET_QEMU_MACHINE/x86_64/amd64}"
fi
vtargetrun() {
From 51b1fea5596bb4bd210389147707c5134d3120db Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 18 Sep 2024 11:33:43 -0400
Subject: [PATCH 02/11] common/build-helper/gir: only install the relevent user
emulator
---
common/build-helper/gir.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/common/build-helper/gir.sh b/common/build-helper/gir.sh
index e4ecd4f18af485..720aa94d95ee6b 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"
+ hostmakedepends+=" qemu-user-${XBPS_TARGET_QEMU_MACHINE/x86_64/amd64}"
# Required for running the g-ir-scanner-lddwrapper
hostmakedepends+=" prelink-cross"
From 25f6a68c5d7df16af32dd6a5dea88519337722a5 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 18 Sep 2024 00:07:39 -0400
Subject: [PATCH 03/11] aravis: use qemu build helper instead of depending on
qemu-user
---
srcpkgs/aravis/template | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/aravis/template b/srcpkgs/aravis/template
index 33709983cc8bd7..5cc13d301815c2 100644
--- a/srcpkgs/aravis/template
+++ b/srcpkgs/aravis/template
@@ -3,9 +3,10 @@ pkgname=aravis
version=0.8.33
revision=1
build_style=meson
+build_helper="gir"
configure_args="-Ddocumentation=enabled"
-hostmakedepends="pkg-config gobject-introspection gi-docgen gettext"
-makedepends="gtk+3-devel glib-devel libusb-devel zlib-devel libxml2-devel
+hostmakedepends="pkg-config gobject-introspection gi-docgen gettext glib-devel"
+makedepends="gtk+3-devel libglib-devel libusb-devel zlib-devel libxml2-devel
gstreamer1-devel gst-plugins-base1-devel gi-docgen"
checkdepends="python3-gobject"
short_desc="Vision utilities for genicam based cameras"
@@ -17,10 +18,6 @@ checksum=d70b125666b23ca4c0f8986fa0786a3d2b9efb7a56b558b703083cdfaa793f4e
# Network test causes timeout in CI
make_check=ci-skip
-if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" glib-devel prelink-cross qemu-user"
-fi
-
libaravis_package() {
short_desc="Vision library for genicam-based cameras"
pkg_install() {
From d0e0570f35b303fe2a7db793c97c99a8647d2abc Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 18 Sep 2024 00:07:41 -0400
Subject: [PATCH 04/11] glib: use qemu build helper instead of depending on
qemu-user
---
srcpkgs/glib/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index 548dc0f3d17557..bbcf1e94915281 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -4,7 +4,7 @@ pkgname=glib
version=2.80.3
revision=1
build_style=meson
-build_helper=qemu
+build_helper="qemu"
# 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
From 8befc43995dd753604b9aac7e607469fe8a2c635 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 18 Sep 2024 00:07:42 -0400
Subject: [PATCH 05/11] gobject-introspection-bootstrap: use qemu build helper
instead of depending on qemu-user
---
srcpkgs/gobject-introspection-bootstrap/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/gobject-introspection-bootstrap/template b/srcpkgs/gobject-introspection-bootstrap/template
index 1ac8bd90001ae3..86801942e3af72 100644
--- a/srcpkgs/gobject-introspection-bootstrap/template
+++ b/srcpkgs/gobject-introspection-bootstrap/template
@@ -7,6 +7,7 @@ pkgname=gobject-introspection-bootstrap
version=1.80.1
revision=2
build_style=meson
+build_helper="qemu"
configure_args="-Dbuild_introspection_data=false"
pycompile_dirs="usr/lib/gobject-introspection/giscanner"
hostmakedepends="flex pkg-config"
@@ -27,7 +28,7 @@ conflicts="libgirepository libgirepository-devel gobject-introspection"
noverifyrdeps=yes
if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" gobject-introspection-bootstrap qemu-user prelink-cross"
+ hostmakedepends+=" gobject-introspection-bootstrap 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
From ac4a7bb5a1aa737146197f76eb16b46c0bee17b6 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 18 Sep 2024 00:07:42 -0400
Subject: [PATCH 06/11] gobject-introspection: use qemu build helper instead of
depending on qemu-user
---
srcpkgs/gobject-introspection/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/gobject-introspection/template b/srcpkgs/gobject-introspection/template
index 4a8810a95238fa..d39c7710cd4e69 100644
--- a/srcpkgs/gobject-introspection/template
+++ b/srcpkgs/gobject-introspection/template
@@ -4,6 +4,7 @@ pkgname=gobject-introspection
version=1.80.1
revision=2
build_style=meson
+build_helper="qemu"
pycompile_dirs="usr/lib/gobject-introspection/giscanner"
hostmakedepends="flex pkg-config"
# won't run tests with cairo to avoid cyclical deps
@@ -20,7 +21,7 @@ checksum=a1df7c424e15bda1ab639c00e9051b9adf5cea1a9e512f8a603b53cd199bc6d8
python_version=3
if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" gobject-introspection qemu-user prelink-cross"
+ hostmakedepends+=" gobject-introspection 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
From 6171e6c9d2a43c33af6d41d50a260f78a6a85a37 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 18 Sep 2024 00:07:43 -0400
Subject: [PATCH 07/11] libgpg-error: use qemu build helper instead of
depending on qemu-user
---
srcpkgs/libgpg-error/template | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/srcpkgs/libgpg-error/template b/srcpkgs/libgpg-error/template
index 3c76989aa855d5..fd00c2177961be 100644
--- a/srcpkgs/libgpg-error/template
+++ b/srcpkgs/libgpg-error/template
@@ -3,6 +3,7 @@ pkgname=libgpg-error
version=1.49
revision=1
build_style=gnu-configure
+build_helper="qemu"
configure_args="--enable-install-gpg-error-config"
short_desc="Library for error values used by GnuPG component"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -11,10 +12,6 @@ homepage="https://www.gnupg.org"
distfiles="https://www.gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${version}.tar.bz2"
checksum=8b79d54639dbf4abc08b5406fb2f37e669a2dec091dd024fb87dd367131c63a9
-if [ "$CROSS_BUILD" ]; then
- hostmakedepends="qemu-user"
-fi
-
post_install() {
rm -r ${DESTDIR}/usr/share/common-lisp
}
From 4b3337514a1318fcdb1b2ea83820f5049aebdfb4 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 18 Sep 2024 00:07:44 -0400
Subject: [PATCH 08/11] libportal: use qemu build helper instead of depending
on qemu-user
---
srcpkgs/libportal/template | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/srcpkgs/libportal/template b/srcpkgs/libportal/template
index bff7620ea3b7ac..22e83cc40716d4 100644
--- a/srcpkgs/libportal/template
+++ b/srcpkgs/libportal/template
@@ -3,6 +3,7 @@ pkgname=libportal
version=0.7.1
revision=1
build_style=meson
+build_helper="gir"
configure_args="$(vopt_bool gtk_doc docs) $(vopt_bool gir vapi)
-Dbackend-gtk3=enabled -Dbackend-gtk4=enabled -Dbackend-qt5=enabled"
hostmakedepends="pkg-config glib-devel gobject-introspection $(vopt_if gir vala)
@@ -21,10 +22,6 @@ make_check_pre="xvfb-run"
build_options="gir gtk_doc"
build_options_default="gir gtk_doc"
-if [ -n "$CROSS_BUILD" ]; then
- hostmakedepends+=" qemu-user prelink-cross"
-fi
-
libportal-devel_package() {
depends="libportal>=${version}_${revision} glib-devel"
short_desc+=" - development files"
From 4a8c663daa56cf5fe0664eb89b8a563caa711066 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 18 Sep 2024 00:07:44 -0400
Subject: [PATCH 09/11] php8.2: use qemu build helper instead of depending on
qemu-user
---
srcpkgs/php8.2/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/php8.2/template b/srcpkgs/php8.2/template
index fe9559e181f2c8..4fe20834f2b2d8 100644
--- a/srcpkgs/php8.2/template
+++ b/srcpkgs/php8.2/template
@@ -4,6 +4,7 @@ pkgname=php8.2
version=8.2.22
revision=1
_php_version=8.2
+build_helper="qemu"
hostmakedepends="bison pkg-config apache-devel"
makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
gmp-devel libcurl-devel libjpeg-turbo-devel libmariadbclient-devel
@@ -27,7 +28,7 @@ lib32disabled=yes
if [ -n "$CROSS_BUILD" ]; then
# phar and pear need php to build
- hostmakedepends+=" php${_php_version} qemu-user"
+ hostmakedepends+=" php${_php_version}"
CFLAGS+=" -DHAVE_LIBDL
-DHAVE_DLOPEN
-DHAVE_DLSYM
From 9a4599a46a698eeee24afa62b2785939be7c303a Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 18 Sep 2024 00:07:45 -0400
Subject: [PATCH 10/11] php8.3: use qemu build helper instead of depending on
qemu-user
---
srcpkgs/php8.3/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/php8.3/template b/srcpkgs/php8.3/template
index ede31751655581..9a415922f01fc9 100644
--- a/srcpkgs/php8.3/template
+++ b/srcpkgs/php8.3/template
@@ -4,6 +4,7 @@ pkgname=php8.3
version=8.3.10
revision=1
_php_version=8.3
+build_helper="qemu"
hostmakedepends="bison pkg-config apache-devel"
makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
gmp-devel libcurl-devel libjpeg-turbo-devel libmariadbclient-devel
@@ -27,7 +28,7 @@ lib32disabled=yes
if [ -n "$CROSS_BUILD" ]; then
# phar and pear need php to build
- hostmakedepends+=" php${_php_version} qemu-user"
+ hostmakedepends+=" php${_php_version}"
CFLAGS+=" -DHAVE_LIBDL
-DHAVE_DLOPEN
-DHAVE_DLSYM
From 2a3f997be979a04203dac31822cd17ae315ba527 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 18 Sep 2024 00:07:45 -0400
Subject: [PATCH 11/11] umockdev: use qemu build helper instead of depending on
qemu-user
---
srcpkgs/umockdev/template | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/srcpkgs/umockdev/template b/srcpkgs/umockdev/template
index 4dc52e13c94fa0..1439c8e603dd5e 100644
--- a/srcpkgs/umockdev/template
+++ b/srcpkgs/umockdev/template
@@ -3,6 +3,7 @@ pkgname=umockdev
version=0.17.13
revision=1
build_style=meson
+build_helper="gir"
hostmakedepends="pkg-config vala"
makedepends="vala-devel eudev-libudev-devel libpcap-devel gobject-introspection"
checkdepends="eudev which gphoto2 libgudev-devel python3-gobject usbutils xz"
@@ -13,10 +14,6 @@ homepage="https://github.com/martinpitt/umockdev"
distfiles="https://github.com/martinpitt/umockdev/releases/download/${version}/umockdev-${version}.tar.xz"
checksum=6c6ebf6e6209b6a49746e0d91a448d027b54271bab82ed70a132ecf294ca13cf
-if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" gobject-introspection qemu-user"
-fi
-
umockdev-devel_package() {
depends="umockdev>=${version}_${revision}"
short_desc+=" - development files"
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Updated] common/build-helper/qemu: only install the relevant user emulator
2024-09-18 4:09 [PR PATCH] common/build-helper/qemu: only install the relevant user emulator classabbyamp
` (4 preceding siblings ...)
2024-09-18 16:09 ` classabbyamp
@ 2024-09-20 7:58 ` classabbyamp
2024-09-20 7:58 ` [PR PATCH] [Merged]: " classabbyamp
6 siblings, 0 replies; 8+ messages in thread
From: classabbyamp @ 2024-09-20 7:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 701 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages qemu-helper-slim
https://github.com/void-linux/void-packages/pull/52254
common/build-helper/qemu: only install the relevant user emulator
now that the package is split, we don't have to install every emulator under the sun. also, clean up templates that explicitly hostmakedepend on qemu-user.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
A patch file from https://github.com/void-linux/void-packages/pull/52254.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qemu-helper-slim-52254.patch --]
[-- Type: text/x-diff, Size: 12347 bytes --]
From 48d3a3b065db0496ea7e3903ab97e8a80b513193 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 18 Sep 2024 00:04:30 -0400
Subject: [PATCH 01/11] common/build-helper/qemu: only install the relevant
user emulator
now that the package is split, we don't have to install every emulator
under the sun.
---
common/build-helper/qemu.sh | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/common/build-helper/qemu.sh b/common/build-helper/qemu.sh
index f5c5658510102d..4fbd5fb86dde0c 100644
--- a/common/build-helper/qemu.sh
+++ b/common/build-helper/qemu.sh
@@ -1,8 +1,6 @@
if [ "$CROSS_BUILD" ]; then
export QEMU_LD_PREFIX=${XBPS_CROSS_BASE}
- if [[ $hostmakedepends != *"qemu-user"* ]]; then
- hostmakedepends+=" qemu-user"
- fi
+ hostmakedepends+=" qemu-user-${XBPS_TARGET_QEMU_MACHINE/x86_64/amd64}"
fi
vtargetrun() {
From 1a6b8cf87cbadffe2e5cf8c44ea3aa69d3e3f0f8 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 18 Sep 2024 11:33:43 -0400
Subject: [PATCH 02/11] common/build-helper/gir: only install the relevent user
emulator
---
common/build-helper/gir.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/common/build-helper/gir.sh b/common/build-helper/gir.sh
index e4ecd4f18af485..720aa94d95ee6b 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"
+ hostmakedepends+=" qemu-user-${XBPS_TARGET_QEMU_MACHINE/x86_64/amd64}"
# Required for running the g-ir-scanner-lddwrapper
hostmakedepends+=" prelink-cross"
From 1751a94793eff8eb6f74e6927966748b33f37534 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 18 Sep 2024 00:07:39 -0400
Subject: [PATCH 03/11] aravis: use gir build helper instead of depending on
qemu-user
---
srcpkgs/aravis/template | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/aravis/template b/srcpkgs/aravis/template
index 33709983cc8bd7..5cc13d301815c2 100644
--- a/srcpkgs/aravis/template
+++ b/srcpkgs/aravis/template
@@ -3,9 +3,10 @@ pkgname=aravis
version=0.8.33
revision=1
build_style=meson
+build_helper="gir"
configure_args="-Ddocumentation=enabled"
-hostmakedepends="pkg-config gobject-introspection gi-docgen gettext"
-makedepends="gtk+3-devel glib-devel libusb-devel zlib-devel libxml2-devel
+hostmakedepends="pkg-config gobject-introspection gi-docgen gettext glib-devel"
+makedepends="gtk+3-devel libglib-devel libusb-devel zlib-devel libxml2-devel
gstreamer1-devel gst-plugins-base1-devel gi-docgen"
checkdepends="python3-gobject"
short_desc="Vision utilities for genicam based cameras"
@@ -17,10 +18,6 @@ checksum=d70b125666b23ca4c0f8986fa0786a3d2b9efb7a56b558b703083cdfaa793f4e
# Network test causes timeout in CI
make_check=ci-skip
-if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" glib-devel prelink-cross qemu-user"
-fi
-
libaravis_package() {
short_desc="Vision library for genicam-based cameras"
pkg_install() {
From ae26662beb405ff095f496ef6c09b3405434d60f Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 18 Sep 2024 00:07:41 -0400
Subject: [PATCH 04/11] glib: use qemu build helper instead of depending on
qemu-user
---
srcpkgs/glib/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index 548dc0f3d17557..bbcf1e94915281 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -4,7 +4,7 @@ pkgname=glib
version=2.80.3
revision=1
build_style=meson
-build_helper=qemu
+build_helper="qemu"
# 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
From 732b494a641a066d708f5d6348ca5de6f25826f8 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 18 Sep 2024 00:07:42 -0400
Subject: [PATCH 05/11] gobject-introspection-bootstrap: use qemu build helper
instead of depending on qemu-user
---
srcpkgs/gobject-introspection-bootstrap/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/gobject-introspection-bootstrap/template b/srcpkgs/gobject-introspection-bootstrap/template
index 1ac8bd90001ae3..86801942e3af72 100644
--- a/srcpkgs/gobject-introspection-bootstrap/template
+++ b/srcpkgs/gobject-introspection-bootstrap/template
@@ -7,6 +7,7 @@ pkgname=gobject-introspection-bootstrap
version=1.80.1
revision=2
build_style=meson
+build_helper="qemu"
configure_args="-Dbuild_introspection_data=false"
pycompile_dirs="usr/lib/gobject-introspection/giscanner"
hostmakedepends="flex pkg-config"
@@ -27,7 +28,7 @@ conflicts="libgirepository libgirepository-devel gobject-introspection"
noverifyrdeps=yes
if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" gobject-introspection-bootstrap qemu-user prelink-cross"
+ hostmakedepends+=" gobject-introspection-bootstrap 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
From ae754b7d1da4e614808bab5cc05b406aba17f0e0 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 18 Sep 2024 00:07:42 -0400
Subject: [PATCH 06/11] gobject-introspection: use qemu build helper instead of
depending on qemu-user
---
srcpkgs/gobject-introspection/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/gobject-introspection/template b/srcpkgs/gobject-introspection/template
index 4a8810a95238fa..d39c7710cd4e69 100644
--- a/srcpkgs/gobject-introspection/template
+++ b/srcpkgs/gobject-introspection/template
@@ -4,6 +4,7 @@ pkgname=gobject-introspection
version=1.80.1
revision=2
build_style=meson
+build_helper="qemu"
pycompile_dirs="usr/lib/gobject-introspection/giscanner"
hostmakedepends="flex pkg-config"
# won't run tests with cairo to avoid cyclical deps
@@ -20,7 +21,7 @@ checksum=a1df7c424e15bda1ab639c00e9051b9adf5cea1a9e512f8a603b53cd199bc6d8
python_version=3
if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" gobject-introspection qemu-user prelink-cross"
+ hostmakedepends+=" gobject-introspection 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
From 52cdc85115989d202098fa0b03f6f3654bcace86 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 18 Sep 2024 00:07:43 -0400
Subject: [PATCH 07/11] libgpg-error: use qemu build helper instead of
depending on qemu-user
---
srcpkgs/libgpg-error/template | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/srcpkgs/libgpg-error/template b/srcpkgs/libgpg-error/template
index 3c76989aa855d5..fd00c2177961be 100644
--- a/srcpkgs/libgpg-error/template
+++ b/srcpkgs/libgpg-error/template
@@ -3,6 +3,7 @@ pkgname=libgpg-error
version=1.49
revision=1
build_style=gnu-configure
+build_helper="qemu"
configure_args="--enable-install-gpg-error-config"
short_desc="Library for error values used by GnuPG component"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -11,10 +12,6 @@ homepage="https://www.gnupg.org"
distfiles="https://www.gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${version}.tar.bz2"
checksum=8b79d54639dbf4abc08b5406fb2f37e669a2dec091dd024fb87dd367131c63a9
-if [ "$CROSS_BUILD" ]; then
- hostmakedepends="qemu-user"
-fi
-
post_install() {
rm -r ${DESTDIR}/usr/share/common-lisp
}
From 819555906094969f38efd67e749e157357f60280 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 18 Sep 2024 00:07:44 -0400
Subject: [PATCH 08/11] libportal: use gir build helper instead of depending on
qemu-user
---
srcpkgs/libportal/template | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/srcpkgs/libportal/template b/srcpkgs/libportal/template
index bff7620ea3b7ac..22e83cc40716d4 100644
--- a/srcpkgs/libportal/template
+++ b/srcpkgs/libportal/template
@@ -3,6 +3,7 @@ pkgname=libportal
version=0.7.1
revision=1
build_style=meson
+build_helper="gir"
configure_args="$(vopt_bool gtk_doc docs) $(vopt_bool gir vapi)
-Dbackend-gtk3=enabled -Dbackend-gtk4=enabled -Dbackend-qt5=enabled"
hostmakedepends="pkg-config glib-devel gobject-introspection $(vopt_if gir vala)
@@ -21,10 +22,6 @@ make_check_pre="xvfb-run"
build_options="gir gtk_doc"
build_options_default="gir gtk_doc"
-if [ -n "$CROSS_BUILD" ]; then
- hostmakedepends+=" qemu-user prelink-cross"
-fi
-
libportal-devel_package() {
depends="libportal>=${version}_${revision} glib-devel"
short_desc+=" - development files"
From 0cbb198e769135cf4c16353fcd4cd12fd5533c84 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 18 Sep 2024 00:07:44 -0400
Subject: [PATCH 09/11] php8.2: use qemu build helper instead of depending on
qemu-user
---
srcpkgs/php8.2/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/php8.2/template b/srcpkgs/php8.2/template
index fe9559e181f2c8..4fe20834f2b2d8 100644
--- a/srcpkgs/php8.2/template
+++ b/srcpkgs/php8.2/template
@@ -4,6 +4,7 @@ pkgname=php8.2
version=8.2.22
revision=1
_php_version=8.2
+build_helper="qemu"
hostmakedepends="bison pkg-config apache-devel"
makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
gmp-devel libcurl-devel libjpeg-turbo-devel libmariadbclient-devel
@@ -27,7 +28,7 @@ lib32disabled=yes
if [ -n "$CROSS_BUILD" ]; then
# phar and pear need php to build
- hostmakedepends+=" php${_php_version} qemu-user"
+ hostmakedepends+=" php${_php_version}"
CFLAGS+=" -DHAVE_LIBDL
-DHAVE_DLOPEN
-DHAVE_DLSYM
From 61f577bcc919d4f737c257b7efdc6a1d9203868c Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 18 Sep 2024 00:07:45 -0400
Subject: [PATCH 10/11] php8.3: use qemu build helper instead of depending on
qemu-user
---
srcpkgs/php8.3/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/php8.3/template b/srcpkgs/php8.3/template
index ede31751655581..9a415922f01fc9 100644
--- a/srcpkgs/php8.3/template
+++ b/srcpkgs/php8.3/template
@@ -4,6 +4,7 @@ pkgname=php8.3
version=8.3.10
revision=1
_php_version=8.3
+build_helper="qemu"
hostmakedepends="bison pkg-config apache-devel"
makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
gmp-devel libcurl-devel libjpeg-turbo-devel libmariadbclient-devel
@@ -27,7 +28,7 @@ lib32disabled=yes
if [ -n "$CROSS_BUILD" ]; then
# phar and pear need php to build
- hostmakedepends+=" php${_php_version} qemu-user"
+ hostmakedepends+=" php${_php_version}"
CFLAGS+=" -DHAVE_LIBDL
-DHAVE_DLOPEN
-DHAVE_DLSYM
From 09a3840679905578ffbb2855f7cab6ab6a634830 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 18 Sep 2024 00:07:45 -0400
Subject: [PATCH 11/11] umockdev: use gir build helper instead of depending on
qemu-user
---
srcpkgs/umockdev/template | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/srcpkgs/umockdev/template b/srcpkgs/umockdev/template
index 4dc52e13c94fa0..1439c8e603dd5e 100644
--- a/srcpkgs/umockdev/template
+++ b/srcpkgs/umockdev/template
@@ -3,6 +3,7 @@ pkgname=umockdev
version=0.17.13
revision=1
build_style=meson
+build_helper="gir"
hostmakedepends="pkg-config vala"
makedepends="vala-devel eudev-libudev-devel libpcap-devel gobject-introspection"
checkdepends="eudev which gphoto2 libgudev-devel python3-gobject usbutils xz"
@@ -13,10 +14,6 @@ homepage="https://github.com/martinpitt/umockdev"
distfiles="https://github.com/martinpitt/umockdev/releases/download/${version}/umockdev-${version}.tar.xz"
checksum=6c6ebf6e6209b6a49746e0d91a448d027b54271bab82ed70a132ecf294ca13cf
-if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" gobject-introspection qemu-user"
-fi
-
umockdev-devel_package() {
depends="umockdev>=${version}_${revision}"
short_desc+=" - development files"
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Merged]: common/build-helper/qemu: only install the relevant user emulator
2024-09-18 4:09 [PR PATCH] common/build-helper/qemu: only install the relevant user emulator classabbyamp
` (5 preceding siblings ...)
2024-09-20 7:58 ` classabbyamp
@ 2024-09-20 7:58 ` classabbyamp
6 siblings, 0 replies; 8+ messages in thread
From: classabbyamp @ 2024-09-20 7:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 526 bytes --]
There's a merged pull request on the void-packages repository
common/build-helper/qemu: only install the relevant user emulator
https://github.com/void-linux/void-packages/pull/52254
Description:
now that the package is split, we don't have to install every emulator under the sun. also, clean up templates that explicitly hostmakedepend on qemu-user.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2024-09-20 7:58 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-09-18 4:09 [PR PATCH] common/build-helper/qemu: only install the relevant user emulator classabbyamp
2024-09-18 8:44 ` [PR REVIEW] " sgn
2024-09-18 8:44 ` sgn
2024-09-18 8:44 ` sgn
2024-09-18 15:34 ` [PR PATCH] [Updated] " classabbyamp
2024-09-18 16:09 ` classabbyamp
2024-09-20 7:58 ` classabbyamp
2024-09-20 7:58 ` [PR PATCH] [Merged]: " classabbyamp
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).