Add compile fix for x64-macos

Package-Manager: portage-2.2.00.13683-prefix/cvs/SunOS i386

5 files changed, 53 insertions, 5 deletions

diff --git a/sys-devel/gdb-apple/ChangeLog b/sys-devel/gdb-apple/ChangeLog
index 3b0b7a08adef..6195024c0b33 100644
--- a/sys-devel/gdb-apple/ChangeLog
+++ b/sys-devel/gdb-apple/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-devel/gdb-apple
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb-apple/ChangeLog,v 1.1 2009/06/21 10:38:25 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb-apple/ChangeLog,v 1.2 2009/06/24 09:40:20 grobian Exp $
+
+  24 Jun 2009; Fabian Groffen <grobian@gentoo.org>
+  +files/gdb-apple-962-darwin64.patch, +files/gdb-apple-962-demangle.patch,
+  gdb-apple-966.ebuild:
+  Add compile fix for x64-macos
 
 *gdb-apple-966 (20 Jun 2009)
 
diff --git a/sys-devel/gdb-apple/Manifest b/sys-devel/gdb-apple/Manifest
index b3d116ec16e3..a3f693399fc1 100644
--- a/sys-devel/gdb-apple/Manifest
+++ b/sys-devel/gdb-apple/Manifest
@@ -2,7 +2,9 @@ AUX gdb-apple-563-darwin7.patch 3329 RMD160 e6192a08fdd01bdf34f12455a66e7195e2ba
 AUX gdb-apple-563-no-64bit.patch 767 RMD160 629ef816ec94f95879c161daef4a1a5148e19cb4 SHA1 5a4a886f55498064ca47f4456cdc6f53b8832eaa SHA256 3eb672bb4bc08d74f01bd33008140177b9906fc06969852d013ee9440a8d6c97
 AUX gdb-apple-768-darwin-arch.patch 571 RMD160 c5c0420a96e9ca186e098b44a7d7de34b0571d96 SHA1 143cfddfb451141d6530737b5dd2d4a6042f385d SHA256 afd10f60857900824fb36d3109e2c4fa0c87ca95fab1c4411cd8316d3d566ab6
 AUX gdb-apple-768-texinfo.patch 487 RMD160 8fc4c9da8b4d984ad11dcd496e2c2a0f17382971 SHA1 de8dcded653c28768b2de106403e65c552392c22 SHA256 55d33c8603278687ec92f4b0bdbc7cb8e0b62b2348f1b44ce247d95c7ae14b2d
+AUX gdb-apple-962-darwin64.patch 580 RMD160 61024ddbe6a70a70ec4082578e3991bc25112473 SHA1 7f6a65a156e34cb39222bb2b6f719444e7c99262 SHA256 016259650cd60b24b4bc39b890f7adec7a0a7c2f028dcc8fae8114d0f36a8676
 AUX gdb-apple-962-darwin8.patch 402 RMD160 240ee95585a819ec0b10147a55a3a053713db77a SHA1 14976942fcbac5a1c326a26da3768d77442e83aa SHA256 885453cb8ea7e39bc5da479ce046e96e113eb150af220b7d61d8f50ebf29d2d6
+AUX gdb-apple-962-demangle.patch 708 RMD160 265da82c589bc321c7d38680db05b1af174d2277 SHA1 d9f614d7282d3c8cd9b019e76506be2c75c2d0f1 SHA256 35d10612776db1cae9aca99ba72973ab1c6629dd6a9f1d16f1ec8322684c26ab
 DIST gdb-563.tar.gz 17130626 RMD160 cbefa5b829e4e70685cf77c9a0e2171f243cc463 SHA1 913f19713a1bc5de4f96ee2920314e7caad31ac5 SHA256 a41177e2edbac8982e01ca01dbd52bef65bd1604fb3a65278dd0f44509bb7179
 DIST gdb-768.tar.gz 17727326 RMD160 b61164d22e9e9b4f9f0ee2bb20129e8e06531b04 SHA1 adeffd19caf9270a9a297633f716e6485ebc8536 SHA256 2342cbbf7c57dcc08011736c9823d5ca374156666ba73c4b67d9984ed944f24d
 DIST gdb-960.tar.gz 17875803 RMD160 d14638dfda8578110d9525723344665f816d73b1 SHA1 ec4afa508ae451b07c9e1307a2b8eb6212102c46 SHA256 921cb5317b934008bd5f7669cca811a0377c40b779277e9326198f4919f22d97
@@ -12,6 +14,6 @@ EBUILD gdb-apple-563.ebuild 1293 RMD160 b1cf11a36467a15f4a2e678b4305ab4ae6e2f31a
 EBUILD gdb-apple-768-r1.ebuild 1248 RMD160 0f09bb596e016555859a09c7091c33fd86cd2d47 SHA1 4bca6a981d813bff36a3f418a6a43ae35117a7bb SHA256 d76b6e6ea60974ff2b3dd042d3b57a63eb0698bcfef7bd09dc8c7cdc14b17394
 EBUILD gdb-apple-960.ebuild 1264 RMD160 2e5877f8a82d494f81ecf46c64fb5fe281d401e7 SHA1 2be3cdaeca9dd20b414f69629448d1470a7339c1 SHA256 10940ebacb156c4605f6eef99bf9541188844e6e9ba9b43f7944b150901f8879
 EBUILD gdb-apple-962.ebuild 1765 RMD160 32fb507d0cea5862861e90f2e8d15b8a45756456 SHA1 e252ef4574028def6e7c961b919375582af2a45a SHA256 ceea12219b307fee6a2445907f33ccc8588297b4691eca9119f8fda14c35d8a8
-EBUILD gdb-apple-966.ebuild 1769 RMD160 383172bd622022127a49ade120b9a0a864276fc2 SHA1 797110cd79f19f5dfd353b76224d17f9bcbda19b SHA256 603b3b6a22124b584db9fb628dc3a914501d7cc47591c55f4e72120216eb428c
-MISC ChangeLog 2308 RMD160 e163123da7b117d81b119917db9650f79b8c6304 SHA1 6cd50ac8a9c6d6b463e790e12b066e73c4792d13 SHA256 0e311b15c2d1366ba898632da10506d20755081a272d0a54fb459f9a35fa6bc4
+EBUILD gdb-apple-966.ebuild 1874 RMD160 b69ea9fea80227c109febf44903ba59b26499e65 SHA1 c0553e94c19caff2ced1b9700e92561037955825 SHA256 9ef36a6af183525b60c2d9e1b9ad37393065adced3b26eac3431c0d5671ff265
+MISC ChangeLog 2492 RMD160 d52ee448fab35db06a49402377207d0a900e6fba SHA1 12c9bfe1bde2f42a28fb39e82874eee0b62bd9a7 SHA256 6b3edc4c0cf97d8a06e56df48e9118af602af401013890581d34f50422cc4776
 MISC metadata.xml 158 RMD160 61ad495b84df949a636009d30b8c3af6d267e469 SHA1 cacd49ab85e7648a81e5dd4791ef9598090ee63d SHA256 6a21555efc71392966785841abafc9b2984d97d75ad574d654db6adc8674b1bd
diff --git a/sys-devel/gdb-apple/files/gdb-apple-962-darwin64.patch b/sys-devel/gdb-apple/files/gdb-apple-962-darwin64.patch
new file mode 100644
index 000000000000..4417cee76e4d
--- /dev/null
+++ b/sys-devel/gdb-apple/files/gdb-apple-962-darwin64.patch
@@ -0,0 +1,17 @@
+* todo: extend for powerpc64 also
+
+--- src/bfd/config.bfd.orig	2009-06-23 11:05:43 +0200
++++ src/bfd/config.bfd	2009-06-23 11:05:47 +0200
+@@ -500,6 +500,12 @@
+     targ_archs="bfd_i386_arch bfd_powerpc_arch bfd_rs6000_arch"
+     targ_underscore=yes
+     ;;
++  x86_64-*-darwin*)
++    targ_defvec=mach_o_le_vec
++    targ_selvecs="mach_o_le_vec mach_o_be_vec mach_o_fat_vec pef_vec pef_xlib_vec sym_vec"
++    targ_archs="bfd_i386_arch bfd_powerpc_arch bfd_rs6000_arch"
++    targ_underscore=yes
++    ;;
+  i[3-7]86-sequent-bsd*)
+     targ_defvec=i386dynix_vec
+     targ_underscore=yes
diff --git a/sys-devel/gdb-apple/files/gdb-apple-962-demangle.patch b/sys-devel/gdb-apple/files/gdb-apple-962-demangle.patch
new file mode 100644
index 000000000000..a302ce56ec91
--- /dev/null
+++ b/sys-devel/gdb-apple/files/gdb-apple-962-demangle.patch
@@ -0,0 +1,22 @@
+in 32-bits mode this goes /just/ right, in 64-bits mode Portage aborts
+because objc_demangle is implicitly turned into a pointer
+
+--- src/gdb/maint.c.orig	2009-06-23 11:12:15 +0200
++++ src/gdb/maint.c	2009-06-23 11:19:58 +0200
+@@ -31,6 +31,7 @@
+ #include "symtab.h"
+ #include "gdbtypes.h"
+ #include "demangle.h"
++#include "objc-lang.h"
+ #include "gdbcore.h"
+ #include "expression.h"		/* For language.h */
+ #include "language.h"
+@@ -167,7 +168,7 @@
+       switch (current_language->la_language)
+         {
+         case language_objc:
+-          demangled = objc_demangle (args);
++          demangled = objc_demangle (args, 0);
+           break;
+         case language_objcplus:
+         case language_cplus:
diff --git a/sys-devel/gdb-apple/gdb-apple-966.ebuild b/sys-devel/gdb-apple/gdb-apple-966.ebuild
index 806549b850db..df38945f1705 100644
--- a/sys-devel/gdb-apple/gdb-apple-966.ebuild
+++ b/sys-devel/gdb-apple/gdb-apple-966.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb-apple/gdb-apple-966.ebuild,v 1.1 2009/06/21 10:38:25 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb-apple/gdb-apple-966.ebuild,v 1.2 2009/06/24 09:40:20 grobian Exp $
 
 inherit eutils flag-o-matic
 
@@ -11,7 +11,7 @@ SRC_URI="http://www.opensource.apple.com/darwinsource/tarballs/other/gdb-${PV}.t
 LICENSE="APSL-2 GPL-2"
 SLOT="0"
 
-KEYWORDS="~ppc-macos ~x86-macos"
+KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
 
 IUSE="nls"
 
@@ -29,6 +29,8 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PN}-768-texinfo.patch
 	epatch "${FILESDIR}"/${PN}-768-darwin-arch.patch
 	epatch "${FILESDIR}"/${PN}-962-darwin8.patch
+	epatch "${FILESDIR}"/${PN}-962-darwin64.patch
+	epatch "${FILESDIR}"/${PN}-962-demangle.patch
 
 	# for FSF gcc / gcc-apple:42
 	sed -e 's/-Wno-long-double//' -i gdb/config/*/macosx.mh