From 03ca854695bdb9ed363b0b32593acbdd0f3d04cc Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Thu, 10 Jan 2019 15:28:05 +0100 Subject: [PATCH] sys-devel/gdb-apple: remove obviated versions Signed-off-by: Fabian Groffen Package-Manager: Portage-2.3.51, Repoman-2.3.11 --- sys-devel/gdb-apple/Manifest | 3 - .../files/gdb-apple-1461-darwin8.patch | 128 ------------------ .../files/gdb-apple-1461-dyld-info.patch | 22 --- .../files/gdb-apple-768-darwin-arch.patch | 15 -- .../files/gdb-apple-962-darwin64.patch | 17 --- .../files/gdb-apple-962-darwin8.patch | 15 -- .../files/gdb-apple-962-demangle.patch | 22 --- sys-devel/gdb-apple/gdb-apple-1461.ebuild | 68 ---------- sys-devel/gdb-apple/gdb-apple-768-r1.ebuild | 52 ------- sys-devel/gdb-apple/gdb-apple-966.ebuild | 66 --------- 10 files changed, 408 deletions(-) delete mode 100644 sys-devel/gdb-apple/files/gdb-apple-1461-darwin8.patch delete mode 100644 sys-devel/gdb-apple/files/gdb-apple-1461-dyld-info.patch delete mode 100644 sys-devel/gdb-apple/files/gdb-apple-768-darwin-arch.patch delete mode 100644 sys-devel/gdb-apple/files/gdb-apple-962-darwin64.patch delete mode 100644 sys-devel/gdb-apple/files/gdb-apple-962-darwin8.patch delete mode 100644 sys-devel/gdb-apple/files/gdb-apple-962-demangle.patch delete mode 100644 sys-devel/gdb-apple/gdb-apple-1461.ebuild delete mode 100644 sys-devel/gdb-apple/gdb-apple-768-r1.ebuild delete mode 100644 sys-devel/gdb-apple/gdb-apple-966.ebuild diff --git a/sys-devel/gdb-apple/Manifest b/sys-devel/gdb-apple/Manifest index eee15d636e1e3..d52e9873b523c 100644 --- a/sys-devel/gdb-apple/Manifest +++ b/sys-devel/gdb-apple/Manifest @@ -1,4 +1 @@ -DIST gdb-1461.2.tar.gz 17951571 BLAKE2B 53871df6574c73b37ce0a7ee353eca1fa81a6be4b6389ee41a9a140d091579df98f5fe44e0dfb9a14a0309cc3510c566a5af73af231a9070f55308434ea6373a SHA512 2d8b11ed575e26176a8f93eb7d2fbc052313114ffce10f0da6888ff9e7c30067d4db6d89c9443187bf7167823dfd631a7f56fe718160b5653791080df9b8163d DIST gdb-1752.tar.gz 17922994 BLAKE2B 9b27bca2b6a9f10e01d130d595270300a4e7f0040790c5b60337d41086e1238dc12d785cc88c484df630f742ddfe783f7baefc2132b47e41bb74a5d0b7ebbf1e SHA512 863a861a9a7708b8a763ea93599f6b519277f23fff35700d04e81a7747cc49421d0f051790deb92c440ced30ee15ba719b75066d5a614341e0f0b765d7a81094 -DIST gdb-768.tar.gz 17727326 BLAKE2B 9c233204d276c673f4f653888f947ecc73cb9e09c0cd9dd3879a0e47f2b50942a38513826c005cb3bd04019fbac5f7c01860f98304884ba8d3c81b63cffc89ac SHA512 40395d2e8ca30bb7aa0bbb0b270cbb9c18decc5a8fb37a764d43770e234b6281528d6feb301bcd97033c624c196851283fdbfc131f0336772a1e6e4b0168ae47 -DIST gdb-966.tar.gz 17769429 BLAKE2B c27a8fb6884eabf56855817fbcca2e0566df834d541bee1cf87954bdafd82d6eac673d46026ca8101ea5b2ac3ad1da14bcc9d9bf5a20fade099fdd7df54d6936 SHA512 daaf6f0329e311d46d82734df87fd501f70281edb511a8eb9123b6288a6a97f84725acc0f1c5e67dee3dc3e00cfa31bf7fc20594fbf3827a0ea35414f5ef7434 diff --git a/sys-devel/gdb-apple/files/gdb-apple-1461-darwin8.patch b/sys-devel/gdb-apple/files/gdb-apple-1461-darwin8.patch deleted file mode 100644 index c89c82a0d18c8..0000000000000 --- a/sys-devel/gdb-apple/files/gdb-apple-1461-darwin8.patch +++ /dev/null @@ -1,128 +0,0 @@ ---- a/gdb/macosx/macosx-nat-inferior.c -+++ b/gdb/macosx/macosx-nat-inferior.c -@@ -60,13 +60,17 @@ - #include - #include - #include -+#if defined(TARGET_ARM) - #include -+#endif - - #include - - #include -+#if 0 - #include - #include -+#endif - - #include "macosx-nat-dyld.h" - #include "macosx-nat-inferior.h" ---- a/gdb/macosx/macosx-nat-info.c -+++ b/gdb/macosx/macosx-nat-info.c -@@ -45,6 +45,22 @@ - #include "macosx-nat-inferior.h" - #include "macosx-nat-inferior-debug.h" - -+#ifdef __ppc__ -+#ifndef __darwin_ppc_thread_state -+#define __darwin_ppc_thread_state ppc_thread_state -+#define __r0 r0 -+#define __srr0 srr0 -+#define __srr1 srr1 -+#define __cr cr -+#define __xer xer -+#define __lr lr -+#define __ctr ctr -+#endif -+#ifndef __darwin_ppc_exception_state -+#define __darwin_ppc_exception_state ppc_exception_state -+#endif -+#endif -+ - extern macosx_inferior_status *macosx_status; - - #define CHECK_ARGS(what, args) \ ---- a/gdb/macosx/macosx-nat-infthread.c -+++ b/gdb/macosx/macosx-nat-infthread.c -@@ -36,8 +36,10 @@ - #include - #include - -+#if 0 - #include - #include -+#endif - - #include "macosx-nat-inferior.h" - #include "macosx-nat-inferior-util.h" ---- a/gdb/macosx/macosx-tdep.c -+++ b/gdb/macosx/macosx-tdep.c -@@ -63,7 +63,6 @@ - #include "gdbcore.h" - - #include --#include - #include - #include - #include ---- a/gdb/remote.c -+++ b/gdb/remote.c -@@ -62,7 +62,6 @@ - #include "macosx-nat-dyld.h" - #include "macosx-nat-dyld-process.h" - #endif --#include - - /* Prototypes for local functions. */ - static void cleanup_sigint_signal_handler (void *dummy); -@@ -474,11 +473,13 @@ - static void - remote_backtrace_self (const char *message) - { -+#if 0 - void *bt_buffer[100]; - int count = backtrace (bt_buffer, 100); - if (message && message[0]) - fprintf_filtered (gdb_stderr, "%s", message); - backtrace_symbols_fd (bt_buffer, count, STDERR_FILENO); -+#endif - } - - static void ---- a/gdb/symfile.c -+++ b/gdb/symfile.c -@@ -67,7 +67,6 @@ - #include - #include - #include --#include - - #include - ---- a/gdb/utils.c -+++ b/gdb/utils.c -@@ -27,7 +27,6 @@ - #include "gdb_string.h" - #include "event-top.h" - #include "exceptions.h" --#include - - #ifdef TUI - #include "tui/tui.h" /* For tui_get_command_dimension. */ -@@ -874,6 +873,7 @@ - target_terminal_ours (); - begin_line (); - -+#if 0 - /* APPLE LOCAL: Do a stack crawl of how we got here so we're more likely - to get useful bug reports. */ - { -@@ -882,6 +882,7 @@ - fprintf (stderr, "gdb stack crawl at point of internal error:\n"); - backtrace_symbols_fd (bt_buffer, count, STDERR_FILENO); - } -+#endif - - /* Create a string containing the full error/warning message. Need - to call query with this full string, as otherwize the reason diff --git a/sys-devel/gdb-apple/files/gdb-apple-1461-dyld-info.patch b/sys-devel/gdb-apple/files/gdb-apple-1461-dyld-info.patch deleted file mode 100644 index fb9ca9c741153..0000000000000 --- a/sys-devel/gdb-apple/files/gdb-apple-1461-dyld-info.patch +++ /dev/null @@ -1,22 +0,0 @@ -If dyld-info is not available, don't try to compile unreachable code -using it either. - ---- a/gdb/macosx/macosx-nat-dyld.c -+++ b/gdb/macosx/macosx-nat-dyld.c -@@ -731,7 +731,7 @@ - { - #if !defined (TASK_DYLD_INFO) || !defined (NM_NEXTSTEP) - return 0; --#endif -+#else - - if (target_is_remote () || value == NULL) - return 0; -@@ -791,6 +791,7 @@ - } - #endif /* NM_NEXTSTEP */ - return 0; -+#endif - } - - /* Searches the target address space for dyld itself, returning it in diff --git a/sys-devel/gdb-apple/files/gdb-apple-768-darwin-arch.patch b/sys-devel/gdb-apple/files/gdb-apple-768-darwin-arch.patch deleted file mode 100644 index 5442ba8ba6362..0000000000000 --- a/sys-devel/gdb-apple/files/gdb-apple-768-darwin-arch.patch +++ /dev/null @@ -1,15 +0,0 @@ -* configure checks for /usr/bin/arch to determine whether "arch" is ok - to use, so don't rely on the path at runtime, since GNU arch doesn't - understand -arch at all (and only returns the current arch name) - ---- src/gdb/fork-child.c -+++ src/gdb/fork-child.c -@@ -243,7 +243,7 @@ - arch_string = "x86_64"; - #endif - if (arch_string != NULL) -- sprintf (shell_command, "%s exec arch -arch %s ", shell_command, arch_string); -+ sprintf (shell_command, "%s exec /usr/bin/arch -arch %s ", shell_command, arch_string); - else - strcat (shell_command, "exec "); - } diff --git a/sys-devel/gdb-apple/files/gdb-apple-962-darwin64.patch b/sys-devel/gdb-apple/files/gdb-apple-962-darwin64.patch deleted file mode 100644 index 4417cee76e4de..0000000000000 --- a/sys-devel/gdb-apple/files/gdb-apple-962-darwin64.patch +++ /dev/null @@ -1,17 +0,0 @@ -* 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-darwin8.patch b/sys-devel/gdb-apple/files/gdb-apple-962-darwin8.patch deleted file mode 100644 index 05a088b93fb3c..0000000000000 --- a/sys-devel/gdb-apple/files/gdb-apple-962-darwin8.patch +++ /dev/null @@ -1,15 +0,0 @@ -* 10.4 doesn't have posix spawn, but fortunately it's only used on ARM - (iPhone), so we can still compile it - ---- src/gdb/macosx/macosx-nat-inferior.c -+++ src/gdb/macosx/macosx-nat-inferior.c -@@ -58,7 +58,9 @@ - #include - #include - #include -+#ifdef TARGET_ARM - #include -+#endif - - #include "macosx-nat-dyld.h" - #include "macosx-nat-inferior.h" diff --git a/sys-devel/gdb-apple/files/gdb-apple-962-demangle.patch b/sys-devel/gdb-apple/files/gdb-apple-962-demangle.patch deleted file mode 100644 index a302ce56ec911..0000000000000 --- a/sys-devel/gdb-apple/files/gdb-apple-962-demangle.patch +++ /dev/null @@ -1,22 +0,0 @@ -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-1461.ebuild b/sys-devel/gdb-apple/gdb-apple-1461.ebuild deleted file mode 100644 index 7127e61d24455..0000000000000 --- a/sys-devel/gdb-apple/gdb-apple-1461.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils flag-o-matic - -APPLE_PV=${PV}.2 -DESCRIPTION="Apple branch of the GNU Debugger, Developer Tools 3.2.2" -HOMEPAGE="https://sourceware.org/gdb/" -SRC_URI="http://www.opensource.apple.com/darwinsource/tarballs/other/gdb-${APPLE_PV}.tar.gz" - -LICENSE="APSL-2 GPL-2" -SLOT="0" - -KEYWORDS="~ppc-macos ~x64-macos ~x86-macos" - -IUSE="nls" - -RDEPEND=">=sys-libs/ncurses-5.2-r2 - =dev-db/sqlite-3*" -DEPEND="${RDEPEND} - nls? ( sys-devel/gettext )" - -S=${WORKDIR}/gdb-${APPLE_PV}/src - -PATCHES=( - "${FILESDIR}"/${PN}-no-global-gdbinit.patch - "${FILESDIR}"/${PN}-768-texinfo.patch - "${FILESDIR}"/${P}-dyld-info.patch -) - -src_prepare() { - default - [[ ${CHOST} == *-darwin8 ]] && eapply "${FILESDIR}"/${P}-darwin8.patch - - # for FSF gcc / gcc-apple:42 - sed -e 's/-Wno-long-double//' -i gdb/config/*/macosx.mh -} - -src_configure() { - replace-flags -O? -O2 - econf \ - --disable-werror \ - --disable-debug-symbols-framework \ - $(use_enable nls) \ - || die -} - -src_install() { - emake DESTDIR="${D}" libdir=/nukeme includedir=/nukeme install || die - rm -R "${D}"/nukeme || die - rm -Rf "${ED}"/usr/${CHOST} || die - mv "${ED}"/usr/bin/gdb "${ED}"/ - rm -f "${ED}"/usr/bin/* - mv "${ED}"/gdb "${ED}"/usr/bin/ -} - -pkg_postinst() { - if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -ge 9 ]] ; then - ewarn "Due to increased security measures in 10.5 and up, gdb is" - ewarn "not able to get a mach task port when installed by Prefix" - ewarn "Portage, unprivileged. To make gdb fully functional you'll" - ewarn "have to perform the following steps:" - ewarn " % sudo chgrp procmod ${EPREFIX}/usr/bin/gdb" - ewarn " % sudo chmod g+s ${EPREFIX}/usr/bin/gdb" - fi -} diff --git a/sys-devel/gdb-apple/gdb-apple-768-r1.ebuild b/sys-devel/gdb-apple/gdb-apple-768-r1.ebuild deleted file mode 100644 index e9f84fc168a62..0000000000000 --- a/sys-devel/gdb-apple/gdb-apple-768-r1.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils flag-o-matic - -DESCRIPTION="Apple branch of the GNU Debugger, 10.5" -HOMEPAGE="https://sourceware.org/gdb/" -SRC_URI="http://www.opensource.apple.com/darwinsource/tarballs/other/gdb-${PV}.tar.gz" - -LICENSE="APSL-2 GPL-2" -SLOT="0" - -KEYWORDS="~ppc-macos ~x86-macos" - -IUSE="nls" - -RDEPEND=">=sys-libs/ncurses-5.2-r2 - =dev-db/sqlite-3*" -DEPEND="${RDEPEND} - nls? ( sys-devel/gettext )" - -S=${WORKDIR}/gdb-${PV}/src - -PATCHES=( - "${FILESDIR}"/${P}-texinfo.patch - "${FILESDIR}"/${P}-darwin-arch.patch -) - -src_prepare() { - default - # for FSF gcc / gcc-apple:42 - sed -e 's/-Wno-long-double//' -i gdb/config/*/macosx.mh -} - -src_configure() { - replace-flags -O? -O2 - econf \ - --disable-werror \ - $(use_enable nls) \ - || die -} - -src_install() { - emake DESTDIR="${D}" libdir=/nukeme includedir=/nukeme install || die - rm -r "${D}"/nukeme || die - rm -Rf "${ED}"/usr/${CHOST} || die - mv "${ED}"/usr/bin/gdb "${ED}"/ - rm -f "${ED}"/usr/bin/* - mv "${ED}"/gdb "${ED}"/usr/bin/ -} diff --git a/sys-devel/gdb-apple/gdb-apple-966.ebuild b/sys-devel/gdb-apple/gdb-apple-966.ebuild deleted file mode 100644 index 7ffb29ce62ace..0000000000000 --- a/sys-devel/gdb-apple/gdb-apple-966.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils flag-o-matic - -DESCRIPTION="Apple branch of the GNU Debugger, Developer Tools 3.1.3" -HOMEPAGE="https://sourceware.org/gdb/" -SRC_URI="http://www.opensource.apple.com/darwinsource/tarballs/other/gdb-${PV}.tar.gz" - -LICENSE="APSL-2 GPL-2" -SLOT="0" - -KEYWORDS="~ppc-macos ~x64-macos ~x86-macos" - -IUSE="nls" - -RDEPEND=">=sys-libs/ncurses-5.2-r2 - =dev-db/sqlite-3*" -DEPEND="${RDEPEND} - nls? ( sys-devel/gettext )" - -S=${WORKDIR}/gdb-${PV}/src - -PATCHES=( - "${FILESDIR}"/${PN}-768-texinfo.patch - "${FILESDIR}"/${PN}-768-darwin-arch.patch - "${FILESDIR}"/${PN}-962-darwin8.patch - "${FILESDIR}"/${PN}-962-darwin64.patch - "${FILESDIR}"/${PN}-962-demangle.patch -) - -src_prepare() { - default - # for FSF gcc / gcc-apple:42 - sed -e 's/-Wno-long-double//' -i gdb/config/*/macosx.mh -} - -src_configure() { - replace-flags -O? -O2 - econf \ - --disable-werror \ - $(use_enable nls) \ - || die -} - -src_install() { - emake DESTDIR="${D}" libdir=/nukeme includedir=/nukeme install || die - rm -R "${D}"/nukeme || die - rm -Rf "${ED}"/usr/${CHOST} || die - mv "${ED}"/usr/bin/gdb "${ED}"/ - rm -f "${ED}"/usr/bin/* - mv "${ED}"/gdb "${ED}"/usr/bin/ -} - -pkg_postinst() { - if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -ge 9 ]] ; then - elog "Due to increased security measures in 10.5 and up, gdb is" - elog "not able to get a mach task port when installed by Prefix" - elog "Portage, unprivileged. To make gdb fully functional you'll" - elog "have to perform the following steps:" - elog " % sudo chgrp procmod ${EPREFIX}/usr/bin/gdb" - elog " % sudo chmod g+s ${EPREFIX}/usr/bin/gdb" - fi -}