diff options
| author |   Julian Ospald <hasufell@gentoo.org> | 2012-12-31 14:18:36 +0000 |
|---|---|---|
| committer | Julian Ospald <hasufell@gentoo.org> | 2012-12-31 14:18:36 +0000 |
| commit | a0d78ba683209e28858cd27d6abdde6d177e7ad4 (patch) | |
| tree | 6c24e49fa9a1d8224fbb3e020c4c9e9f82569a35 /app-admin/hardinfo | |
| parent | Add ~ppc, wrt bug #449220 (diff) | |
| download | gentoo-2-a0d78ba683209e28858cd27d6abdde6d177e7ad4.tar.gz gentoo-2-a0d78ba683209e28858cd27d6abdde6d177e7ad4.tar.bz2 gentoo-2-a0d78ba683209e28858cd27d6abdde6d177e7ad4.zip | |
fix compilation with clang
(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key E73C35B3)
Diffstat (limited to 'app-admin/hardinfo')
| -rw-r--r-- | app-admin/hardinfo/ChangeLog | 7 | ||||
| -rw-r--r-- | app-admin/hardinfo/files/hardinfo-0.5.2_pre20120527-clang.patch | 24 | ||||
| -rw-r--r-- | app-admin/hardinfo/hardinfo-0.5.2_pre20120527.ebuild | 5 |
3 files changed, 33 insertions, 3 deletions
diff --git a/app-admin/hardinfo/ChangeLog b/app-admin/hardinfo/ChangeLog index e1da9e498b50..154a74062b3e 100644 --- a/app-admin/hardinfo/ChangeLog +++ b/app-admin/hardinfo/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-admin/hardinfo # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/hardinfo/ChangeLog,v 1.6 2012/08/03 13:26:27 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/hardinfo/ChangeLog,v 1.7 2012/12/31 14:18:36 hasufell Exp $ + + 31 Dec 2012; Julian Ospald <hasufell@gentoo.org> + hardinfo-0.5.2_pre20120527.ebuild, + +files/hardinfo-0.5.2_pre20120527-clang.patch: + fix compilation with clang 03 Aug 2012; Agostino Sarubbo <ago@gentoo.org> hardinfo-0.5.2_pre20120527.ebuild: diff --git a/app-admin/hardinfo/files/hardinfo-0.5.2_pre20120527-clang.patch b/app-admin/hardinfo/files/hardinfo-0.5.2_pre20120527-clang.patch new file mode 100644 index 000000000000..bc81290b2279 --- /dev/null +++ b/app-admin/hardinfo/files/hardinfo-0.5.2_pre20120527-clang.patch @@ -0,0 +1,24 @@ +https://github.com/lpereira/hardinfo/pull/6 + +--- hardinfo-0.5.2_pre20120527/hardinfo/util.c ++++ hardinfo-0.5.2_pre20120527/hardinfo/util.c +@@ -1368,7 +1368,7 @@ + { + if (G_UNLIKELY(!_moreinfo)) { + DEBUG("moreinfo not initialized"); +- return; ++ return 0; + } + + if (prefix) { +--- hardinfo-0.5.2_pre20120527/CMakeLists.txt ++++ hardinfo-0.5.2_pre20120527/CMakeLists.txt +@@ -43,6 +43,8 @@ + + message(STATUS "Building HardInfo for architecture: ${HARDINFO_OS}-${HARDINFO_ARCH}") + ++add_definitions("-std=gnu89") ++ + include(FindPkgConfig) + pkg_check_modules(GTK REQUIRED gtk+-2.0>=2.10 glib-2.0>=2.10 gthread-2.0>=2.10 gmodule-export-2.0>=2.10) + pkg_check_modules(LIBSOUP libsoup-2.4>=2.24) diff --git a/app-admin/hardinfo/hardinfo-0.5.2_pre20120527.ebuild b/app-admin/hardinfo/hardinfo-0.5.2_pre20120527.ebuild index c430e5dc231a..5285245c2e4f 100644 --- a/app-admin/hardinfo/hardinfo-0.5.2_pre20120527.ebuild +++ b/app-admin/hardinfo/hardinfo-0.5.2_pre20120527.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/app-admin/hardinfo/hardinfo-0.5.2_pre20120527.ebuild,v 1.5 2012/08/03 13:26:27 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/hardinfo/hardinfo-0.5.2_pre20120527.ebuild,v 1.6 2012/12/31 14:18:36 hasufell Exp $ EAPI=4 @@ -25,7 +25,8 @@ DEPEND="${RDEPEND} src_prepare() { epatch "${FILESDIR}"/${P}-build.patch \ - "${FILESDIR}"/${P}-underlinking.patch + "${FILESDIR}"/${P}-underlinking.patch \ + "${FILESDIR}"/${P}-clang.patch sed \ -e 's/g_build_filename(prefix, "lib"/g_build_filename(prefix, "'$(get_libdir)'"/' \ |