diff options
| author |   WANG Xuerui <xen0n@gentoo.org> | 2022-07-05 08:39:29 +0800 |
|---|---|---|
| committer | WANG Xuerui <xen0n@gentoo.org> | 2022-07-05 08:53:53 +0800 |
| commit | e7e343979dbfd7e4b4fcf85f36c17d414fc1e41e (patch) | |
| tree | d36f02212153b4b639811a8bd1ab8d6111ecb764 /app-emulation | |
| parent | app-emulation/qemu: sync targets USE flags, add loongarch64 (diff) | |
| download | gentoo-e7e343979dbfd7e4b4fcf85f36c17d414fc1e41e.tar.gz gentoo-e7e343979dbfd7e4b4fcf85f36c17d414fc1e41e.tar.bz2 gentoo-e7e343979dbfd7e4b4fcf85f36c17d414fc1e41e.zip | |
app-emulation/qemu: forward port 6.1.0-strings.patch to latest main branch
Due to upstream commit https://gitlab.com/qemu-project/qemu/-/commit/158bb2249ed9
("configure: Add cross prefix for widl tool").
Tentatively named 7.1.0, as 7.1.0 will be the first upstream version
this forwarded patch is applicable to.
Signed-off-by: WANG Xuerui <xen0n@gentoo.org>
Diffstat (limited to 'app-emulation')
| -rw-r--r-- | app-emulation/qemu/files/qemu-7.1.0-strings.patch | 26 | ||||
| -rw-r--r-- | app-emulation/qemu/qemu-9999.ebuild | 2 |
2 files changed, 27 insertions, 1 deletions
diff --git a/app-emulation/qemu/files/qemu-7.1.0-strings.patch b/app-emulation/qemu/files/qemu-7.1.0-strings.patch new file mode 100644 index 000000000000..01f235b9a33c --- /dev/null +++ b/app-emulation/qemu/files/qemu-7.1.0-strings.patch @@ -0,0 +1,26 @@ +Forward-ported from original patch for 5.2.0. + +diff --git a/configure b/configure +index da2501489f..4660ee3ee5 100755 +--- a/configure ++++ b/configure +@@ -400,6 +400,7 @@ ld="${LD-${cross_prefix}ld}" + nm="${NM-${cross_prefix}nm}" + smbd="$SMBD" + strip="${STRIP-${cross_prefix}strip}" ++strings="${STRINGS-${cross_prefix}strings}" + widl="${WIDL-${cross_prefix}widl}" + windres="${WINDRES-${cross_prefix}windres}" + pkg_config_exe="${PKG_CONFIG-${cross_prefix}pkg-config}" +@@ -1466,9 +1467,9 @@ int main(int argc, char *argv[]) + EOF + + if compile_prog ; then +- if strings -a $TMPE | grep -q BiGeNdIaN ; then ++ if $strings -a $TMPE | grep -q BiGeNdIaN ; then + bigendian="yes" +- elif strings -a $TMPE | grep -q LiTtLeEnDiAn ; then ++ elif $strings -a $TMPE | grep -q LiTtLeEnDiAn ; then + bigendian="no" + else + echo big/little test failed diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild index 33c2357b1386..4b02fd9f5f85 100644 --- a/app-emulation/qemu/qemu-9999.ebuild +++ b/app-emulation/qemu/qemu-9999.ebuild @@ -278,8 +278,8 @@ PATCHES=( "${FILESDIR}"/${PN}-2.11.1-capstone_include_path.patch "${FILESDIR}"/${PN}-5.2.0-disable-keymap.patch "${FILESDIR}"/${PN}-6.0.0-make.patch - "${FILESDIR}"/${PN}-6.1.0-strings.patch "${FILESDIR}"/${PN}-7.0.0-also-build-virtfs-proxy-helper.patch + "${FILESDIR}"/${PN}-7.1.0-strings.patch ) QA_PREBUILT=" |