summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/qemu/qemu-git/remove-hardcoded-libexec.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/qemu/qemu-git/remove-hardcoded-libexec.patch')
-rw-r--r--meta/recipes-devtools/qemu/qemu-git/remove-hardcoded-libexec.patch41
1 files changed, 0 insertions, 41 deletions
diff --git a/meta/recipes-devtools/qemu/qemu-git/remove-hardcoded-libexec.patch b/meta/recipes-devtools/qemu/qemu-git/remove-hardcoded-libexec.patch
deleted file mode 100644
index 83f5463aad..0000000000
--- a/meta/recipes-devtools/qemu/qemu-git/remove-hardcoded-libexec.patch
+++ /dev/null
@@ -1,41 +0,0 @@
1This will allow the libexecdir to be set on the command line
2and have the files installed and used from the correct location
3
4Upstream-Status: Inappropriate [oe-core specific]
5
6Signed-off-by: Saul Wold <sgw@linux.intel.com>
7
8Index: qemu-1.2.0/configure
9===================================================================
10--- qemu-1.2.0.orig/configure
11+++ qemu-1.2.0/configure
12@@ -183,6 +183,7 @@ datadir="\${prefix}/share"
13 qemu_docdir="\${prefix}/share/doc/qemu"
14 bindir="\${prefix}/bin"
15 libdir="\${prefix}/lib"
16+libexecdir="\${prefix}/libexec"
17 includedir="\${prefix}/include"
18 sysconfdir="\${prefix}/etc"
19 confsuffix="/qemu"
20@@ -644,7 +645,9 @@ for opt do
21 ;;
22 --sysconfdir=*) sysconfdir="$optarg"
23 ;;
24- --sbindir=*|--libexecdir=*|--sharedstatedir=*|--localstatedir=*|\
25+ --libexecdir=*) libexecdir="$optarg"
26+ ;;
27+ --sbindir=*|--sharedstatedir=*|--localstatedir=*|\
28 --oldincludedir=*|--datarootdir=*|--infodir=*|--localedir=*|\
29 --htmldir=*|--dvidir=*|--pdfdir=*|--psdir=*)
30 # These switches are silently ignored, for compatibility with
31@@ -3190,8 +3193,8 @@ echo "sysconfdir=$sysconfdir" >> $config
32 echo "qemu_confdir=$qemu_confdir" >> $config_host_mak
33 echo "qemu_datadir=$qemu_datadir" >> $config_host_mak
34 echo "qemu_docdir=$qemu_docdir" >> $config_host_mak
35-echo "libexecdir=\${prefix}/libexec" >> $config_host_mak
36-echo "CONFIG_QEMU_HELPERDIR=\"$prefix/libexec\"" >> $config_host_mak
37+echo "libexecdir=$libexecdir" >> $config_host_mak
38+echo "CONFIG_QEMU_HELPERDIR=$libexecdir" >> $config_host_mak
39
40 echo "ARCH=$ARCH" >> $config_host_mak
41 if test "$debug_tcg" = "yes" ; then