summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2012-04-18 10:22:31 +0000
committerPacho Ramos <pacho@gentoo.org>2012-04-18 10:22:31 +0000
commitea4e79b24b2c89ff60549a62a79ff328a54a5188 (patch)
tree26d3438bd72e7d1d4bd7d1fe83c7d3f7bf8b6f5f
parentFix hddtemp sensors for Linux 3.x wrt #409343 by Balint SZENTE. Install to li... (diff)
downloadgentoo-2-ea4e79b24b2c89ff60549a62a79ff328a54a5188.tar.gz
gentoo-2-ea4e79b24b2c89ff60549a62a79ff328a54a5188.tar.bz2
gentoo-2-ea4e79b24b2c89ff60549a62a79ff328a54a5188.zip
Fix glib-2.32 building.
(Portage version: 2.1.10.56/cvs/Linux x86_64)
-rw-r--r--dev-util/mono-debugger/ChangeLog6
-rw-r--r--dev-util/mono-debugger/files/mono-debugger-2.10-glib2.32.patch11
-rw-r--r--dev-util/mono-debugger/mono-debugger-2.10.ebuild8
3 files changed, 21 insertions, 4 deletions
diff --git a/dev-util/mono-debugger/ChangeLog b/dev-util/mono-debugger/ChangeLog
index a77631dfd9c9..e96fc636ad55 100644
--- a/dev-util/mono-debugger/ChangeLog
+++ b/dev-util/mono-debugger/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-util/mono-debugger
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/mono-debugger/ChangeLog,v 1.51 2012/04/13 19:13:11 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/mono-debugger/ChangeLog,v 1.52 2012/04/18 10:22:31 pacho Exp $
+
+ 18 Apr 2012; Pacho Ramos <pacho@gentoo.org>
+ +files/mono-debugger-2.10-glib2.32.patch, mono-debugger-2.10.ebuild:
+ Fix glib-2.32 building.
13 Apr 2012; Ulrich Müller <ulm@gentoo.org> mono-debugger-2.10.ebuild:
Move EAPI assignment to top of ebuild, bug 411875.
diff --git a/dev-util/mono-debugger/files/mono-debugger-2.10-glib2.32.patch b/dev-util/mono-debugger/files/mono-debugger-2.10-glib2.32.patch
new file mode 100644
index 000000000000..ea0538a51def
--- /dev/null
+++ b/dev-util/mono-debugger/files/mono-debugger-2.10-glib2.32.patch
@@ -0,0 +1,11 @@
+diff -uNr mono-debugger-2.10.old/sysdeps/server/breakpoints.c mono-debugger-2.10/sysdeps/server/breakpoints.c
+--- mono-debugger-2.10.old/sysdeps/server/breakpoints.c 2011-01-13 23:41:31.000000000 +0100
++++ mono-debugger-2.10/sysdeps/server/breakpoints.c 2011-11-12 15:46:57.909192866 +0100
+@@ -1,6 +1,6 @@
+ #include <server.h>
+ #include <breakpoints.h>
+-#include <glib/gthread.h>
++#include <glib.h>
+ #include <sys/stat.h>
+ #include <signal.h>
+ #ifdef HAVE_UNISTD_H
diff --git a/dev-util/mono-debugger/mono-debugger-2.10.ebuild b/dev-util/mono-debugger/mono-debugger-2.10.ebuild
index 89f8632cc620..4f35afde9b34 100644
--- a/dev-util/mono-debugger/mono-debugger-2.10.ebuild
+++ b/dev-util/mono-debugger/mono-debugger-2.10.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/mono-debugger/mono-debugger-2.10.ebuild,v 1.4 2012/04/13 19:13:11 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/mono-debugger/mono-debugger-2.10.ebuild,v 1.5 2012/04/18 10:22:31 pacho Exp $
-EAPI="2"
+EAPI=4
inherit go-mono mono autotools flag-o-matic eutils
@@ -27,6 +27,8 @@ DEPEND="${RDEPEND}
src_prepare() {
go-mono_src_prepare
+ epatch "${FILESDIR}/${P}-glib2.32.patch"
+
# Allow compilation against system libbfd, bnc#662581
epatch "${FILESDIR}/${PN}-2.8-system-bfd.patch"
eautoreconf
@@ -43,5 +45,5 @@ src_configure() {
}
src_compile() {
- emake -j1 || die "Failed to build"
+ emake -j1
}