Fix bug 256777, failure with gcc-4.4. Thanks to Kent Fredric <kentfredric@gmail.com> for the patch.

Package-Manager: portage-2.2_rc28/cvs/Linux x86_64

4 files changed, 64 insertions, 12 deletions

diff --git a/sys-libs/libsmbios/ChangeLog b/sys-libs/libsmbios/ChangeLog
index d4fa692350e2..908d64fbe7d2 100644
--- a/sys-libs/libsmbios/ChangeLog
+++ b/sys-libs/libsmbios/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/libsmbios
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsmbios/ChangeLog,v 1.19 2008/11/01 16:24:32 cedk Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsmbios/ChangeLog,v 1.20 2009/04/11 16:46:12 loki_val Exp $
+
+  11 Apr 2009; Peter Alfredsen <loki_val@gentoo.org>
+  +files/libsmbios-2.0.3-gcc44.patch, libsmbios-2.0.3.ebuild:
+  Fix bug 256777, failure with gcc-4.4. Thanks to Kent Fredric
+  <kentfredric@gmail.com> for the patch.
 
 *libsmbios-2.0.3 (01 Nov 2008)
 
diff --git a/sys-libs/libsmbios/Manifest b/sys-libs/libsmbios/Manifest
index 9b191aab902f..6e6e07f44b3c 100644
--- a/sys-libs/libsmbios/Manifest
+++ b/sys-libs/libsmbios/Manifest
@@ -1,3 +1,4 @@
+AUX libsmbios-2.0.3-gcc44.patch 1565 RMD160 62745d7dea23655383a262efae0e6ce033b9566d SHA1 1f09f37aa1400fb5dd8ca2b259fbf05d44d179c3 SHA256 db044b016ecd4bed64f5f8c6d2d3effe04011c065f2b5c20170edbf3c0072748
 DIST libsmbios-0.13.10.tar.gz 3802278 RMD160 dadf195733968ea84e8af4db21baed8675de2ff6 SHA1 00fd380b7f2cf899898be4ef0635f659415c7ece SHA256 4ef10229ed79bebc01466bbd852dd9779faa94d0d55fdc7c92d3a32b72482b79
 DIST libsmbios-0.13.13.tar.gz 3802626 RMD160 22051306c8ff7d9d039810f2b311e1ca6c332785 SHA1 813ccce09590c14ff671a40629693d0e23074242 SHA256 5201329dc5c2a8e7a0722d099148c828d5026cdaebcbdb6313397c52e7d1a7c1
 DIST libsmbios-0.13.6.tar.gz 3790653 RMD160 3abf277b3aa79e989ae2b8e97a9a86a38c9e09fb SHA1 f53221a17cc798cc8c5a6d0a6b49380b77c059cd SHA256 da39676d1417a260b127bdf63c0b311d4849e831527d4e4c4f4864fffb804c7e
@@ -7,6 +8,6 @@ EBUILD libsmbios-0.13.10.ebuild 887 RMD160 cce555cfb3dcd22d9ed5d04e1534d5036ba35
 EBUILD libsmbios-0.13.13.ebuild 886 RMD160 d79ef177a7000d274763168d81b842ccb150e5f0 SHA1 385eaf76852263cd9949aec70d44baa422a3a4c3 SHA256 07716cb057d8f4349dcdafa2981faee7ba15338715ed4041992fa26cf0d218da
 EBUILD libsmbios-0.13.6.ebuild 883 RMD160 5482c3de73b0505695a52ae4f85d5ef1edb0fe2e SHA1 525879d243a8ff0b9a4cb462f7c8f4432a62547f SHA256 4c3f9c78194c13b2021d1bb6542d15e9c43af88e71c45ba6fb54f09b3f2c65ee
 EBUILD libsmbios-2.0.2.ebuild 1015 RMD160 668cac55343ba992d06146111d42a7c2e7051a28 SHA1 e7d01f2b562b4b0d1869b2129eba75efb1437dfc SHA256 52e506620a98863be11a62a96a7c5d5eabd873a4b7f5b3173bde9d71da80315d
-EBUILD libsmbios-2.0.3.ebuild 1015 RMD160 9952a0ff00848fa71c484429c56d089aa428427a SHA1 3c35c0e89ea7ca58e3002f1d88daf2dfa13641ee SHA256 0e393cc7a99a86e55eedcfadf2c52eb0e02d42abb34f8a9ee8b5e25e038f8314
-MISC ChangeLog 2397 RMD160 116a138bdfd255ea3429da1ecc209ae35dd6adcd SHA1 e33d4c841cfaae2097873f04707513e71853dbe8 SHA256 8c7ff586d08ca024afef31d6aad334cd361568f85d5a6dae5e693b3be6e9c760
+EBUILD libsmbios-2.0.3.ebuild 988 RMD160 c3feab2511302fbd69645b29c3bafe23fd463ca7 SHA1 2acd11e1b7d767038be8f6b614c4dd69e52fc85b SHA256 83d0760017d1820efed96711424fe648303039e16daba6a09b75572704658df0
+MISC ChangeLog 2621 RMD160 be4560b7ae8f11b3986ec9d7b9c37405cacd150b SHA1 adbadb4053931982951c0d65135d47b75c6b2da0 SHA256 e22af11156b4bb21145f7c6398dfe51734243632e220902592e1a4eab3edfc70
 MISC metadata.xml 442 RMD160 e3319a047c9f321ed5b9e89e15c872c0aae3d847 SHA1 10689fe03c4cba1a94c4bb14dad3bf08c874e9a8 SHA256 16bf4a95152483852f22e4d5f19f2faf714bfdde4b0f72490d74768cd60469fd
diff --git a/sys-libs/libsmbios/files/libsmbios-2.0.3-gcc44.patch b/sys-libs/libsmbios/files/libsmbios-2.0.3-gcc44.patch
new file mode 100644
index 000000000000..6f4a802ca789
--- /dev/null
+++ b/sys-libs/libsmbios/files/libsmbios-2.0.3-gcc44.patch
@@ -0,0 +1,45 @@
+diff -Naur libraries/cmos/CmosRW.cpp libraries/cmos/CmosRW.cpp
+--- libraries/cmos/CmosRW.cpp	2008-02-13 19:12:43.000000000 +0000
++++ libraries/cmos/CmosRW.cpp	2009-01-29 11:29:02.992136416 +0000
+@@ -19,6 +19,7 @@
+ // compat header should always be first header if including system headers
+ #define LIBSMBIOS_SOURCE
+ #include "smbios/compat.h"
++#include <stdio.h>
+ #include <errno.h>
+ #include <string.h>
+ #include "CmosRWImpl.h"
+diff -Naur libraries/memory/Memory_Linux.cpp libraries/memory/Memory_Linux.cpp
+--- libraries/memory/Memory_Linux.cpp	2007-10-19 22:15:12.000000000 +0000
++++ libraries/memory/Memory_Linux.cpp	2009-01-29 11:28:33.745839933 +0000
+@@ -22,6 +22,7 @@
+ 
+ #include <errno.h>
+ #include <sys/mman.h>   /* mmap */
++#include <stdio.h>
+ #include <unistd.h>     /* getpagesize */
+ #include <string.h>     /* memcpy etc. */
+ 
+diff -Naur libraries/smbios/SmbiosStrategy_Linux.cpp libraries/smbios/SmbiosStrategy_Linux.cpp
+--- libraries/smbios/SmbiosStrategy_Linux.cpp	2007-10-19 22:15:12.000000000 +0000
++++ libraries/smbios/SmbiosStrategy_Linux.cpp	2009-01-29 11:28:04.639844346 +0000
+@@ -20,6 +20,7 @@
+ #define LIBSMBIOS_SOURCE
+ #include "smbios/compat.h"
+ 
++#include <cstdio>
+ #include <sstream>
+ #include <string.h>
+ 
+diff -Naur libraries/smi/SmiImpl.h libraries/smi/SmiImpl.h
+--- libraries/smi/SmiImpl.h	2007-11-27 17:50:54.000000000 +0000
++++ libraries/smi/SmiImpl.h	2009-01-29 11:44:52.811833602 +0000
+@@ -22,6 +22,8 @@
+ #include "SmiLowLevel.h"
+ #include "ExceptionImpl.h"
+ 
++#include <cstdio>
++
+ namespace smi
+ {
+     // define our exceptions
diff --git a/sys-libs/libsmbios/libsmbios-2.0.3.ebuild b/sys-libs/libsmbios/libsmbios-2.0.3.ebuild
index dd114e6ce53f..03920937897c 100644
--- a/sys-libs/libsmbios/libsmbios-2.0.3.ebuild
+++ b/sys-libs/libsmbios/libsmbios-2.0.3.ebuild
@@ -1,6 +1,10 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsmbios/libsmbios-2.0.3.ebuild,v 1.1 2008/11/01 16:24:32 cedk Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsmbios/libsmbios-2.0.3.ebuild,v 1.2 2009/04/11 16:46:12 loki_val Exp $
+
+EAPI=2
+
+inherit eutils
 
 DESCRIPTION="Provide access to (SM)BIOS information"
 HOMEPAGE="http://linux.dell.com/libsmbios/main/index.html"
@@ -16,13 +20,10 @@ DEPEND="dev-libs/libxml2
 	test? ( dev-util/cppunit )"
 RDEPEND=${DEPEND}
 
-src_compile() {
-	econf || die "econf failed"
-	emake || die "emake failed"
-}
+RESTRICT=test
 
-src_test() {
-	einfo "testing currently broken - bypassing"
+src_prepare() {
+	epatch "${FILESDIR}/libsmbios-2.0.3-gcc44.patch"
 }
 
 src_install() {