| 1 |
commit: e7e343979dbfd7e4b4fcf85f36c17d414fc1e41e |
| 2 |
Author: WANG Xuerui <xen0n <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jul 5 00:39:29 2022 +0000 |
| 4 |
Commit: WANG Xuerui <xen0n <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jul 5 00:53:53 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7e34397 |
| 7 |
|
| 8 |
app-emulation/qemu: forward port 6.1.0-strings.patch to latest main branch |
| 9 |
|
| 10 |
Due to upstream commit https://gitlab.com/qemu-project/qemu/-/commit/158bb2249ed9 |
| 11 |
("configure: Add cross prefix for widl tool"). |
| 12 |
|
| 13 |
Tentatively named 7.1.0, as 7.1.0 will be the first upstream version |
| 14 |
this forwarded patch is applicable to. |
| 15 |
|
| 16 |
Signed-off-by: WANG Xuerui <xen0n <AT> gentoo.org> |
| 17 |
|
| 18 |
app-emulation/qemu/files/qemu-7.1.0-strings.patch | 26 +++++++++++++++++++++++ |
| 19 |
app-emulation/qemu/qemu-9999.ebuild | 2 +- |
| 20 |
2 files changed, 27 insertions(+), 1 deletion(-) |
| 21 |
|
| 22 |
diff --git a/app-emulation/qemu/files/qemu-7.1.0-strings.patch b/app-emulation/qemu/files/qemu-7.1.0-strings.patch |
| 23 |
new file mode 100644 |
| 24 |
index 000000000000..01f235b9a33c |
| 25 |
--- /dev/null |
| 26 |
+++ b/app-emulation/qemu/files/qemu-7.1.0-strings.patch |
| 27 |
@@ -0,0 +1,26 @@ |
| 28 |
+Forward-ported from original patch for 5.2.0. |
| 29 |
+ |
| 30 |
+diff --git a/configure b/configure |
| 31 |
+index da2501489f..4660ee3ee5 100755 |
| 32 |
+--- a/configure |
| 33 |
++++ b/configure |
| 34 |
+@@ -400,6 +400,7 @@ ld="${LD-${cross_prefix}ld}" |
| 35 |
+ nm="${NM-${cross_prefix}nm}" |
| 36 |
+ smbd="$SMBD" |
| 37 |
+ strip="${STRIP-${cross_prefix}strip}" |
| 38 |
++strings="${STRINGS-${cross_prefix}strings}" |
| 39 |
+ widl="${WIDL-${cross_prefix}widl}" |
| 40 |
+ windres="${WINDRES-${cross_prefix}windres}" |
| 41 |
+ pkg_config_exe="${PKG_CONFIG-${cross_prefix}pkg-config}" |
| 42 |
+@@ -1466,9 +1467,9 @@ int main(int argc, char *argv[]) |
| 43 |
+ EOF |
| 44 |
+ |
| 45 |
+ if compile_prog ; then |
| 46 |
+- if strings -a $TMPE | grep -q BiGeNdIaN ; then |
| 47 |
++ if $strings -a $TMPE | grep -q BiGeNdIaN ; then |
| 48 |
+ bigendian="yes" |
| 49 |
+- elif strings -a $TMPE | grep -q LiTtLeEnDiAn ; then |
| 50 |
++ elif $strings -a $TMPE | grep -q LiTtLeEnDiAn ; then |
| 51 |
+ bigendian="no" |
| 52 |
+ else |
| 53 |
+ echo big/little test failed |
| 54 |
|
| 55 |
diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild |
| 56 |
index 33c2357b1386..4b02fd9f5f85 100644 |
| 57 |
--- a/app-emulation/qemu/qemu-9999.ebuild |
| 58 |
+++ b/app-emulation/qemu/qemu-9999.ebuild |
| 59 |
@@ -278,8 +278,8 @@ PATCHES=( |
| 60 |
"${FILESDIR}"/${PN}-2.11.1-capstone_include_path.patch |
| 61 |
"${FILESDIR}"/${PN}-5.2.0-disable-keymap.patch |
| 62 |
"${FILESDIR}"/${PN}-6.0.0-make.patch |
| 63 |
- "${FILESDIR}"/${PN}-6.1.0-strings.patch |
| 64 |
"${FILESDIR}"/${PN}-7.0.0-also-build-virtfs-proxy-helper.patch |
| 65 |
+ "${FILESDIR}"/${PN}-7.1.0-strings.patch |
| 66 |
) |
| 67 |
|
| 68 |
QA_PREBUILT=" |
Archives