Bump, thanks to Priit Laes for porting the patches. Tests fail.
authorPatrick Lauer <patrick@gentoo.org>
Sun, 21 Feb 2010 12:41:45 +0000 (12:41 +0000)
committerPatrick Lauer <patrick@gentoo.org>
Sun, 21 Feb 2010 12:41:45 +0000 (12:41 +0000)
Package-Manager: portage-2.2_rc63/cvs/Linux x86_64

dev-util/mono-debugger/ChangeLog
dev-util/mono-debugger/Manifest
dev-util/mono-debugger/files/mono-debugger-2.6-respect-cflags.patch [new file with mode: 0644]
dev-util/mono-debugger/files/mono-debugger-2.6-system-bfd.patch [new file with mode: 0644]
dev-util/mono-debugger/files/mono-debugger-2.6-system-libedit.patch [new file with mode: 0644]
dev-util/mono-debugger/mono-debugger-2.6.ebuild [new file with mode: 0644]

index e43a5a83460aebbe5fc9d4a6457c73486157830d..299e2666fb36570c02ceabc16149d146eccb585c 100644 (file)
@@ -1,6 +1,14 @@
 # ChangeLog for dev-util/mono-debugger
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/mono-debugger/ChangeLog,v 1.36 2010/02/05 09:52:13 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/mono-debugger/ChangeLog,v 1.37 2010/02/21 12:41:45 patrick Exp $
+
+*mono-debugger-2.6 (21 Feb 2010)
+
+  21 Feb 2010; Patrick Lauer <patrick@gentoo.org> +mono-debugger-2.6.ebuild,
+  +files/mono-debugger-2.6-respect-cflags.patch,
+  +files/mono-debugger-2.6-system-bfd.patch,
+  +files/mono-debugger-2.6-system-libedit.patch:
+  Bump, thanks to Priit Laes for porting the patches. Tests fail.
 
   05 Feb 2010; Alexis Ballier <aballier@gentoo.org>
   mono-debugger-2.4.2-r1.ebuild:
index 655ebb604406ac9565ce71a5b8c53d91ef18c1f0..d26e8103828029ff19c03763812ca37aa3a57778 100644 (file)
@@ -1,22 +1,17 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX mono-debugger-2.6-respect-cflags.patch 1411 RMD160 a604b377d1c0b0e60e2e50394b22689d1946ca35 SHA1 06656f56a64b73c8c84c64a01818d640aabc5c8a SHA256 9c3d21b8e42af4e966b0d08737e556be1dd9af35a0da64663fd82ce71389abe3
+AUX mono-debugger-2.6-system-bfd.patch 2908 RMD160 2d65818e73759f019a9af8c2d77e66a798c73a27 SHA1 64dc788514417ef9e06cceefdd61afc7ebfa7d66 SHA256 aac98cd219d74f363fa2a0d4ad554a85cbb270d0296b6ccf5b91fc2005444b01
+AUX mono-debugger-2.6-system-libedit.patch 3192 RMD160 b249aac51c3eb2fbba7a97681d0dd322076219f4 SHA1 dfd23a161d9db80f72f3348fb863bfc65f62b26a SHA256 fbe9560c44d7889150a8ed1d270d70c666fdc5417ee33b39ee176006a5dcbdc9
 AUX mono-debugger-kernel-2.6.19-fix-i386-asm.patch 1551 RMD160 408196050a4efd54040ff334562819d6c8c6dd39 SHA1 e98ea33c19345c48fce5e8094785f12369e00da7 SHA256 690af9ee7bd6896ccce87fb85ac140b87813c3906eee9adfa51dc354ab7fc639
 DIST mono-debugger-2.0.tar.bz2 1417926 RMD160 3a25962ea24307f8e23788bf9273095dad417dde SHA1 359b78547644f71475d413ddf47fd689c8e0b0bd SHA256 703ce63f995d4f1fa7603d409446f69550c91783dc858480f4d520ed29156b7a
 DIST mono-debugger-2.4.2-patches-1.tar.bz2 4498 RMD160 170a17ed41143a160ba27dc65bad5d8c1939a9d3 SHA1 21d4e85e287b3df93cf96ec641962a61959cf73e SHA256 480316d4ac4434953a52ed0db87dd759432cffb970c3e46f3830ac673c8fb923
 DIST mono-debugger-2.4.2.tar.bz2 1496832 RMD160 2555b4e9a2d54a49e24d9457f5a532e3f1e184e6 SHA1 1a35dd647fad62c9fbbdaa0f0e6957fe3f60bf71 SHA256 f931497d3d6b2bf621516824ef9dd3aa50f7c06de1263de1ab3c6028817ece49
+DIST mono-debugger-2.6.tar.bz2 1503350 RMD160 c5013c830dba048b4d3b2a342159d5d5a480587e SHA1 4d402882b09ba34fd9f1c29a2f6d41d5a3893a25 SHA256 0a1707a55e2b0e1e3ad46053dc4fb822a79697cd9b0b776ae42bf9195d5dafc4
 EBUILD mono-debugger-2.0.9999.ebuild 520 RMD160 abbb30330b64c3965dcf15095f2a2e244707ea63 SHA1 3c82cdafeb677cd9881e0cce009445b693dd2ac0 SHA256 c2174c9e9f828ce2420e389e909a471e6a3d155a583bf55c0aa0073c6f4ed896
 EBUILD mono-debugger-2.0.ebuild 723 RMD160 53f2c76cd04a3fccb875c02275fb37052877776a SHA1 7abddd95fb4b6e586cca0107a0f9ca806c6bdc91 SHA256 aeb3c7e611663a96c8cc6f6fd14e181b8f63e1b576966e30640301f03707995c
 EBUILD mono-debugger-2.4.2-r1.ebuild 1059 RMD160 fbf713fdd6de69b47ae535e9d24e3ddc3a5701bc SHA1 2dc0ead5272b0da4d9ee4957444546120e7a106e SHA256 941262b3a37332a6798a4282a77d4f718b79c4c2bb6f3a9c7b24487db172c42f
 EBUILD mono-debugger-2.4.2.ebuild 600 RMD160 9a12af0c993fa982e35772551a3e51dd2b07c775 SHA1 c97a064885530c73aea341d6042866b919caaedb SHA256 f4e64a966b59a4d5b7f50c11ba87cd2b4a31e176e64652fd446662898527c48d
 EBUILD mono-debugger-2.4.9999.ebuild 520 RMD160 c9ed05b3a710218fbd641b0d21c49e93c90b7858 SHA1 b570f9548f9ebe0590ec5944c82ca5fb36722d80 SHA256 73ac7ae04474338924dff3e48781362675ec8ea11c546cc531d6c1b27f74f5e6
+EBUILD mono-debugger-2.6.ebuild 1176 RMD160 4f75072092446f8eec9e1d9040b05291d3517a13 SHA1 b8967704471c59b65410ea27d96c8973f03d8c9b SHA256 a6821cde00bf23c352ab855383ab890b146bacc7383f244cecc537a865bae3ae
 EBUILD mono-debugger-9999.ebuild 516 RMD160 123607cadf957cc82052ab16f1793cde6a8de914 SHA1 06a80023e156a65b8167cce9aea6466c520ceeea SHA256 646707584ab07b1de187b0bde1f5ecac9a9a5dd04c73fdc8b43d2a20391d5ec6
-MISC ChangeLog 4868 RMD160 161064dab468592ccecd4692020fc95021ea523a SHA1 a68ab7dbb0cda89ed32bd51da386bb40d668011c SHA256 f81f2ed630fe15aa8f4ce19a833283ea819b36a08118797d3e07b2369ce0474a
+MISC ChangeLog 5188 RMD160 85f9d7ffd75fdbfc95845663067cb0619807cf99 SHA1 75f695546e96661f7770fa7375d5314a9adc1bfa SHA256 8b453c4a12e49dd52b282a938a797069dc9fa0a0a06b4547e6504e4be2c11491
 MISC metadata.xml 159 RMD160 41527b6d3fa74dfdcd619b7d91c478b72ecc8ae8 SHA1 ac19a418765e817e54d4c54c1992c9062d5dcf3e SHA256 986c3e2fa3baa5d6e8c0b5c27a2550601780d0cc7857f7f1c01523491706d909
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAktr6lMACgkQvFcC4BYPU0olgACfXdyvudxlitdWgstlXg7ab32y
-ngEAniV00K8uVbsV3i/UkdeplhS+gOrp
-=c9LZ
------END PGP SIGNATURE-----
diff --git a/dev-util/mono-debugger/files/mono-debugger-2.6-respect-cflags.patch b/dev-util/mono-debugger/files/mono-debugger-2.6-respect-cflags.patch
new file mode 100644 (file)
index 0000000..0f46b49
--- /dev/null
@@ -0,0 +1,34 @@
+From c396504c34d0e1648f7842c457b1db681b3b1b0b Mon Sep 17 00:00:00 2001
+From: Priit Laes <plaes@plaes.org>
+Date: Sun, 21 Feb 2010 14:04:48 +0200
+Subject: [PATCH 2/3] Respect cflags
+
+---
+ configure.in |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index e8ec185..ce0b609 100644
+--- a/configure.in
++++ b/configure.in
+@@ -106,7 +106,7 @@ AM_PROG_LIBTOOL
+ # not 64 bit clean in cross-compile
+ AC_CHECK_SIZEOF(void *, 4)
+ 
+-CFLAGS='-g -Wall -Wunused -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes  -Wmissing-prototypes -Wnested-externs  -Wshadow -Wpointer-arith -Wno-cast-qual -Wcast-align -Wwrite-strings -fno-strict-aliasing'
++CFLAGS="-g ${CFLAGS} -Wall -Wunused -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes  -Wmissing-prototypes -Wnested-externs  -Wshadow -Wpointer-arith -Wno-cast-qual -Wcast-align -Wwrite-strings -fno-strict-aliasing"
+ 
+ AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+ if test "x$PKG_CONFIG" = "xno"; then
+@@ -301,7 +301,7 @@ AM_CONDITIONAL(HAVE_XSP, test "x$with_xsp" = "xyes")
+ #not sure why, but I cannot get this test to pass on OS X.
+ if test x$platform != xi386darwin ; then
+ AC_MSG_CHECKING([Whether your Mono is working])
+-old_CFLAGS=$cflags
++old_CFLAGS=$CFLAGS
+ CFLAGS=$WRAPPER_CFLAGS
+ AC_TRY_COMPILE([#include <mono/metadata/mono-debug.h>
+ #include <mono/metadata/debug-mono-symfile.h>
+-- 
+1.7.0
+
diff --git a/dev-util/mono-debugger/files/mono-debugger-2.6-system-bfd.patch b/dev-util/mono-debugger/files/mono-debugger-2.6-system-bfd.patch
new file mode 100644 (file)
index 0000000..14d757e
--- /dev/null
@@ -0,0 +1,99 @@
+From d9c203a8680e2e7088b29540fe64de08966bd86d Mon Sep 17 00:00:00 2001
+From: Priit Laes <plaes@plaes.org>
+Date: Sun, 21 Feb 2010 14:18:43 +0200
+Subject: [PATCH 3/3] Add option to use system bfd.
+
+---
+ backend/os/Makefile.am |   13 +++++++++++--
+ backend/os/bfdglue.c   |    8 +++++++-
+ configure.in           |   14 ++++++++++++++
+ 3 files changed, 32 insertions(+), 3 deletions(-)
+
+diff --git a/backend/os/Makefile.am b/backend/os/Makefile.am
+index 2a9f019..b4ca82c 100644
+--- a/backend/os/Makefile.am
++++ b/backend/os/Makefile.am
+@@ -1,15 +1,24 @@
++if !SYSTEM_LIBBFD
+ SUBDIRS = bfd
+ 
++libbfd_libs = bfd/opcodes/libopcodes.la bfd/libbfd.la
++libbfd_includes = -I$(srcdir)/bfd -I$(srcdir)/bfd/include -I$(srcdir)/bfd/opcodes
++else
++libbfd_libs = -lopcodes -lbfd
++libbfd_includes =
++endif
++
++
+ noinst_LTLIBRARIES = libmonodebuggerbfdglue.la
+ 
+ libmonodebuggerbfdglue_la_SOURCES = \
+       bfdglue.c               \
+       bfdglue.h
+ 
+-libmonodebuggerbfdglue_la_LIBADD = bfd/opcodes/libopcodes.la bfd/libbfd.la @BASE_DEPENDENCIES_LIBS@
++libmonodebuggerbfdglue_la_LIBADD = $(libbfd_libs) @BASE_DEPENDENCIES_LIBS@
+ libmonodebuggerbfdglue_la_LDFLAGS = -no-undefined -module -export-dynamic -shared
+ 
+-INCLUDES = -I$(srcdir)/bfd -I$(srcdir)/bfd/include -I$(srcdir)/bfd/opcodes @BASE_DEPENDENCIES_CFLAGS@
++INCLUDES = $(libbfd_includes) @BASE_DEPENDENCIES_CFLAGS@
+ 
+ CLEANFILES = lib*.a lib*.dll
+ 
+diff --git a/backend/os/bfdglue.c b/backend/os/bfdglue.c
+index 9a741ac..e2138e7 100644
+--- a/backend/os/bfdglue.c
++++ b/backend/os/bfdglue.c
+@@ -1,3 +1,5 @@
++#include <config.h>
++
+ #include <bfdglue.h>
+ #include <signal.h>
+ #include <string.h>
+@@ -246,7 +248,11 @@ bfd_glue_get_errormsg (void)
+ guint32
+ bfd_glue_get_section_size (asection *p)
+ {
++#ifdef HAVE_ASECTION_RAWSIZE
++      return p->rawsize ? p->rawsize : p->size;
++#else
+       return p->_raw_size;
++#endif
+ }
+ 
+ BfdGlueSectionFlags
+@@ -350,4 +356,4 @@ guint64
+ bfd_glue_get_start_address (bfd *abfd)
+ {
+       return bfd_get_start_address (abfd);
+-}
+\ No newline at end of file
++}
+diff --git a/configure.in b/configure.in
+index ce0b609..6df7f05 100644
+--- a/configure.in
++++ b/configure.in
+@@ -64,6 +64,20 @@ case "$host" in
+ esac
+ AC_MSG_RESULT(ok)
+ 
++AC_ARG_WITH([system-libbfd],
++   AS_HELP_STRING([--with-system-libbfd], [Use the system copy of libbfd and libopcodes.]))
++
++AS_IF([test "x$with_system_libbfd" = "xyes"],
++  [
++     AC_CHECK_HEADERS([bfd.h], [], [AC_MSG_ERROR([Missing bfd.h header])])
++     AC_CHECK_LIB([bfd], [bfd_init], [:], [AC_MSG_ERROR([Missing libbfd library])])
++     AC_CHECK_LIB([opcodes], [init_disassemble_info], [:], [AC_MSG_ERROR([Missing libopcodes library])])
++     AC_CHECK_MEMBERS([asection.rawsize], [], [], [[#include <bfd.h>]])
++  ])
++
++AM_CONDITIONAL([SYSTEM_LIBBFD], [test "x$with_system_libbfd" = "xyes"])
++
++
+ AC_ARG_WITH(bfd-target,
+ [  --with-bfd-target       Manually override the BFD target],
+       if test x$with_bfd_target != "x"; then
+-- 
+1.7.0
+
diff --git a/dev-util/mono-debugger/files/mono-debugger-2.6-system-libedit.patch b/dev-util/mono-debugger/files/mono-debugger-2.6-system-libedit.patch
new file mode 100644 (file)
index 0000000..f7bdc22
--- /dev/null
@@ -0,0 +1,91 @@
+From a857a6fb50605d6f3dddf814081dbbff59d64ba7 Mon Sep 17 00:00:00 2001
+From: Priit Laes <plaes@plaes.org>
+Date: Sun, 21 Feb 2010 14:01:49 +0200
+Subject: [PATCH 1/3] Use system-wide libedit library when requested.
+
+---
+ configure.in                              |   15 ++++++++++++++-
+ frontend/libedit/Makefile.am              |   11 +++++++++--
+ frontend/libedit/mono-debugger-readline.h |   10 +++++++++-
+ 3 files changed, 32 insertions(+), 4 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 256afa9..e8ec185 100644
+--- a/configure.in
++++ b/configure.in
+@@ -262,7 +262,20 @@ AC_HEADER_DIRENT
+ AC_CHECK_FUNCS(fcntl getpagesize setitimer sysconf fdopen getuid getgid)
+ AC_CHECK_FUNCS(strlcpy strlcat fgetln)
+ 
+-CHECK_READLINE
++AC_ARG_WITH([system-libedit],
++   AS_HELP_STRING([--with-system-libedit], [Use the system copy of libedit.]))
++
++AS_IF([test "x$with_system_libedit" = "xyes"],
++  [
++     AC_CHECK_HEADERS([editline/readline.h libedit/readline.h], [found_libedit_header=yes; break;])
++     AS_IF([test "$found_libedit_header" != "yes"], [AC_MSG_ERROR([Missing libedit/readline.h header])])
++     AC_CHECK_LIB([edit], [el_init], [:], [AC_MSG_ERROR([Missing libedit library])])
++  ], [
++     CHECK_READLINE
++  ])
++
++AM_CONDITIONAL([SYSTEM_LIBEDIT], [test "x$with_system_libedit" = "xyes"])
++
+ 
+ min_mono_version=72
+ symfile_major_version=50
+diff --git a/frontend/libedit/Makefile.am b/frontend/libedit/Makefile.am
+index 9e03757..100cb88 100644
+--- a/frontend/libedit/Makefile.am
++++ b/frontend/libedit/Makefile.am
+@@ -1,14 +1,21 @@
+ lib_LTLIBRARIES = libmonodebuggerreadline.la
+ 
+ libmonodebuggerreadline_la_SOURCES = \
+-      mono-debugger-readline.c mono-debugger-readline.h readline.c readline.h \
++      mono-debugger-readline.c mono-debugger-readline.h
++
++if SYSTEM_LIBEDIT
++libedit_libs = -ledit
++else
++libedit_libs = @READLINE_DEPLIBS@
++libmonodebuggerreadline_la_SOURCES += readline.c readline.h \
+       chared.c common.c el.c emacs.c fcns.c help.c hist.c history.c key.c map.c \
+       parse.c prompt.c read.c refresh.c search.c sig.c term.c tty.c vi.c vis.c unvis.c \
+       strlcpy.c strlcat.c chared.h common.h el.h emacs.h fcns.h help.h histedit.h hist.h \
+       key.h map.h parse.h prompt.h read.h refresh.h search.h sig.h sys.h term.h tty.h \
+       vi.h vis.h el_term.h filecomplete.h tokenizer.c filecomplete.c
++endif
+ 
+-libmonodebuggerreadline_la_LIBADD = @BASE_DEPENDENCIES_LIBS@ @READLINE_DEPLIBS@
++libmonodebuggerreadline_la_LIBADD = @BASE_DEPENDENCIES_LIBS@ $(libedit_libs)
+ if PLATFORM_X86_DARWIN
+ libmonodebuggerreadline_la_LDFLAGS = -no-undefined -shared -Wl
+ else
+diff --git a/frontend/libedit/mono-debugger-readline.h b/frontend/libedit/mono-debugger-readline.h
+index c547c75..1a854cc 100644
+--- a/frontend/libedit/mono-debugger-readline.h
++++ b/frontend/libedit/mono-debugger-readline.h
+@@ -1,9 +1,17 @@
+ #ifndef __MONO_DEBUGGER_READLINE_H__
+ #define __MONO_DEBUGGER_READLINE_H__
+ 
++#include <config.h>
++
+ #include <glib.h>
+ #include <stdio.h>
+-#include <readline.h>
++#if defined(HAVE_LIBEDIT_READLINE_H)
++# include <libedit/readline.h>
++#elif defined(HAVE_LIBEDIT_READLINE_H)
++# include <libedit/readline.h>
++#else
++# include "readline.h"
++#endif
+ 
+ G_BEGIN_DECLS
+ 
+-- 
+1.7.0
+
diff --git a/dev-util/mono-debugger/mono-debugger-2.6.ebuild b/dev-util/mono-debugger/mono-debugger-2.6.ebuild
new file mode 100644 (file)
index 0000000..1e65c05
--- /dev/null
@@ -0,0 +1,53 @@
+# Copyright 1999-2010 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.6.ebuild,v 1.1 2010/02/21 12:41:45 patrick Exp $
+
+# bah, tests fail. Needs to be fixed ...
+RESTRICT="test"
+
+EAPI=2
+
+PATCHLEVEL=1
+
+inherit go-mono mono autotools flag-o-matic eutils
+
+DESCRIPTION="Debugger for .NET managed and unmanaged applications"
+HOMEPAGE="http://www.go-mono.com"
+
+LICENSE="GPL-2 MIT"
+SLOT="0"
+KEYWORDS="-* ~x86 ~amd64"
+IUSE=""
+
+# Binutils is needed for libbfd
+RDEPEND="!!=dev-lang/mono-2.2
+       >=dev-libs/libedit-20090111
+       sys-devel/binutils
+       dev-libs/glib:2"
+DEPEND="${RDEPEND}
+       !dev-lang/mercury"
+
+src_prepare() {
+       go-mono_src_prepare
+       
+       epatch "${FILESDIR}/${P}-respect-cflags.patch" \
+               "${FILESDIR}/${P}-system-bfd.patch" \
+               "${FILESDIR}/${P}-system-libedit.patch"
+
+       eautoreconf
+}
+
+src_configure() {
+       # Let's go for extra safety to avoid runtime errors, until
+       # upstream applies it.
+       append-ldflags -Wl,--no-undefined
+
+       go-mono_src_configure \
+               --with-system-libbfd \
+               --with-system-libedit \
+               --disable-static
+}
+
+src_compile() {
+       emake -j1 || die "Failed to build"
+}