From 6f840fb50828458dc78d77b9e66b3b69b9469009 Mon Sep 17 00:00:00 2001 From: Steve Arnold Date: Wed, 21 Mar 2007 03:00:47 +0000 Subject: [PATCH] updated with parallel make patch and automake deps (see bugs 142545 and 171502) Package-Manager: portage-2.1.2.2 --- dev-util/cgdb/ChangeLog | 7 +- dev-util/cgdb/Manifest | 30 ++++---- dev-util/cgdb/cgdb-0.6.3.ebuild | 13 ++-- .../cgdb/files/cgdb-0.6.3-makefile-race.patch | 68 +++++++++++++++++++ 4 files changed, 95 insertions(+), 23 deletions(-) create mode 100644 dev-util/cgdb/files/cgdb-0.6.3-makefile-race.patch diff --git a/dev-util/cgdb/ChangeLog b/dev-util/cgdb/ChangeLog index 82bfb3467fa5..7970474ffbab 100644 --- a/dev-util/cgdb/ChangeLog +++ b/dev-util/cgdb/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-util/cgdb # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/cgdb/ChangeLog,v 1.29 2007/03/19 02:29:53 kloeri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/cgdb/ChangeLog,v 1.30 2007/03/21 03:00:47 nerdboy Exp $ + + 21 Mar 2007; Steve Arnold + +files/cgdb-0.6.3-makefile-race.patch, cgdb-0.6.3.ebuild: + Updated with new parallel make patch and automake deps (see bugs 142545 and + 171502). 19 Mar 2007; Bryan Østergaard metadata.xml: Remove ka0ttic from metadata.xml due to retirement. diff --git a/dev-util/cgdb/Manifest b/dev-util/cgdb/Manifest index 6f03c19b4e4d..d0b2ce361db6 100644 --- a/dev-util/cgdb/Manifest +++ b/dev-util/cgdb/Manifest @@ -1,10 +1,11 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX cgdb-0.6.2-parallel-make.patch 2251 RMD160 b75cf1cab2580ecb0678e2dd3ae6f27e563ee51a SHA1 400d68b0bea70bcb9e08b56caa02236e5518be7b SHA256 ec6280c30ba92644b31c2293dd860c014260eb554918c2967dbd9cd6689065de MD5 c2e0007b7ac569d2d1c6696d2b5aac17 files/cgdb-0.6.2-parallel-make.patch 2251 RMD160 b75cf1cab2580ecb0678e2dd3ae6f27e563ee51a files/cgdb-0.6.2-parallel-make.patch 2251 SHA256 ec6280c30ba92644b31c2293dd860c014260eb554918c2967dbd9cd6689065de files/cgdb-0.6.2-parallel-make.patch 2251 +AUX cgdb-0.6.3-makefile-race.patch 2872 RMD160 ba8a715ad5f84a42b2b1b9d8bc33927c1d8115af SHA1 1cb7ed00b82f8eb8ec6a8e909df3dd0983f61fb0 SHA256 03a5c17916ee1b61fdfa1f460983790d45278ae388f173310c98855f70936a11 +MD5 9b9de67b9ef2fd5f3b03b2b48704acc2 files/cgdb-0.6.3-makefile-race.patch 2872 +RMD160 ba8a715ad5f84a42b2b1b9d8bc33927c1d8115af files/cgdb-0.6.3-makefile-race.patch 2872 +SHA256 03a5c17916ee1b61fdfa1f460983790d45278ae388f173310c98855f70936a11 files/cgdb-0.6.3-makefile-race.patch 2872 AUX cgdb-fbsd.patch 257 RMD160 425ffdc77b77bdf408eafbb487eae3e122068a20 SHA1 236d7cbed8c3cb2aa7c96594669a2460cf7bb401 SHA256 30f84a261631ff4ca92df132d42c160cee45c9e78707a790312244e6e4ce28fd MD5 e7ef4d22b5d957ada1effb2b1c7bf7a3 files/cgdb-fbsd.patch 257 RMD160 425ffdc77b77bdf408eafbb487eae3e122068a20 files/cgdb-fbsd.patch 257 @@ -20,14 +21,14 @@ EBUILD cgdb-0.6.2.ebuild 1021 RMD160 d125a3a3afc204deddb8cdb013e923f75b9a73b9 SH MD5 f82771b58ca76ac53009ff483ca8c412 cgdb-0.6.2.ebuild 1021 RMD160 d125a3a3afc204deddb8cdb013e923f75b9a73b9 cgdb-0.6.2.ebuild 1021 SHA256 3baccde0fd613efaa0c36a4236936a352ac245634ae7c2ad2bf4b15bc9549aa2 cgdb-0.6.2.ebuild 1021 -EBUILD cgdb-0.6.3.ebuild 896 RMD160 55acb32f74d2b7bf94d826c798ad95ee8dbde2e2 SHA1 79e0e83741f66a925cfa6ac93469f9e09a02ff5c SHA256 250ad8f25f82235f7bfe6b1e4e72ebd14de8afa8b16455552ad6b2699b8d000e -MD5 617d2ea38e2154b6a78b7d426c83598d cgdb-0.6.3.ebuild 896 -RMD160 55acb32f74d2b7bf94d826c798ad95ee8dbde2e2 cgdb-0.6.3.ebuild 896 -SHA256 250ad8f25f82235f7bfe6b1e4e72ebd14de8afa8b16455552ad6b2699b8d000e cgdb-0.6.3.ebuild 896 -MISC ChangeLog 3607 RMD160 b7e559654a8cc9578b07740ce8bfcfb760c51851 SHA1 1dfaffae64db3105eaccf32891a7a10e60e50021 SHA256 f80c60eacdddd9452c8f2769704189c3d3803d844c99a320bde86e4c3fac638e -MD5 f52c82bb332e7c104a118849140aba0a ChangeLog 3607 -RMD160 b7e559654a8cc9578b07740ce8bfcfb760c51851 ChangeLog 3607 -SHA256 f80c60eacdddd9452c8f2769704189c3d3803d844c99a320bde86e4c3fac638e ChangeLog 3607 +EBUILD cgdb-0.6.3.ebuild 1047 RMD160 d5bce8a79aed44ea14d60fe0be0c5edabeade049 SHA1 9907c1c83fc662f8c287bac1668b103f9bfa4f7d SHA256 9ad72abe125b7550ffe934bb773305c09f006dfbd03bf2daa73ed22f5a048725 +MD5 27feabc7600e3b6f5734efae46023ec0 cgdb-0.6.3.ebuild 1047 +RMD160 d5bce8a79aed44ea14d60fe0be0c5edabeade049 cgdb-0.6.3.ebuild 1047 +SHA256 9ad72abe125b7550ffe934bb773305c09f006dfbd03bf2daa73ed22f5a048725 cgdb-0.6.3.ebuild 1047 +MISC ChangeLog 3807 RMD160 dcd569cc2e1b29a142343226a9ba6c15f8e5b745 SHA1 2047d2758a174bca1adffcc5935f217c24eb8037 SHA256 1716433052d1ade09118b58ba2d155282b5adad4165397b0739cf072b6849b3d +MD5 476d429783950137e5132972ffab8b03 ChangeLog 3807 +RMD160 dcd569cc2e1b29a142343226a9ba6c15f8e5b745 ChangeLog 3807 +SHA256 1716433052d1ade09118b58ba2d155282b5adad4165397b0739cf072b6849b3d ChangeLog 3807 MISC metadata.xml 163 RMD160 550da6b3a781aa96ffd5e99e373bde49cdc2ed30 SHA1 d44678d395f91799e0cff5b808e227a203520bd5 SHA256 4284d1b30ef24759f1c34ce51225d46b7312913508acf3469f8b66d72b176524 MD5 db54a1d7c3a3c58f3425179fd9e043e3 metadata.xml 163 RMD160 550da6b3a781aa96ffd5e99e373bde49cdc2ed30 metadata.xml 163 @@ -41,10 +42,3 @@ SHA256 e7144c49c0a6f47cc861331c95d9910da6f0b62975b657fb0065846463fa67e7 files/di MD5 b5408062b52ac9d83581be80fa5f6b01 files/digest-cgdb-0.6.3 232 RMD160 ff55389429d8edbb749d03500097414be09fb47a files/digest-cgdb-0.6.3 232 SHA256 1463d4dc0ccb7d1480a3f3be4180bc4e8698d49e40044aeb482f9070eb74a7cb files/digest-cgdb-0.6.3 232 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.3 (GNU/Linux) - -iD8DBQFF/fVqugEuf3OQ0akRAp3xAJ0dK1C3l2khwaG5JRgKzjgWShnXeQCdERKi -rFd23LBws4XzVPGw/9+xze0= -=otBa ------END PGP SIGNATURE----- diff --git a/dev-util/cgdb/cgdb-0.6.3.ebuild b/dev-util/cgdb/cgdb-0.6.3.ebuild index d8989a09d988..a92b4ee2b6df 100644 --- a/dev-util/cgdb/cgdb-0.6.3.ebuild +++ b/dev-util/cgdb/cgdb-0.6.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/cgdb/cgdb-0.6.3.ebuild,v 1.1 2007/03/16 04:56:43 nerdboy Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/cgdb/cgdb-0.6.3.ebuild,v 1.2 2007/03/21 03:00:47 nerdboy Exp $ inherit eutils autotools @@ -19,24 +19,29 @@ DEPEND=">=sys-libs/ncurses-5.3-r1 RDEPEND="${DEPEND} >=sys-devel/gdb-5.3" -WANT_AUTOCONF="1.9" -WANT_AUTOMAKE="1.9" +WANT_AUTOCONF="latest" +WANT_AUTOMAKE="latest" src_unpack() { unpack ${A} cd "${S}" epatch "${FILESDIR}/${PN}-fbsd.patch" + epatch "${FILESDIR}/${P}-makefile-race.patch" AT_M4DIR="${S}/config" eautomake } src_compile() { econf || die "econf failed" + + # not very parallel-friendly makefiles have been patched + # (see bug 171502) emake || die "emake failed" } src_install() { - einstall || die "make install failed" + emake DESTDIR=${D} install || die "make install failed" + dodoc AUTHORS ChangeLog NEWS README } diff --git a/dev-util/cgdb/files/cgdb-0.6.3-makefile-race.patch b/dev-util/cgdb/files/cgdb-0.6.3-makefile-race.patch new file mode 100644 index 000000000000..9a9d8c8bf0d0 --- /dev/null +++ b/dev-util/cgdb/files/cgdb-0.6.3-makefile-race.patch @@ -0,0 +1,68 @@ +Index: tgdb/tgdb-base/src/Makefile.am +=================================================================== +--- tgdb/tgdb-base/src/Makefile.am (revision 841) ++++ tgdb/tgdb-base/src/Makefile.am (working copy) +@@ -34,4 +34,4 @@ + $(top_builddir)/various/rline/src \ + $(top_builddir)/tgdb/annotate-two/src \ + $(top_builddir)/tgdb/gdbmi/src \ +-$(top_builddir)/tgdb/tgdb-base/src ++libtgdb.a +Index: various/adt/src/Makefile.am +=================================================================== +--- various/adt/src/Makefile.am (revision 841) ++++ various/adt/src/Makefile.am (working copy) +@@ -19,7 +19,7 @@ + ibuf_driver_LDFLAGS = -L. -L$(top_builddir)/various/util/src + ibuf_driver_LDADD = -ladt -lutil + ibuf_driver_SOURCES = ibuf_driver.c +-ibuf_driver_DEPENDENCIES = $(top_builddir)/various/adt/src \ ++ibuf_driver_DEPENDENCIES = libadt.a \ + $(top_builddir)/various/util/src + ibuf_driver_CFLAGS = $(AM_CFLAGS) + +@@ -27,7 +27,7 @@ + std_hash_driver_LDFLAGS = -L. -L$(top_builddir)/various/util/src + std_hash_driver_LDADD = -ladt -lutil + std_hash_driver_SOURCES = std_hash_driver.c +-std_hash_driver_DEPENDENCIES = $(top_builddir)/various/adt/src \ ++std_hash_driver_DEPENDENCIES = libadt.a \ + $(top_builddir)/various/util/src + std_hash_driver_CFLAGS = $(AM_CFLAGS) + +@@ -35,7 +35,7 @@ + std_list_driver_LDFLAGS = -L. -L$(top_builddir)/various/util/src + std_list_driver_LDADD = -ladt -lutil + std_list_driver_SOURCES = std_list_driver.c +-std_list_driver_DEPENDENCIES = $(top_builddir)/various/adt/src \ ++std_list_driver_DEPENDENCIES = libadt.a \ + $(top_builddir)/various/util/src + std_list_driver_CFLAGS = $(AM_CFLAGS) + +@@ -43,7 +43,7 @@ + std_btree_driver_LDFLAGS = -L. -L$(top_builddir)/various/util/src + std_btree_driver_LDADD = -ladt -lutil + std_btree_driver_SOURCES = std_btree_driver.c +-std_btree_driver_DEPENDENCIES = $(top_builddir)/various/adt/src \ ++std_btree_driver_DEPENDENCIES = libadt.a \ + $(top_builddir)/various/util/src + std_btree_driver_CFLAGS = $(AM_CFLAGS) + +@@ -51,6 +51,6 @@ + std_bbtree_driver_LDFLAGS = -L. -L$(top_builddir)/various/util/src + std_bbtree_driver_LDADD = -ladt -lutil + std_bbtree_driver_SOURCES = std_bbtree_driver.c +-std_bbtree_driver_DEPENDENCIES = $(top_builddir)/various/adt/src \ ++std_bbtree_driver_DEPENDENCIES = libadt.a \ + $(top_builddir)/various/util/src + std_bbtree_driver_CFLAGS = $(AM_CFLAGS) +Index: lib/gdbmi/src/Makefile.am +=================================================================== +--- lib/gdbmi/src/Makefile.am (revision 841) ++++ lib/gdbmi/src/Makefile.am (working copy) +@@ -18,4 +18,4 @@ + gdbmi_driver_LDFLAGS = -L. + gdbmi_driver_LDADD = -lgdbmi + gdbmi_driver_SOURCES = gdbmi_driver.c +-gdbmi_driver_DEPENDENCIES = $(top_builddir)/src ++gdbmi_driver_DEPENDENCIES = libgdbmi.a -- 2.26.2