[gentoo-commits] dev/dilfridge:master commit in: app-emulation/qemu/, app-emulation/qemu/files/

[Andreas Hüttel]

commit:     ae824c9553b39efc55d46349787cd38659839dbc
Author:     Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Sat Feb 25 17:43:17 2012 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Feb 25 17:43:17 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=ae824c95

Got this to build. Lots of warnings about shared glibc though...

(Portage version: 2.1.10.49/git/Linux x86_64, signed Manifest commit with key B6C5F7DE)

---
 app-emulation/qemu/ChangeLog                       |    7 +++
 app-emulation/qemu/Manifest                        |   32 ++++++-----
 app-emulation/qemu/files/qemu-1.0-static-1.patch   |   55 ++++++++++++++++++++
 app-emulation/qemu/files/qemu-1.0-static-2.patch   |   54 +++++++++++++++++++
 .../{qemu-1.0-r3.ebuild => qemu-1.0-r4.ebuild}     |   32 ++++++++++--
 5 files changed, 160 insertions(+), 20 deletions(-)

diff --git a/app-emulation/qemu/ChangeLog b/app-emulation/qemu/ChangeLog
index 6f1de6c..c2c12da 100644
--- a/app-emulation/qemu/ChangeLog
+++ b/app-emulation/qemu/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*qemu-1.0-r4 (25 Feb 2012)
+
+  25 Feb 2012; Andreas K. Huettel <dilfridge@g.o> -qemu-1.0-r3.ebuild,
+  +qemu-1.0-r4.ebuild, +files/qemu-1.0-static-1.patch,
+  +files/qemu-1.0-static-2.patch:
+  Got this to build. Lots of warnings about shared glibc though...
+
   25 Feb 2012; Andreas K. Huettel <dilfridge@g.o> -qemu-0.11.1.ebuild,
   -qemu-0.11.1-r1.ebuild, -qemu-1.0-r2.ebuild, -qemu-9999.ebuild:
   [app-emulation/qemu] clean out stuff I dont need

diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index fb07b7f..b7688f3 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -3,28 +3,30 @@ Hash: SHA512
 
 AUX qemu-0.11.0-mips64-user-fix.patch 313 RMD160 db016e0a48990a435dd6cf6e807145b33ada4908 SHA1 2ea913b1bcd29734a6d4011794bdb4aa3599a184 SHA256 b4173fc177bd0d0ba67f5551a3512047a19a9b2c0a122f968e32fbd834848d2f
 AUX qemu-0.11.1-CVE-2012-0029-backport.patch 1448 RMD160 efdf7bfe481bbfec2106d4a1652ec4df3242eb97 SHA1 dd44a1c1224c90f93bfcb19c612c6920325e6624 SHA256 fb739ca478977f17b73489823b92d8964da1bb308db997596e1160900f2c9236
+AUX qemu-1.0-static-1.patch 1700 RMD160 2ef3c9a87d852312d752d12db8b397423f6f9835 SHA1 81231024eeb53fbc29c5311aa08264c745bfe46b SHA256 465ad010e794e7a84a2eae81ab917983a2ed4f6cc6b9a159c9ced2a11864ba7b
+AUX qemu-1.0-static-2.patch 2520 RMD160 9f4d72fdf3aef138325a94c9a6c915452cbef79f SHA1 b0419953ed2077cdd25c88bed80912fe564e415f SHA256 5bb46b0c33454364950d8321108ebd145fdd9ab5c2a82a6e0577c7f2a47e9031
 AUX qemu-ifdown 478 RMD160 2187fbf352e6b84686f0cf0e9e9ebe5d26359858 SHA1 1daccb4785fe503687562798f90be1414267e27d SHA256 7d90c39184fd7531d9b8ae787122b68ac768b41afeb0ef2b3baa6461f77af03d
 AUX qemu-ifup 554 RMD160 9769d79ab6456bdd7e3e689005f629e2a67b858d SHA1 dde2b27acabe6fe23ca40f90ff6950bb12a4b506 SHA256 eae9b50680442acc29c65a245a2d26a63756ad4cb894e08cb5ea249686801f1d
 AUX qemu-kvm-1.0-e1000-bounds-packet-size-against-buffer-size.patch 1412 RMD160 53749555d464e56cfab39b0fa2e8120ab2c024db SHA1 9046e72b8c7496840e340f6fc351434b8830f191 SHA256 9a06665c47b76b2501f148713c46f8ce0b14ed03da5e6cb03c0d141f5d91900a
 DIST qemu-1.0-patches.tar.xz 43540 RMD160 79a39d5a8050fe8eedd5e0becb828d2ae0b465c3 SHA1 423880fb32f27e05d1382ed341e6cc4bee840dc3 SHA256 32a8b98cd5fd661268328d71efbfafd65972102b10da363193f3da98bd9b2d72
 DIST qemu-1.0.tar.gz 10848714 RMD160 3a60aef6cfebba6896bdb12c99525da5456172fd SHA1 7dcb1b3516554d6d899d7488cd444dbb7721fcee SHA256 47674b7da559d5e1b44cc401af9ac5ad962d14e9eede12567b13e4b841989737
-EBUILD qemu-1.0-r3.ebuild 7131 RMD160 46719a9424c0979de36ac1009d53d8f6a2dae4cf SHA1 e7ebc7299ef16b5e1407960f30c949f96cd3fb3e SHA256 f5c61c0f4578ec11393905890611595de179ba6415dc49b031c0c20553593410
-MISC ChangeLog 315 RMD160 b8f96fe0713222c1d0c3e3793cf1b03b4703b88e SHA1 93dae78c6d110e97fcc29025a4985c65ce12a221 SHA256 74883e9755730b1b3c8370b263abc7a144fd83f72fbbf39b83cb74e51fce7a4d
+EBUILD qemu-1.0-r4.ebuild 7596 RMD160 2c3310dc38e3b892816efe9cc17efb7f51dd1500 SHA1 485bd72e7e3a34fc64b4d03a9e291b7821505166 SHA256 3acc828c4e01f2c170c0a3cb4a4458f86375a4d079eff715f4092ac1d505e14f
+MISC ChangeLog 578 RMD160 2c518f04fa197f6a110acc1eb51a4635f31a8994 SHA1 2f78e85f7e546d2db3344771fc488bb71d3afc11 SHA256 19c4287ef2710784fb238b0ea596281d5f16072ac897e9a2b18273408af86d8e
 MISC metadata.xml 2575 RMD160 d53217a49f76391725580cb4ebb22c0ed43588bf SHA1 0b1f51a4bf30e8899cb0379e14eba26c6aa00b7f SHA256 a07e1dd5932d91789f481394b318cf20f4c5a529168b8e5adb299736a643b94b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJPSRC8AAoJENwGBM22xffejKYP/jOuEoR+1PYZuGotqQT9Kf8t
-LL+NBhOpatQkiyKNztN9eskG4k8p3KYKkySDzKCogcCbjxbSaKURbfn+9kLCEe+x
-Pkp9JubX1grrSU6OuAD0wzc2NXer55DGqNpVGgCkEUaRTsobr8+lqpy7EK2EEAgx
-DgmkGWdJnJ15FNF0RJbMcj41kAPjprhDUf1i9R982fOoFL+/AIjk4LcFamMPwhCi
-ZKNbmQY97y9I9W1LjJ5YKndxhkNcj4kz4HoHNKkwuUHHjeHbM7Z28oNvK/5qJHhj
-me3cIFSKmzVbXRKFnFYyjElIQkhSy/I0/0PP7IXEjVzzUlAM4OldvcyADJTbERKp
-q3XeyAVl6u8BW5uP4EQj376HLzgd9dmmrIGJmduZYG095q2gCd5kjVAZfOHjAFDB
-w38RSBQvwOTeWzx6uvokRLFKtHlo1OQuHJmStUMEJ12Ee8/ZkQR4M21IMbCvNuBZ
-+ooZGqDTuj5Z+WfKTcFHsJdUfMzqiju03hGdQ4arOYXL7dEzSuun1H7y8SaK9ZdJ
-YXD/1nJacFX6AnM2oUJZ7lSxdoYBRrgwKdblOITGsgwgrN98GlCRwEW/po+rWL1F
-4KXkhGBQWJmWBR8RwQPHSuq4fFVgxRMEXggU3PrF7euK3NtgDaQZmLGEho3PdHgt
-xFlFh9/H3Nj7munKtwfq
-=tsrh
+iQIcBAEBCgAGBQJPSR21AAoJENwGBM22xfferrQQAILGLd13zxwrJV7k+mABW4Bp
+St+a0jfOzcpHM1Uk7eIIat/s5YrthF7auxV8hlWVRqW0+oVgZhfUwzbkknUDDowT
+r5NsR8rit54Tzgxwn7xxIFMRnlf9NQyLFBFW2lgSs1z6E6U9FyRg4zZdH8LKkVhj
+hyLcFg3DN4fsYq753fHtFrzTcsiyZLhCxq1vy/NRLvpeEn1ByZXGs9DRW5yd54sC
+eqvVEvD6/zcYhIe69Jalod/56g+C5feib1BXc69Hv8OrawggE2w9MuqZ1URXTpZx
+kSvMOUlsEGdXpU+du/rrIuo66INN/z0FUHt6koZsReGLGeepdi3uPleUfMZK6doF
+z9txGFkF6NOfgYdk0EKKUWpX6d/JBQsL92XohfmrsErxzNOLDtTQdLVp+HGuXJ/u
+cpa/voDfDpRkv+P2w7PSBpQYULWU98ogAY0BM0+CzLKL191CnyISTBUte4IQL8Zk
+4pF3CsRT487AD9o+iUKTgMR16YKD5r4q+EPdQCr3fUQoSnQ0nikzL9WJgHmYiAN3
+5p16pE9N3BV4F8f552c5eJc5tvOlOLxhvBTmN7vlnJwxd5lDlgmWY1CeTH4kh/0B
+a6nJePYQMRRb1ikHC9QhBaeXLYYx81F4+TPc8aRtr+pK5vCaD2eTHgo2dDI1doZp
+t/OGqagE92iB7qWIxcsW
+=mi/0
 -----END PGP SIGNATURE-----

diff --git a/app-emulation/qemu/files/qemu-1.0-static-1.patch b/app-emulation/qemu/files/qemu-1.0-static-1.patch
new file mode 100644
index 0000000..f19b407
--- /dev/null
+++ b/app-emulation/qemu/files/qemu-1.0-static-1.patch
@@ -0,0 +1,55 @@
+From 17884d7b6462b0fe497f08fec6091ffbe04caa8d Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyfox@g.o>
+Date: Tue, 31 Jan 2012 22:03:45 +0300
+Subject: [PATCH] ./configure: request pkg-config to provide private libs when static linking
+
+Added wrapper around pkg-config to allow:
+- safe options injection via ${QEMU_PKG_CONFIG_FLAGS}
+- spaces in path to pkg-config
+
+Signed-off-by: Sergei Trofimovich <slyfox@g.o>
+CC: Peter Maydell <peter.maydell@××××××.org>
+Signed-off-by: Anthony Liguori <aliguori@××××××.com>
+---
+ configure |   11 ++++++++---
+ 1 files changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/configure b/configure
+index f69e08f..8fd5404 100755
+--- a/configure
++++ b/configure
+@@ -234,7 +234,11 @@ ld="${LD-${cross_prefix}ld}"
+ libtool="${LIBTOOL-${cross_prefix}libtool}"
+ strip="${STRIP-${cross_prefix}strip}"
+ windres="${WINDRES-${cross_prefix}windres}"
+-pkg_config="${PKG_CONFIG-${cross_prefix}pkg-config}"
++pkg_config_exe="${PKG_CONFIG-${cross_prefix}pkg-config}"
++query_pkg_config() {
++    "${pkg_config_exe}" ${QEMU_PKG_CONFIG_FLAGS} "$@"
++}
++pkg_config=query_pkg_config
+ sdl_config="${SDL_CONFIG-${cross_prefix}sdl-config}"
+ 
+ # default flags for all hosts
+@@ -553,6 +557,7 @@ for opt do
+   --static)
+     static="yes"
+     LDFLAGS="-static $LDFLAGS"
++    QEMU_PKG_CONFIG_FLAGS="--static $QEMU_PKG_CONFIG_FLAGS"
+   ;;
+   --mandir=*) mandir="$optarg"
+   ;;
+@@ -1449,8 +1454,8 @@ fi
+ ##########################################
+ # pkg-config probe
+ 
+-if ! has $pkg_config; then
+-  echo "Error: pkg-config binary '$pkg_config' not found"
++if ! has "$pkg_config_exe"; then
++  echo "Error: pkg-config binary '$pkg_config_exe' not found"
+   exit 1
+ fi
+ 
+-- 
+1.7.0.4
+

diff --git a/app-emulation/qemu/files/qemu-1.0-static-2.patch b/app-emulation/qemu/files/qemu-1.0-static-2.patch
new file mode 100644
index 0000000..bac2918
--- /dev/null
+++ b/app-emulation/qemu/files/qemu-1.0-static-2.patch
@@ -0,0 +1,54 @@
+From 5f01e06f1fc7904a03e02b68c829aa25c2085baa Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyfox@g.o>
+Date: Tue, 31 Jan 2012 22:03:58 +0300
+Subject: [PATCH] ./configure: add link check for nss-smartcard
+
+Current './configure --static && make' fails for me:
+
+    LINK  qemu-nbd
+    /usr/lib/gcc/x86_64-pc-linux-gnu/4.5.3/../../../../x86_64-pc-linux-gnu/bin/ld: cannot find -lssl3
+    /usr/lib/gcc/x86_64-pc-linux-gnu/4.5.3/../../../../x86_64-pc-linux-gnu/bin/ld: cannot find -lsmime3
+    /usr/lib/gcc/x86_64-pc-linux-gnu/4.5.3/../../../../x86_64-pc-linux-gnu/bin/ld: cannot find -lnssutil3
+    /usr/lib/gcc/x86_64-pc-linux-gnu/4.5.3/../../../../x86_64-pc-linux-gnu/bin/ld: cannot find -lnss3
+    /usr/lib/gcc/x86_64-pc-linux-gnu/4.5.3/../../../../x86_64-pc-linux-gnu/bin/ld: cannot find -lplds4
+    /usr/lib/gcc/x86_64-pc-linux-gnu/4.5.3/../../../../x86_64-pc-linux-gnu/bin/ld: cannot find -lplc4
+    /usr/lib/gcc/x86_64-pc-linux-gnu/4.5.3/../../../../x86_64-pc-linux-gnu/bin/ld: cannot find -lnspr4
+
+My system does not provide static libraries for nss, so
+fix autoconfiguration by link checking.
+
+Signed-off-by: Sergei Trofimovich <slyfox@g.o>
+CC: qemu-trivial <qemu-trivial@××××××.org>
+Signed-off-by: Anthony Liguori <aliguori@××××××.com>
+---
+ configure |   13 +++++++++----
+ 1 files changed, 9 insertions(+), 4 deletions(-)
+
+diff --git a/configure b/configure
+index 8fd5404..3b0b300 100755
+--- a/configure
++++ b/configure
+@@ -2528,11 +2528,16 @@ if test "$smartcard" != "no" ; then
+     smartcard_cflags=""
+     # TODO - what's the minimal nss version we support?
+     if test "$smartcard_nss" != "no"; then
+-        if $pkg_config --atleast-version=3.12.8 nss >/dev/null 2>&1 ; then
++      cat > $TMPC << EOF
++#include <pk11pub.h>
++int main(void) { PK11_FreeSlot(0); return 0; }
++EOF
++        smartcard_cflags="-I\$(SRC_PATH)/libcacard"
++        libcacard_libs=$($pkg_config --libs nss 2>/dev/null)
++        libcacard_cflags=$($pkg_config --cflags nss 2>/dev/null)
++        if $pkg_config --atleast-version=3.12.8 nss >/dev/null 2>&1 && \
++          compile_prog "$smartcard_cflags $libcacard_cflags" "$libcacard_libs"; then
+             smartcard_nss="yes"
+-            smartcard_cflags="-I\$(SRC_PATH)/libcacard"
+-            libcacard_libs=$($pkg_config --libs nss 2>/dev/null)
+-            libcacard_cflags=$($pkg_config --cflags nss 2>/dev/null)
+             QEMU_CFLAGS="$QEMU_CFLAGS $smartcard_cflags $libcacard_cflags"
+             LIBS="$libcacard_libs $LIBS"
+         else
+-- 
+1.7.0.4
+

diff --git a/app-emulation/qemu/qemu-1.0-r3.ebuild b/app-emulation/qemu/qemu-1.0-r4.ebuild
similarity index 91%
rename from app-emulation/qemu/qemu-1.0-r3.ebuild
rename to app-emulation/qemu/qemu-1.0-r4.ebuild
index b897373..b5b76a3 100644
--- a/app-emulation/qemu/qemu-1.0-r3.ebuild
+++ b/app-emulation/qemu/qemu-1.0-r4.ebuild
@@ -49,15 +49,24 @@ RDEPEND="${RDEPEND}
 	sys-apps/pciutils
 	>=sys-apps/util-linux-2.16.0
 	sys-libs/zlib
-	aio? ( dev-libs/libaio )
+	aio? (
+		static? ( dev-libs/libaio[static-libs] )
+		!static? ( dev-libs/libaio )
+	)
 	alsa? ( >=media-libs/alsa-lib-1.0.13 )
 	bluetooth? ( net-wireless/bluez )
 	brltty? ( app-accessibility/brltty )
-	curl? ( net-misc/curl )
+	curl? (
+		static? ( net-misc/curl[static-libs] )
+		!static? ( net-misc/curl )
+	)
 	esd? ( media-sound/esound )
 	fdt? ( >=sys-apps/dtc-1.2.0 )
 	jpeg? ( virtual/jpeg )
-	ncurses? ( sys-libs/ncurses )
+	ncurses? (
+		static? ( sys-libs/ncurses[static-libs] )
+		!static? ( sys-libs/ncurses )
+	)
 	nss? ( dev-libs/nss )
 	opengl? (
 		virtual/opengl
@@ -71,12 +80,22 @@ RDEPEND="${RDEPEND}
 	)
 	rbd? ( sys-cluster/ceph )
 	sasl? ( dev-libs/cyrus-sasl )
-	sdl? ( >=media-libs/libsdl-1.2.11[X] )
+	sdl? (
+		static? ( >=media-libs/libsdl-1.2.11[X,static-libs] )
+		!static? ( >=media-libs/libsdl-1.2.11[X] )
+	)
 	spice? (
 		>=app-emulation/spice-0.9.0
 		>=app-emulation/spice-protocol-0.8.1
 	)
-	ssl? ( net-libs/gnutls )
+	ssl? (
+		static? ( net-libs/gnutls[static-libs(+)] )
+		!static? ( net-libs/gnutls )
+	)
+	static? (
+		>=sys-apps/util-linux-2.16.0[static-libs]
+		sys-libs/zlib[static-libs]
+	)
 	usbredir? ( sys-apps/usbredir )
 	vde? ( net-misc/vde )
 	xattr? ( sys-apps/attr )
@@ -128,6 +147,9 @@ pkg_setup() {
 }
 
 src_prepare() {
+	# fixing static support
+	epatch "${FILESDIR}"/${P}-static-*.patch
+
 	# bug #400595 / CVE-2012-0029
 	epatch "${FILESDIR}"/qemu-kvm-1.0-e1000-bounds-packet-size-against-buffer-size.patch