Fixed building with >=gcc-4.6.0

Package-Manager: portage-2.2.0_alpha37/cvs/Linux x86_64

4 files changed, 70 insertions, 7 deletions

diff --git a/sys-libs/libsmbios/ChangeLog b/sys-libs/libsmbios/ChangeLog
index 21a37a7abab6..2549d5ee6c4c 100644
--- a/sys-libs/libsmbios/ChangeLog
+++ b/sys-libs/libsmbios/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-libs/libsmbios
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsmbios/ChangeLog,v 1.28 2010/09/28 15:33:23 polynomial-c Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsmbios/ChangeLog,v 1.29 2011/05/29 10:10:23 polynomial-c Exp $
+
+  29 May 2011; Lars Wendler <polynomial-c@gentoo.org> libsmbios-2.2.26.ebuild,
+  +files/libsmbios-2.2.26-gcc46.patch:
+  Fixed building with >=gcc-4.6.0. Thanks to Billy DeVincentis for reporting
+  this issue in bug #364285 and to steveb for giving the right hints how to fix
+  this.
 
 *libsmbios-2.2.26 (28 Sep 2010)
 
diff --git a/sys-libs/libsmbios/Manifest b/sys-libs/libsmbios/Manifest
index 8f32041a0fd3..aecdc390539d 100644
--- a/sys-libs/libsmbios/Manifest
+++ b/sys-libs/libsmbios/Manifest
@@ -1,8 +1,29 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+AUX libsmbios-2.2.26-gcc46.patch 1375 RMD160 dc44975b8a48f183e633aec8c9008328cff1b9bf SHA1 f73196bb2c7db499db9bc87b1152eac90970ecf5 SHA256 fa09c9782d8132302abc6ad941c1fec5c89a4257bf33b15a586ac8c9605a9f59
 DIST libsmbios-0.13.13.tar.gz 3802626 RMD160 22051306c8ff7d9d039810f2b311e1ca6c332785 SHA1 813ccce09590c14ff671a40629693d0e23074242 SHA256 5201329dc5c2a8e7a0722d099148c828d5026cdaebcbdb6313397c52e7d1a7c1
 DIST libsmbios-2.2.19.tar.bz2 860647 RMD160 f169a17291524cf7d1f18edc9cecfecbe94e2c15 SHA1 0566d247171266fbab17e623f08f9756622bc223 SHA256 2ff784ab9195db17bc578cdc9f6eb7419fae108e62d09b0af37da8e1bc86bad0
 DIST libsmbios-2.2.26.tar.bz2 905847 RMD160 99503b289e81b4c28be3c11b419340070fe01a95 SHA1 cab94459c6f846bad9330d3b8843d8db53fb714a SHA256 dc5512f64783c4160822e77070a80dd783010e0bd844c240495b7662b774a46d
 EBUILD libsmbios-0.13.13.ebuild 886 RMD160 d79ef177a7000d274763168d81b842ccb150e5f0 SHA1 385eaf76852263cd9949aec70d44baa422a3a4c3 SHA256 07716cb057d8f4349dcdafa2981faee7ba15338715ed4041992fa26cf0d218da
 EBUILD libsmbios-2.2.19.ebuild 1482 RMD160 103b361147e3769d5841e17fee14fd47ecdb5e7d SHA1 f7aa612398dc46d480143b02c184356493603e7a SHA256 715dac1eb231dcc442407a81550655b6c35edeb06d0e973f57893968c7857655
-EBUILD libsmbios-2.2.26.ebuild 1618 RMD160 9f6a971dc0912d74bca8a7c19badc6ce01c410c4 SHA1 ec1d38a158e7b1f5b5d0beb9da6047ed701460ad SHA256 af4f45cf39a16b173ab68aaaeb82b8fcd734442adac965ac4e6eb1b10fa69ece
-MISC ChangeLog 3752 RMD160 7b6b7d034e2759ba781ffb717c20634117aaf5d1 SHA1 2c684e4fec7a177696c6f42fee128d18a4ecaadf SHA256 cb8b9bd4a11f5c72c30c7c34c92e40f6352adb5ee27ab59b036be174979efd86
+EBUILD libsmbios-2.2.26.ebuild 1672 RMD160 b4b31237d548a4d8417e05f7fc4a936ca2a5830b SHA1 fc466b89823310eded1f4f4ddee1da09cf249486 SHA256 fc5fe21ad82e271dfda6a91ae35229f84c5049eb339e104dddc0f88852db8edd
+MISC ChangeLog 4036 RMD160 e06607be25f3846e42500ed417ad9a47aba9755b SHA1 7bbcb1bd8201404c09fa1749e7fb6c3d71a6ae95 SHA256 3ac1ba4b8b6b2de821d4dcad6f463200b64cc90010a0e089ca01d6d044ad0f4b
 MISC metadata.xml 478 RMD160 94bc5d0d4d4033cca6622104814b24a11360da91 SHA1 2c31d004ffe60441f5508e0b17a490a380163695 SHA256 96aa099693294b8bd0ec4b607e0abbc02172fe75775b21d290da4bfb8419a65d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBCgAGBQJN4huUAAoJEPiazRVxLXTFzgUP/0OBgao2XwfQhCq+xGdG4/yU
+6ugaSxeoItI5ccWax0qEKGV9M2HeyQwp0Mtq8y2lwryK0AipDdsWsqWAklcy5Soy
+QhpJG/4M3AABBruPl4ImJZY3KB+fEZf3P4d/lWKOpZKAiXOSKr3fOnzgqxkvKPt0
+448Ak49NRfiWgcsujv4DbjcTJH0yLbeE+IAvzBY3L4Zop90KP/IBSGYUAHYiYK7m
+DWB6/vKDVkcNKiyuhW0tg77+v9YBMYaw9Gl1Z6eRLjlRUoebhS5RNBRFfX5SCUAj
+hU0FgWBpCOlORsDGDoZVW7pwYXHrMgB0ZvtyimEE/7nExspLxN5AJP7iRRgnSWwC
+ttoVUhbOneMmonef/pSiOr6BdUVAQ57t4hp+uRs1CsrPjJ3+CahFV/tQqNHu4t74
+qXlYfieozYFPUpQQflIXNEPQt4bDXf67YzZCCMBYEvzjTfZPAqw9ycI+uFersy+g
+CBmQ8W/6C+tygiFETBp6NXByT4O5tHdqq/HpV5ou4AoMbS4F4x5/cHONwoZrV7TP
+6/QbxM8plXjzpA/RE7LtJCnbLPeaBY74xFL5VafeH4212VVxg4iSQvo8CcVTNGDw
+Dd3W4eXieETZL+LkFM3JzBumO7te0avdPJc9ku/R/jMwxJyUdhPhHOlrhcD+6PLH
+0EIA+U5oJuGOKVGVXk5K
+=R2Me
+-----END PGP SIGNATURE-----
diff --git a/sys-libs/libsmbios/files/libsmbios-2.2.26-gcc46.patch b/sys-libs/libsmbios/files/libsmbios-2.2.26-gcc46.patch
new file mode 100644
index 000000000000..cc13c8fb9ac5
--- /dev/null
+++ b/sys-libs/libsmbios/files/libsmbios-2.2.26-gcc46.patch
@@ -0,0 +1,35 @@
+--- libsmbios-2.2.26/Makefile.am
++++ libsmbios-2.2.26/Makefile.am
+@@ -18,8 +18,8 @@
+ TESTS=
+ 
+ AM_CPPFLAGS = -I$(top_builddir)/out/include -I$(top_srcdir)/src/include -DLIBSMBIOS_LOCALEDIR=\"$(localedir)\"
+-AM_CFLAGS = -Werror -Wall
+-AM_CXXFLAGS = -Werror -Wall
++AM_CFLAGS = -Wall
++AM_CXXFLAGS = -Wall
+ AM_LDADD = $(LIBINTL)
+ AM_LDFLAGS = -L$(top_builddir)/out/ -Wl,--no-undefined @LDFLAG_AS_NEEDED@
+ 
+--- libsmbios-2.2.26/src/include/smbios/config/compiler/gcc.hpp
++++ libsmbios-2.2.26/src/include/smbios/config/compiler/gcc.hpp
+@@ -113,7 +113,7 @@
+ #  error "Compiler not configured - please reconfigure"
+ #endif
+ //
+-#if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ > 5))
++#if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ > 6))
+ #  if defined(LIBSMBIOS_ASSERT_CONFIG)
+ #     error "Unknown compiler version - please run the configure tests and report the results"
+ #  else
+--- libsmbios-2.2.26/src/include/smbios_c/config/compiler/gcc.h
++++ libsmbios-2.2.26/src/include/smbios_c/config/compiler/gcc.h
+@@ -24,7 +24,7 @@
+ #  error "GCC versions < 2.90 not supported"
+ #endif
+ //
+-#if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ > 5))
++#if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ > 6))
+ #  if defined(LIBSMBIOS_C_ASSERT_CONFIG)
+ #     error "Unknown compiler version - please run the configure tests and report the results"
+ #  else
diff --git a/sys-libs/libsmbios/libsmbios-2.2.26.ebuild b/sys-libs/libsmbios/libsmbios-2.2.26.ebuild
index be05af5a078c..e672e0551b4f 100644
--- a/sys-libs/libsmbios/libsmbios-2.2.26.ebuild
+++ b/sys-libs/libsmbios/libsmbios-2.2.26.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsmbios/libsmbios-2.2.26.ebuild,v 1.1 2010/09/28 15:33:23 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsmbios/libsmbios-2.2.26.ebuild,v 1.2 2011/05/29 10:10:23 polynomial-c Exp $
 
 EAPI=2
 PYTHON_DEPEND="python? *:2.4"
 
-inherit python flag-o-matic autotools
+inherit eutils python flag-o-matic autotools
 
 DESCRIPTION="Provide access to (SM)BIOS information"
 HOMEPAGE="http://linux.dell.com/libsmbios/main/index.html"
@@ -27,6 +27,7 @@ DEPEND="${RDEPEND}
 	test? ( >=dev-util/cppunit-1.9.6 )"
 
 src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.2.26-gcc46.patch
 	rm pkg/py-compile
 	ln -s "$(type -P true)" pkg/py-compile || die
 	eautoreconf