From f70601e0934acd62f6c5d06c5ede4cc607179514 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 7 Jul 2018 11:42:03 +0100 Subject: gentoo resync : 07.07.2018 --- sys-devel/gdb/Manifest | 6 +- sys-devel/gdb/files/gdb-7.12.1-ia64-include.patch | 26 +++ sys-devel/gdb/gdb-7.12.1.ebuild | 1 + sys-devel/gdb/gdb-8.1-r2.ebuild | 256 ++++++++++++++++++++++ sys-devel/gdb/gdb-9999.ebuild | 23 +- 5 files changed, 304 insertions(+), 8 deletions(-) create mode 100644 sys-devel/gdb/files/gdb-7.12.1-ia64-include.patch create mode 100644 sys-devel/gdb/gdb-8.1-r2.ebuild (limited to 'sys-devel/gdb') diff --git a/sys-devel/gdb/Manifest b/sys-devel/gdb/Manifest index aedf1aa81ecf..c18588eb6a3a 100644 --- a/sys-devel/gdb/Manifest +++ b/sys-devel/gdb/Manifest @@ -1,3 +1,4 @@ +AUX gdb-7.12.1-ia64-include.patch 891 BLAKE2B ab8fd5cf7c394a302d3c6de36f1157623dce854c0b10c9d3925db0b09aeea7d3a6c788dbed3f3e4d338535b35c3913ce8ff57edaa3d5cb587612a9de96718ec7 SHA512 0891e407b9a97dc26d99cf91f01f1316076dc5c303ddfd49e535ccf442d70cfb1b3d0b078c28da7208009fc4674606be96467fbd9b3d6773d1fe12305d89bdb0 DIST gdb-7.10.1.tar.xz 18531436 BLAKE2B b50a1b6b5b867e4a52943fdc4992c654ceec180099771381df78de5ba79086e822264356a762c61b89e986407d6f0cce336be216276545591e637131dc02f4a8 SHA512 17a5138277a31685a5c2a841cb47ed9bc4626ea617b8ca77750513b300299f4fbbffe504958b5372de610dcb952c679cf8fa9c1bdadd380294fbf59b6e366010 DIST gdb-7.12.1.tar.xz 19225392 BLAKE2B 2e4b7fe69c3cb11c04b505d1e110bf0a9ca65b6178f3e6a6ccc11fde1e8750b595016baf64adb2c22903d346cec1dab15574681de812ac8d260aebf4152a3027 SHA512 0ac8d0a495103611ef41167a08313a010dce6ca4c6d827cbe8558a0c1a1a8a6bfa53f1b7704251289cababbfaaf9e075550cdf741a54d6cd9ca3433d910efcd8 DIST gdb-7.9.1.tar.xz 17867692 BLAKE2B f5de07a4ebf1a5112a1b40341b217d08f1eb6820eb2237a4be2cd289f832600b81b3c14f4632a762fdc13945a2fb65ffb58f13eb330f3d48892799e27bb62c87 SHA512 eebdf88b24e52e792b8a4b89ea85790de72b462a7810b44975fdf4232c068f353b15506071f450102a9d4bcecdde8e93dc3748a10699b7f73f3e04fb2d9d8414 @@ -7,12 +8,13 @@ DIST gdb-8.0.tar.xz 19588616 BLAKE2B 148965e33a42787b5fa39650c2b6c48e28895930e36 DIST gdb-8.1-patches-1.tar.xz 8768 BLAKE2B 792ceddcb8eafd028db23d69ad5d9eb00223722520c6ff0a23a24fee1a33dceb02f05e61a1d6c3700835c480b38d66f43f71ef3c4af406d4ae1147eaaf8f311e SHA512 87a5c9d9207817245e1ffd07fdad2cb566de4fc11725aa0e49e58268c3ab1ae3b4b9f4b9faa55acc8cb4c3c7cb5a3875ea7da02abeb8f775953a8aed2e2c6403 DIST gdb-8.1.tar.xz 20095080 BLAKE2B 9332058b8b723261ba215124f42a2d6ba916219efdfb3c23ae1f48fecf131c801bbd31b345f2c8339b23d74da690be0260ac31f8f2e79549b62f0880199bfdec SHA512 ffd82f415d7652d62dad1716c307836f594217a363429609beb7d70239e8bf06b73b393345b0e000796228e56681ed7656ac3c8be05e91d6d652ab0d5b1dc357 EBUILD gdb-7.10.1.ebuild 6607 BLAKE2B 363765a64800c4bbb3cb8dadf31acaa1f4ec596095c9b3e032a4173a94b96f641fed500ef0b48b463307e390bf66cc9c0a52f48d01bf329a2e6b16f008cf063f SHA512 37189f8b237e1896ef96371558d3f660798aaab49e873286b9be4ee4d317098addfbfc4bfdf1e5877ee324c69e2ac2ad842c016114e6b1ea1e12a7de3546459f -EBUILD gdb-7.12.1.ebuild 6619 BLAKE2B 852ee309b4a3938be4111b0e38e301c3cc9bcb328f55b58bcace495d2b3d1de36305fbfd77144c3dc32a06f75c70da0c4942b7ecbfb9d1304e42855c5bc02e59 SHA512 b1b0588da451a6ab00a62365f038e27ca2c1c9fc509b6fc46f96e8cdc12d6c8a5e5d254717e8af12e2b9818b06ed55b470872ad339d4ae1efc185bec9fb36d78 +EBUILD gdb-7.12.1.ebuild 6673 BLAKE2B a9c6740b6e69bcc468f0800a458133e80fd5475f6fadc9a9b2db541350f84eb8cd0f50a3c137f639262c192b1e7b9f108b566703c7f0fe5ba7921e8ddc78e9cb SHA512 feeb6b0451882379d75f968e83976052f715035ec0cf6109eaebba63895b74370a10f7afc2dc121c8f21eac2f262bf27c7f2ed8e0297aee22c5eb79d9937f679 EBUILD gdb-7.9.1.ebuild 5945 BLAKE2B 2f767de7261f2924808b0eeeed463fb46b6cf490ed54e51d6f49838b61d053f45410ac2dd50f71696afc71d98b89afa34158d25577ad63f07006aea0393e2edc SHA512 7154ae49de7d61bb75752ad1d8e71d0414fa8baef5fb876eead8e5df4b01b2c23555d990ef2915186ca2b098c1ebdacfd121a54aabbcf103a5478affb0b64b8c EBUILD gdb-8.0.1-r1.ebuild 7008 BLAKE2B ccb35ca9316b0df5e6940036c33de7bbf2f8dd86ebbe093128595f3f7b8619ea61d59481feb1e49e11a4260f3137d523989b977f01953cfc37204151e2e65704 SHA512 17253bdfb5c2e9976a1f8a6e88fa854d4fc8cbb8b73173f19283a1beec2bf3691b0dad2b4938b2e9d4755a3775945104120ce280fba5fd99b8db63d23adb140a EBUILD gdb-8.0.1.ebuild 7001 BLAKE2B 51ee8a28536516b731e510f295fa337d380bc70cbcbddbf6f0f6c03c96feb37f59f873d024823da267152f1a8b5f3e7bc1c9cb977e06b8e02335e66845df1f0b SHA512 ee436fa97e4d7921689115c3aef6d2380d87929b559e5654989727bd5a9c220258df6f9cf0974c02f9518458b3c791e285bbe995cd00d36044be748fc5b3c899 EBUILD gdb-8.0.ebuild 6817 BLAKE2B 71e593bb7f4f2b9b4d3b3b0eef223c6e0084b2f71ae38ce5035e0e72e3056538087481e8448730a06a35d4f3c307244ff1e68ebd480a3afbd48e030ad352b74a SHA512 1e7cbeb9b79cb2090698fbce6e212f87061db60c25efd9ddeee5db0997607bfb65be8bb22eff5f293adde9601304b9015ab6387fef4b590b618772f317b0edb2 EBUILD gdb-8.1-r1.ebuild 7127 BLAKE2B b0435fbd2729aaa714da716334bbce1f8336d391f539c9d70153ffe61f53d6475b81581712cc4c416a4c4fa1b0be66054c07a85c7c87584cfbdb7781e553b215 SHA512 31801015fdf97646c933b0172a585e5be607c5a2d9a047dd417bf1b5093f36741f22657585062dc8fcab7e83f8d87bc5851bdc5de3e0caaf570805c301b0945c +EBUILD gdb-8.1-r2.ebuild 7122 BLAKE2B 1153eb28162a2d14a4bc5b55e14f599f63426e6facb568ccd134d20a6787aa51bd87c43a02420245eb52578766802ed39fed6694662b099d863ce20d25479c3c SHA512 28da5ca5c834b0d13d1d56c2c7d157fcbad64b5dd85be7f469f2069aff258a80ae3803e7c0719bef4a31892f11944dad431a1eb5b4abe822b077dd55e80233e2 EBUILD gdb-8.1.ebuild 7101 BLAKE2B 8397bec2c3686234fcfd01e853dbd4cc81441bc088f0eba6ccb928c4a7ae387f57d0ca207d0ccb178f144bd95550d4636a9af927a827e6ddf90d6ce59f9c69f4 SHA512 92519800772fae8b3ca8a35c25c241f8b5df2843e3acf834cacd3cd7e9fd752712e2b2c8d9299e20462a98ce414151ef16766414bb0a2435dd45fdc560e25090 -EBUILD gdb-9999.ebuild 6832 BLAKE2B 466833fe625d919f1362ca5a4c38144f197b5a2ba7e3f3d5978748f00630f2c75e145ce0413a13e1aa857df2401a78f8272f3430b5e633f595c03f3ce588354f SHA512 a747abd3af4b7f8713cb3524e3890fce935a27989ca0c0311d46da3a2bc1933754808b391db39b733e2f61275394631b425e7009fd92aa194fc4266872fb1bec +EBUILD gdb-9999.ebuild 7093 BLAKE2B 1a908012e31ea0be096d8df0e564d835e0318d7c4747e157d2f25c32b2126181c437980b83ea48d228573d8349bf7f9c368e6c92c40d7c7ac1d183d6dfb17f50 SHA512 47d87dd4193e490fa95257bdc98bbb60ca3825024f46aee682b155717d3018fd555694c527ae5a42bcfcb9bf2891471e7eedd3b6d5358a4426ea5e58e68ab9b1 MISC metadata.xml 914 BLAKE2B 1260cb2638b32429345bd92c06c58074b3486ba3c516e25dab674b4589bf774f2f7192f7ed3ab9da4ed31e313038a389904bee6f9b77707d794530e3a244dfb4 SHA512 515a5bcd6c70fc87309cd4e3822d83e1b8fdf52e58cbf331df0c38b9096ad2410dfdad14aed100ea0a53457f57ecdf2b61b910b6a52765219815e1872872ee0c diff --git a/sys-devel/gdb/files/gdb-7.12.1-ia64-include.patch b/sys-devel/gdb/files/gdb-7.12.1-ia64-include.patch new file mode 100644 index 000000000000..3b910da4227f --- /dev/null +++ b/sys-devel/gdb/files/gdb-7.12.1-ia64-include.patch @@ -0,0 +1,26 @@ +fixes build failure on ia64 + +It's a backport of upstream fix by Émeric Maschino +https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commitdiff;h=5a6c3296a7a90694ad4042f6256f3da6d4fa4ee8 +https://bugs.gentoo.org/658014 +--- a/gdb/nat/linux-ptrace.c 2017-01-21 14:48:42.000000000 +0100 ++++ b/gdb/nat/linux-ptrace.c 2018-06-20 00:03:40.520317323 +0200 +@@ -21,8 +21,6 @@ + #include "linux-procfs.h" + #include "linux-waitpid.h" + #include "buffer.h" +-#include "gdb_wait.h" +-#include "gdb_ptrace.h" + #include + + /* Stores the ptrace options supported by the running kernel. +--- a/gdb/nat/linux-ptrace.h 2017-01-21 14:46:47.000000000 +0100 ++++ b/gdb/nat/linux-ptrace.h 2018-06-20 00:04:28.706220951 +0200 +@@ -21,6 +21,7 @@ + struct buffer; + + #include "nat/gdb_ptrace.h" ++#include "gdb_wait.h" + + #ifdef __UCLIBC__ + #if !(defined(__UCLIBC_HAS_MMU__) || defined(__ARCH_HAS_MMU__)) diff --git a/sys-devel/gdb/gdb-7.12.1.ebuild b/sys-devel/gdb/gdb-7.12.1.ebuild index a1863b60ff04..48dde882bdd8 100644 --- a/sys-devel/gdb/gdb-7.12.1.ebuild +++ b/sys-devel/gdb/gdb-7.12.1.ebuild @@ -92,6 +92,7 @@ pkg_setup() { src_prepare() { [[ -n ${RPM} ]] && rpm_spec_epatch "${WORKDIR}"/gdb.spec ! use vanilla && [[ -n ${PATCH_VER} ]] && EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch + epatch "${FILESDIR}"/${P}-ia64-include.patch #655270 epatch_user strip-linguas -u bfd/po opcodes/po } diff --git a/sys-devel/gdb/gdb-8.1-r2.ebuild b/sys-devel/gdb/gdb-8.1-r2.ebuild new file mode 100644 index 000000000000..5c86d7d6226e --- /dev/null +++ b/sys-devel/gdb/gdb-8.1-r2.ebuild @@ -0,0 +1,256 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) + +inherit epatch eutils flag-o-matic python-single-r1 + +export CTARGET=${CTARGET:-${CHOST}} +if [[ ${CTARGET} == ${CHOST} ]] ; then + if [[ ${CATEGORY} == cross-* ]] ; then + export CTARGET=${CATEGORY#cross-} + fi +fi +is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; } + +RPM= +MY_PV=${PV} +case ${PV} in +9999*) + # live git tree + EGIT_REPO_URI="git://sourceware.org/git/binutils-gdb.git" + inherit git-r3 + SRC_URI="" + ;; +*.*.50.2???????) + # weekly snapshots + SRC_URI="ftp://sourceware.org/pub/gdb/snapshots/current/gdb-weekly-${PV}.tar.xz" + ;; +*.*.*.*.*.*) + # fedora versions; note we swap the rpm & fedora core versions. + # gdb-6.8.50.20090302-8.fc11.src.rpm -> gdb-6.8.50.20090302.11.8.ebuild + # gdb-7.9-11.fc23.src.rpm -> gdb-7.9.23.11.ebuild + inherit versionator rpm + gvcr() { get_version_component_range "$@"; } + parse_fedora_ver() { + set -- $(get_version_components) + MY_PV=$(gvcr 1-$(( $# - 2 ))) + RPM="${PN}-${MY_PV}-$(gvcr $#).fc$(gvcr $(( $# - 1 ))).src.rpm" + } + parse_fedora_ver + SRC_URI="mirror://fedora-dev/development/rawhide/source/SRPMS/g/${RPM}" + ;; +*) + # Normal upstream release + SRC_URI="mirror://gnu/gdb/${P}.tar.xz + ftp://sourceware.org/pub/gdb/releases/${P}.tar.xz" + ;; +esac + +PATCH_VER="1" +PATCH_DEV="slyfox" +DESCRIPTION="GNU debugger" +HOMEPAGE="https://sourceware.org/gdb/" +SRC_URI="${SRC_URI} + ${PATCH_DEV:+https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${PN}-8.1-patches-${PATCH_VER}.tar.xz} + ${PATCH_VER:+mirror://gentoo/${PN}-8.1-patches-${PATCH_VER}.tar.xz} +" + +LICENSE="GPL-2 LGPL-2" +SLOT="0" +if [[ ${PV} != 9999* ]] ; then + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +fi +IUSE="+client lzma multitarget nls +python +server test vanilla xml" +REQUIRED_USE=" + python? ( ${PYTHON_REQUIRED_USE} ) + || ( client server ) +" + +RDEPEND=" + server? ( !dev-util/gdbserver ) + client? ( + dev-libs/mpfr:0= + >=sys-libs/ncurses-5.2-r2:0= + sys-libs/readline:0= + lzma? ( app-arch/xz-utils ) + python? ( ${PYTHON_DEPS} ) + xml? ( dev-libs/expat ) + sys-libs/zlib + )" +DEPEND="${RDEPEND} + app-arch/xz-utils + sys-apps/texinfo + client? ( + virtual/yacc + test? ( dev-util/dejagnu ) + nls? ( sys-devel/gettext ) + )" + +S=${WORKDIR}/${PN}-${MY_PV} + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_prepare() { + [[ -n ${RPM} ]] && rpm_spec_epatch "${WORKDIR}"/gdb.spec + ! use vanilla && [[ -n ${PATCH_VER} ]] && EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch + + default + + strip-linguas -u bfd/po opcodes/po +} + +gdb_branding() { + printf "Gentoo ${PV} " + if ! use vanilla && [[ -n ${PATCH_VER} ]] ; then + printf "p${PATCH_VER}" + else + printf "vanilla" + fi + [[ -n ${EGIT_COMMIT} ]] && printf " ${EGIT_COMMIT}" +} + +src_configure() { + strip-unsupported-flags + + local myconf=( + --with-pkgversion="$(gdb_branding)" + --with-bugurl='https://bugs.gentoo.org/' + --disable-werror + # Disable modules that are in a combined binutils/gdb tree. #490566 + --disable-{binutils,etc,gas,gold,gprof,ld} + ) + local sysroot="${EPREFIX}/usr/${CTARGET}" + is_cross && myconf+=( + --with-sysroot="${sysroot}" + --includedir="${sysroot}/usr/include" + --with-gdb-datadir="\${datadir}/gdb/${CTARGET}" + ) + + if use server && ! use client ; then + # just configure+build in the gdbserver subdir to speed things up + cd gdb/gdbserver + myconf+=( --program-transform-name='' ) + else + # gdbserver only works for native targets (CHOST==CTARGET). + # it also doesn't support all targets, so rather than duplicate + # the target list (which changes between versions), use the + # "auto" value when things are turned on. + is_cross \ + && myconf+=( --disable-gdbserver ) \ + || myconf+=( $(use_enable server gdbserver auto) ) + fi + + if ! ( use server && ! use client ) ; then + # if we are configuring in the top level, then use all + # the additional global options + myconf+=( + --enable-64-bit-bfd + --disable-install-libbfd + --disable-install-libiberty + # Disable guile for now as it requires guile-2.x #562902 + --without-guile + # This only disables building in the readline subdir. + # For gdb itself, it'll use the system version. + --disable-readline + --with-system-readline + # This only disables building in the zlib subdir. + # For gdb itself, it'll use the system version. + --without-zlib + --with-system-zlib + --with-separate-debug-dir="${EPREFIX}"/usr/lib/debug + $(use_with xml expat) + $(use_with lzma) + $(use_enable nls) + $(use multitarget && echo --enable-targets=all) + $(use_with python python "${EPYTHON}") + ) + fi + if use sparc-solaris || use x86-solaris ; then + # disable largefile support + # https://sourceware.org/ml/gdb-patches/2014-12/msg00058.html + myconf+=( --disable-largefile ) + fi + + econf "${myconf[@]}" +} + +src_test() { + nonfatal emake check || ewarn "tests failed" +} + +src_install() { + if use server && ! use client; then + cd gdb/gdbserver || die + fi + default + if use client; then + find "${ED}"/usr -name libiberty.a -delete || die + fi + cd "${S}" || die + + # Delete translations that conflict with binutils-libs. #528088 + # Note: Should figure out how to store these in an internal gdb dir. + if use nls ; then + find "${ED}" \ + -regextype posix-extended -regex '.*/(bfd|opcodes)[.]g?mo$' \ + -delete || die + fi + + # Don't install docs when building a cross-gdb + if [[ ${CTARGET} != ${CHOST} ]] ; then + rm -rf "${ED}"/usr/share/{doc,info,locale} || die + local f + for f in "${ED}"/usr/share/man/*/* ; do + if [[ ${f##*/} != ${CTARGET}-* ]] ; then + mv "${f}" "${f%/*}/${CTARGET}-${f##*/}" || die + fi + done + return 0 + fi + # Install it by hand for now: + # https://sourceware.org/ml/gdb-patches/2011-12/msg00915.html + # Only install if it exists due to the twisted behavior (see + # notes in src_configure above). + [[ -e gdb/gdbserver/gdbreplay ]] && dobin gdb/gdbserver/gdbreplay + + if use client ; then + docinto gdb + dodoc gdb/CONTRIBUTE gdb/README gdb/MAINTAINERS \ + gdb/NEWS gdb/ChangeLog gdb/PROBLEMS + fi + docinto sim + dodoc sim/{ChangeLog,MAINTAINERS,README-HACKING} + if use server ; then + docinto gdbserver + dodoc gdb/gdbserver/{ChangeLog,README} + fi + + if [[ -n ${PATCH_VER} ]] ; then + dodoc "${WORKDIR}"/extra/gdbinit.sample + fi + + # Remove shared info pages + rm -f "${ED}"/usr/share/info/{annotate,bfd,configure,standards}.info* + + # gcore is part of ubin on freebsd + if [[ ${CHOST} == *-freebsd* ]]; then + rm "${ED}"/usr/bin/gcore || die + fi +} + +pkg_postinst() { + # portage sucks and doesnt unmerge files in /etc + rm -vf "${EROOT}"/etc/skel/.gdbinit + + if use prefix && [[ ${CHOST} == *-darwin* ]] ; then + ewarn "gdb is unable 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/gdb-9999.ebuild b/sys-devel/gdb/gdb-9999.ebuild index 690244835479..6795087ec188 100644 --- a/sys-devel/gdb/gdb-9999.ebuild +++ b/sys-devel/gdb/gdb-9999.ebuild @@ -68,8 +68,10 @@ REQUIRED_USE=" || ( client server ) " -RDEPEND="server? ( !dev-util/gdbserver ) +RDEPEND=" + server? ( !dev-util/gdbserver ) client? ( + dev-libs/mpfr:0= >=sys-libs/ncurses-5.2-r2:0= sys-libs/readline:0= lzma? ( app-arch/xz-utils ) @@ -167,6 +169,11 @@ src_configure() { $(use_with python python "${EPYTHON}") ) fi + if use sparc-solaris || use x86-solaris ; then + # disable largefile support + # https://sourceware.org/ml/gdb-patches/2014-12/msg00058.html + myconf+=( --disable-largefile ) + fi econf "${myconf[@]}" } @@ -176,22 +183,26 @@ src_test() { } src_install() { - use server && ! use client && cd gdb/gdbserver + if use server && ! use client; then + cd gdb/gdbserver || die + fi default - use client && find "${ED}"/usr -name libiberty.a -delete - cd "${S}" + if use client; then + find "${ED}"/usr -name libiberty.a -delete || die + fi + cd "${S}" || die # Delete translations that conflict with binutils-libs. #528088 # Note: Should figure out how to store these in an internal gdb dir. if use nls ; then find "${ED}" \ -regextype posix-extended -regex '.*/(bfd|opcodes)[.]g?mo$' \ - -delete + -delete || die fi # Don't install docs when building a cross-gdb if [[ ${CTARGET} != ${CHOST} ]] ; then - rm -r "${ED}"/usr/share/{doc,info,locale} + rm -rf "${ED}"/usr/share/{doc,info,locale} || die local f for f in "${ED}"/usr/share/man/*/* ; do if [[ ${f##*/} != ${CTARGET}-* ]] ; then -- cgit v1.2.3