diff options
| author |   Lars Wendler <polynomial-c@gentoo.org> | 2012-06-21 19:25:26 +0000 |
|---|---|---|
| committer | Lars Wendler <polynomial-c@gentoo.org> | 2012-06-21 19:25:26 +0000 |
| commit | 9945b74443b3a952a15996c50f7a1ab5f894cc99 (patch) | |
| tree | f270a5bd56ecbed7fa1fe51480210cbc388e2fc0 /sys-libs/libsmbios | |
| parent | Restrict pypy (diff) | |
| download | gentoo-2-9945b74443b3a952a15996c50f7a1ab5f894cc99.tar.gz gentoo-2-9945b74443b3a952a15996c50f7a1ab5f894cc99.tar.bz2 gentoo-2-9945b74443b3a952a15996c50f7a1ab5f894cc99.zip | |
Fixed test runs (bug #381975)
(Portage version: 2.2.0_alpha110/cvs/Linux x86_64)
Diffstat (limited to 'sys-libs/libsmbios')
| -rw-r--r-- | sys-libs/libsmbios/ChangeLog | 8 | ||||
| -rw-r--r-- | sys-libs/libsmbios/files/libsmbios-2.2.28-cppunit-tests.patch | 11 | ||||
| -rw-r--r-- | sys-libs/libsmbios/libsmbios-2.2.28.ebuild | 5 |
3 files changed, 21 insertions, 3 deletions
diff --git a/sys-libs/libsmbios/ChangeLog b/sys-libs/libsmbios/ChangeLog index 01c11b707df5..3d218ba30bca 100644 --- a/sys-libs/libsmbios/ChangeLog +++ b/sys-libs/libsmbios/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-libs/libsmbios # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsmbios/ChangeLog,v 1.39 2012/06/21 11:03:17 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsmbios/ChangeLog,v 1.40 2012/06/21 19:25:26 polynomial-c Exp $ + + 21 Jun 2012; Lars Wendler <polynomial-c@gentoo.org> libsmbios-2.2.28.ebuild, + +files/libsmbios-2.2.28-cppunit-tests.patch: + Fixed test runs. Thanks to Markus Meier for reporting this in bug #381975 and + big kudos to Ian Stakenvicius for looking into this problem and providing a + working patch. 21 Jun 2012; Lars Wendler <polynomial-c@gentoo.org> libsmbios-2.2.28.ebuild: Fixed building with automake-1.12. Thanks to flameeyes who reported this in diff --git a/sys-libs/libsmbios/files/libsmbios-2.2.28-cppunit-tests.patch b/sys-libs/libsmbios/files/libsmbios-2.2.28-cppunit-tests.patch new file mode 100644 index 000000000000..61f392787213 --- /dev/null +++ b/sys-libs/libsmbios/files/libsmbios-2.2.28-cppunit-tests.patch @@ -0,0 +1,11 @@ +diff -Naur libsmbios-2.2.28/src/libsmbios_c/smi/smi_linux.c libsmbios-2.2.28.new/src/libsmbios_c/smi/smi_linux.c +--- libsmbios-2.2.28/src/libsmbios_c/smi/smi_linux.c 2010-06-11 11:31:01.000000000 -0400 ++++ libsmbios-2.2.28.new/src/libsmbios_c/smi/smi_linux.c 2012-06-21 14:57:15.000000000 -0400 +@@ -48,6 +48,7 @@ + #define bufsize 256 + + // not in header file. for private use by unit tests. ++LIBSMBIOS_C_DLL_SPEC void set_basedir(const char *); // needed to link tests + void set_basedir(const char *newdir) + { + sysfs_basedir = newdir; diff --git a/sys-libs/libsmbios/libsmbios-2.2.28.ebuild b/sys-libs/libsmbios/libsmbios-2.2.28.ebuild index f6aaed38f418..db8b15f15082 100644 --- a/sys-libs/libsmbios/libsmbios-2.2.28.ebuild +++ b/sys-libs/libsmbios/libsmbios-2.2.28.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsmbios/libsmbios-2.2.28.ebuild,v 1.6 2012/06/21 11:03:17 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsmbios/libsmbios-2.2.28.ebuild,v 1.7 2012/06/21 19:25:26 polynomial-c Exp $ EAPI=2 PYTHON_DEPEND="python? *:2.5" @@ -29,7 +29,8 @@ DEPEND="${RDEPEND} src_prepare() { epatch \ "${FILESDIR}"/${PN}-2.2.28-gcc46.patch \ - "${FILESDIR}"/${PN}-fix-pie.patch + "${FILESDIR}"/${PN}-fix-pie.patch \ + "${FILESDIR}"/${PN}-2.2.28-cppunit-tests.patch >pkg/py-compile # dist-lzma was removed from automake-1.12 (bug #422779) sed 's@dist-lzma@dist-xz@' -i "${S}"/configure.ac || die |