Accepting request 125461 from home:a_faerber:branches:Virtualization

Revert linux-user LIBRARY_PATH patch

OBS-URL: https://build.opensuse.org/request/show/125461
OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=85

0024-linux-user-binfmt-Force-using-emula.patch

@@ -1,33 +0,0 @@
-From da89f732a99c424c0830c04ce269e679e81e2d8f Mon Sep 17 00:00:00 2001
-From: Alexander Graf <agraf@suse.de>
-Date: Mon, 18 Jun 2012 14:15:04 +0200
-Subject: [PATCH] linux-user/binfmt: Force using emulation when LIBRARY_PATH
- is set
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-GCC ignores LIBRARY_PATH when cross-compiling so we must use emulation
-to have it picked up correctly.
-
-Signed-off-by: Alexander Graf <agraf@suse.de>
-Signed-off-by: Andreas Färber <afaerber@suse.de>
----
- linux-user/binfmt.c |    4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
-
-diff --git a/linux-user/binfmt.c b/linux-user/binfmt.c
-index 87dc4c6..a1b712d 100644
---- a/linux-user/binfmt.c
-+++ b/linux-user/binfmt.c
-@@ -42,7 +42,9 @@ int main(int argc, char **argv, char **envp)
-         }
-         guestarch++;
-         asprintf(&hostbin, "/emul/" ARCH_NAME "-for-%s/%s", guestarch, argv[1]);
--        if (!access(hostbin, X_OK)) {
-+        /* gcc ignores LIBRARY_PATH in its cross variant, so let's not use
-+           host binaries when we find it set */
-+        if (!access(hostbin, X_OK) && !getenv("LIBRARY_PATH")) {
-             /*
-              * We found a host binary replacement for the non-host binary. Let's
-              * use that instead!

qemu.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Jun 19 16:06:52 UTC 2012 - afaerber@suse.de
+
+- revert LIBRARY_PATH patch by Alex
+
 -------------------------------------------------------------------
 Mon Jun 18 12:27:56 UTC 2012 - afaerber@suse.de
 

qemu.spec

@@ -47,7 +47,6 @@ Patch0020:      0020-linux-user-arm-no-tb_flush-on-reset.patch
 Patch0021:      0021-linux-user-fix-multi-threaded-proc-.patch
 Patch0022:      0022-use-libexecdir-instead-of-ignoring-.patch
 Patch0023:      0023-linux-user-Ignore-broken-loop-ioctl.patch
-Patch0024:      0024-linux-user-binfmt-Force-using-emula.patch
 # this is to make lint happy
 Source300:      rpmlintrc
 Source302:      bridge.conf
@@ -165,7 +164,6 @@ run cross-architecture builds.
 %patch0021 -p1
 %patch0022 -p1
 %patch0023 -p1
-%patch0024 -p1
 
 %build
 # build QEMU