From 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 28 Apr 2021 20:21:43 +0100 Subject: gentoo resync : 28.04.2021 --- sys-devel/gdb/Manifest | 7 +- sys-devel/gdb/files/gdb-10.2-sparc-nat.patch | 47 +++++ sys-devel/gdb/gdb-10.1.ebuild | 3 +- sys-devel/gdb/gdb-10.2.ebuild | 260 +++++++++++++++++++++++++++ sys-devel/gdb/gdb-9999.ebuild | 1 + 5 files changed, 315 insertions(+), 3 deletions(-) create mode 100644 sys-devel/gdb/files/gdb-10.2-sparc-nat.patch create mode 100644 sys-devel/gdb/gdb-10.2.ebuild (limited to 'sys-devel/gdb') diff --git a/sys-devel/gdb/Manifest b/sys-devel/gdb/Manifest index 744d0ea08c3c..a95bc5fb28fd 100644 --- a/sys-devel/gdb/Manifest +++ b/sys-devel/gdb/Manifest @@ -1,6 +1,9 @@ AUX gdb-10.1-cet.patch 2675 BLAKE2B b720e43514b25897a332648bfb15e16278f76606413991ce75c0233af27bbc434c36e85d36d4207339211382c0c5de5e9892f9e533e9d24b5257864939ac4874 SHA512 4fd4787c7ff2f7c2fed338ccc0f478b120d566959c0de5dde03cdcfdb37911bc22c5c11a124a000d84138a23c30ee3fa65c024eb72d1c924f926b04e079412a5 +AUX gdb-10.2-sparc-nat.patch 1683 BLAKE2B b5ef1ce44dd935ca8a69a6477cfea703109300e5c50b108b834ebcaaa3d4144b81ec10bd586db207cec2eab3355c2886c0af442a4046f378a08300cbd7d1783e SHA512 dc72e7e1d789dac8befd77ad07bdbcfa6ad96e82095cd807f12dcbc7f0521e4bbb6812841ec7bd311d2efe2f4aa9f249e4d114315ae88a04216f698448bb35b0 AUX gdb-8.3.1-verbose-build.patch 395 BLAKE2B e2e82307ceae64d16aa9b57a5e639eb5d217c4d977aed0847fdf125bb13ebc004906d9afb8e3f629c41efccca88df0040015e7799c1fd24de5fb50f62f5bbd90 SHA512 c2bb013e4fcabefddcd8042bd3cbb53471f83182cc8769fe0d19eed80ccc4a83bd84d120006fa25b3b7d0310dc2f2ec6b44a6ff74909cd312b7e491f371777a3 DIST gdb-10.1.tar.xz 21507112 BLAKE2B 69d79cd667ecb6e936b41a03817ade5dd9b761f97bc123d668b5f968d123c37d048fc8ec1289151e989f01bb01a43cc3d8b5b54f1807f1e3eb5f43e6bf0aa55b SHA512 0dc54380435c6853db60f1e388b94836d294dfa9ad7f518385a27db4edd03cb970f8717d5f1e9c9a0d4a33d7fcf91bc2e5d6c9cf9e4b561dcc74e65b806c1537 -EBUILD gdb-10.1.ebuild 6974 BLAKE2B 73181bdc518ba69e5cde63072543905e64fc8151e107c4ebd4019db197f6aa568392743038fed8302377a4f7ea02519adf2aff2118536fb97cf0c46bb8329e74 SHA512 dea0c5d916fc413e976f1206419a8c8db3b04ac148da83b27877ac7fcdf801442c92ab5fd2b5e5bd819ebdb827b9679cfe121c25b6dcb79cdfc854f3a171b353 -EBUILD gdb-9999.ebuild 6946 BLAKE2B fd0befee5a30362660cacd8ad6e720a696117e6227d188faf783fe917fc69cdedaeb1dab1afd8bf89648b382b5fac875d112a2504624a24b92021d73cd812eb0 SHA512 e8196cb19cb137b92995165b5f0755c0071ac0bfeaca2be48bc718c806bb9f27796620943c4ecef1352601d42db072386e025da9f67daf194a85bf30a30a14c4 +DIST gdb-10.2.tar.xz 21518900 BLAKE2B c5d31d80d2b454767d6f844e8471b012ad437c3872391b618fd7b14c5cf251b78e55d28c12e81382fd600f67e2f618ff5dbe3a7b737a5d5161ceb3542afbb90b SHA512 3653762ac008e065c37cd641653184c9ff7ce51ee2222ade1122bec9d6cc64dffd4fb74888ef11ac1942064a08910e96b7865112ad37f4602eb0a16bed074caa +EBUILD gdb-10.1.ebuild 7016 BLAKE2B ce20b2ac369f8e1f9dab1fd9a4e4d52dc3deaa148e651fd22288f2607dc51ce04876a76d2ecbe044efe960a0abec79cd8e9079bd76b00fb6dc7b3964c125c620 SHA512 4b007e74547418f9bd1cbde8b85af49637191ee0a0a5f915deb69740034d52cb9bd1f6c0af3c1045c7769b7bfddff8c4533226041a22b649f98ec4f4479edf3a +EBUILD gdb-10.2.ebuild 7065 BLAKE2B 68fb85dab77ec1cde3401b665aab0a0a209dc2e2b77e7eb287ce9ef990b5fe831252e137f65f7afcaefbf4a0c1ae11c79bf3fda52a79456e5d3947ff1e6de5e6 SHA512 bc940b0bc6fb73b87d4f286bbf27b33a35a6ae76dbdd2edef5ffcf663280008a3ec3242f16ff167684199467aaef295b69d3c023430face3f7af5385b3bd8cc1 +EBUILD gdb-9999.ebuild 6987 BLAKE2B a16dff2e2f2911846f8a1e43adbb00d8b5e75bba34d442a9151e3abd6993c09b1ec0cea8ce0f82c1d9bfa35ce4f5bd6ea23a6e505ee834b28e925193d0629f32 SHA512 5e3db5b1be217f3a619c85c00a481f7d5dae43d09b515521310f24215da02a30daf332065371c5e0e2062374e02bd31782767c52bd585af5131d941b5048f801 MISC metadata.xml 1102 BLAKE2B 76a586ca542d54f382f13416d53729e9a26f05d8ee2e592cf0b0aa1851d0a9546b20d2058107ca250986682c5f4f86c38939f4cd627f36d9223be3589337caad SHA512 047a745a15e2fd6ecbf22d52e3771e0982a10ed2eb41513e30946574e5b6e813088a31bb3c32832181f19fbd4f5061575389723f66b1821e75839a863e422c0e diff --git a/sys-devel/gdb/files/gdb-10.2-sparc-nat.patch b/sys-devel/gdb/files/gdb-10.2-sparc-nat.patch new file mode 100644 index 000000000000..5e71efa0d33a --- /dev/null +++ b/sys-devel/gdb/files/gdb-10.2-sparc-nat.patch @@ -0,0 +1,47 @@ +From 288e3189fce8f466ca60411c27e8f1c0dac5d582 Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich +Date: Sun, 25 Apr 2021 20:50:38 +0100 +Subject: [PATCH] gdb: fix sparc build failure of linux-nat + +On sparc build failed as: + +``` +gdb/sparc-linux-nat.c: In member function + 'virtual void sparc_linux_nat_target::fetch_registers(regcache*, int)': +gdb/sparc-linux-nat.c:36:37: + error: cannot convert 'regcache*' to 'process_stratum_target*' + 36 | { sparc_fetch_inferior_registers (regcache, regnum); } + | ^~~~~~~~ + | | + | regcache* +``` + +The fix adopts gdb/sparc-nat.h API change in d1e93af64a6 +("gdb: set current thread in sparc_{fetch,collect}_inferior_registers"). + +gdb/ChangeLog: + + * sparc-linux-nat.c (sparc_linux_nat_target): fix sparc build + by passing `process_stratum_target*` parameter. +--- + gdb/sparc-linux-nat.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/gdb/sparc-linux-nat.c ++++ b/gdb/sparc-linux-nat.c +@@ -33,10 +33,10 @@ class sparc_linux_nat_target final : public linux_nat_target + public: + /* Add our register access methods. */ + void fetch_registers (struct regcache *regcache, int regnum) override +- { sparc_fetch_inferior_registers (regcache, regnum); } ++ { sparc_fetch_inferior_registers (this, regcache, regnum); } + + void store_registers (struct regcache *regcache, int regnum) override +- { sparc_store_inferior_registers (regcache, regnum); } ++ { sparc_store_inferior_registers (this, regcache, regnum); } + }; + + static sparc_linux_nat_target the_sparc_linux_nat_target; +-- +2.31.1 + diff --git a/sys-devel/gdb/gdb-10.1.ebuild b/sys-devel/gdb/gdb-10.1.ebuild index f3521cbb0702..b60fdb81a1e3 100644 --- a/sys-devel/gdb/gdb-10.1.ebuild +++ b/sys-devel/gdb/gdb-10.1.ebuild @@ -44,7 +44,7 @@ SRC_URI="${SRC_URI} LICENSE="GPL-2 LGPL-2" SLOT="0" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi IUSE="cet lzma multitarget nls +python +server source-highlight test vanilla xml xxhash" REQUIRED_USE=" @@ -79,6 +79,7 @@ BDEPEND=" sys-apps/texinfo virtual/yacc nls? ( sys-devel/gettext ) + source-highlight? ( virtual/pkgconfig ) test? ( dev-util/dejagnu ) " diff --git a/sys-devel/gdb/gdb-10.2.ebuild b/sys-devel/gdb/gdb-10.2.ebuild new file mode 100644 index 000000000000..f826ccb70838 --- /dev/null +++ b/sys-devel/gdb/gdb-10.2.ebuild @@ -0,0 +1,260 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{7,8,9} ) + +inherit eutils flag-o-matic python-single-r1 toolchain-funcs + +export CTARGET=${CTARGET:-${CHOST}} +if [[ ${CTARGET} == ${CHOST} ]] ; then + if [[ ${CATEGORY} == cross-* ]] ; then + export CTARGET=${CATEGORY#cross-} + fi +fi +is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; } + +case ${PV} in +9999*) + # live git tree + EGIT_REPO_URI="https://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" + ;; +*) + # Normal upstream release + SRC_URI="mirror://gnu/gdb/${P}.tar.xz + ftp://sourceware.org/pub/gdb/releases/${P}.tar.xz" + ;; +esac + +PATCH_VER="" +PATCH_DEV="" +DESCRIPTION="GNU debugger" +HOMEPAGE="https://sourceware.org/gdb/" +SRC_URI="${SRC_URI} + ${PATCH_DEV:+https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${P}-patches-${PATCH_VER}.tar.xz} + ${PATCH_VER:+mirror://gentoo/${P}-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 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +fi +IUSE="cet lzma multitarget nls +python +server source-highlight test vanilla xml xxhash" +REQUIRED_USE=" + python? ( ${PYTHON_REQUIRED_USE} ) +" + +# ia64 kernel crashes when gdb testsuite is running +RESTRICT=" + ia64? ( test ) + + !test? ( test ) +" + +RDEPEND=" + dev-libs/mpfr:0= + >=sys-libs/ncurses-5.2-r2:0= + >=sys-libs/readline-7:0= + sys-libs/zlib + lzma? ( app-arch/xz-utils ) + python? ( ${PYTHON_DEPS} ) + xml? ( dev-libs/expat ) + source-highlight? ( + dev-util/source-highlight + ) + xxhash? ( + dev-libs/xxhash + ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + app-arch/xz-utils + sys-apps/texinfo + virtual/yacc + nls? ( sys-devel/gettext ) + source-highlight? ( virtual/pkgconfig ) + test? ( dev-util/dejagnu ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-8.3.1-verbose-build.patch + "${FILESDIR}"/${PN}-10.1-cet.patch + "${FILESDIR}"/${PN}-10.2-sparc-nat.patch +) + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_prepare() { + default + + strip-linguas -u bfd/po opcodes/po + export CC_FOR_BUILD=$(tc-getBUILD_CC) + + # avoid using ancient termcap from host on Prefix systems + sed -i -e 's/termcap tinfow/tinfow/g' \ + gdb/configure{.ac,} || die +} + +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=( + # portage's econf() does not detect presence of --d-d-t + # because it greps only top-level ./configure. But not + # gnulib's or gdb's configure. + --disable-dependency-tracking + + --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} + + # avoid automagic dependency on (currently prefix) systems + # systems with debuginfod library, bug #754753 + --without-debuginfod + + # Allow user to opt into CET for host libraries. + # Ideally we would like automagic-or-disabled here. + # But the check does not quite work on i686: bug #760926. + $(use_enable cet) + ) + local sysroot="${EPREFIX}/usr/${CTARGET}" + is_cross && myconf+=( + --with-sysroot="${sysroot}" + --includedir="${sysroot}/usr/include" + --with-gdb-datadir="\${datadir}/gdb/${CTARGET}" + ) + + # 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, which is triggered + # whenever no --enable or --disable is given + if is_cross || use !server ; then + myconf+=( --disable-gdbserver ) + fi + + myconf+=( + --enable-64-bit-bfd + --disable-install-libbfd + --disable-install-libiberty + # Disable guile for now as it requires guile-2.x #562902 + --without-guile + --enable-obsolete + # 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_enable source-highlight) + $(use multitarget && echo --enable-targets=all) + $(use_with python python "${EPYTHON}") + $(use_with xxhash) + ) + 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 + + # source-highlight is detected with pkg-config: bug #716558 + export ac_cv_path_pkg_config_prog_path="$(tc-getPKG_CONFIG)" + + econf "${myconf[@]}" +} + +src_install() { + default + find "${ED}"/usr -name libiberty.a -delete || 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 gdbserver/gdbreplay ]] && dobin gdbserver/gdbreplay + + docinto gdb + dodoc gdb/CONTRIBUTE gdb/README gdb/MAINTAINERS \ + gdb/NEWS gdb/ChangeLog gdb/PROBLEMS + docinto sim + dodoc sim/{ChangeLog,MAINTAINERS,README-HACKING} + if use server ; then + docinto gdbserver + dodoc 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 + + if use python; then + python_optimize "${ED}"/usr/share/gdb/python/gdb + 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 ceab3a731e88..6905306caf7b 100644 --- a/sys-devel/gdb/gdb-9999.ebuild +++ b/sys-devel/gdb/gdb-9999.ebuild @@ -79,6 +79,7 @@ BDEPEND=" sys-apps/texinfo virtual/yacc nls? ( sys-devel/gettext ) + source-highlight? ( virtual/pkgconfig ) test? ( dev-util/dejagnu ) " -- cgit v1.2.3