From 95461df035e3867364495f065e5e805bf629b2d7 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 26 Oct 2021 00:10:07 +0100 Subject: gentoo resync : 25.10.2021 --- sys-devel/gdb/Manifest | 8 +- sys-devel/gdb/files/gdb-11.1-glibc-2.34-sim.patch | 110 +++++++++ sys-devel/gdb/gdb-10.1.ebuild | 259 --------------------- sys-devel/gdb/gdb-10.2-r1.ebuild | 2 +- sys-devel/gdb/gdb-10.2.ebuild | 260 ---------------------- sys-devel/gdb/gdb-11.1.ebuild | 1 + 6 files changed, 115 insertions(+), 525 deletions(-) create mode 100644 sys-devel/gdb/files/gdb-11.1-glibc-2.34-sim.patch delete mode 100644 sys-devel/gdb/gdb-10.1.ebuild delete 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 f946cee40016..cd004a13a253 100644 --- a/sys-devel/gdb/Manifest +++ b/sys-devel/gdb/Manifest @@ -1,13 +1,11 @@ AUX gdb-10.1-cet.patch 2675 BLAKE2B b720e43514b25897a332648bfb15e16278f76606413991ce75c0233af27bbc434c36e85d36d4207339211382c0c5de5e9892f9e533e9d24b5257864939ac4874 SHA512 4fd4787c7ff2f7c2fed338ccc0f478b120d566959c0de5dde03cdcfdb37911bc22c5c11a124a000d84138a23c30ee3fa65c024eb72d1c924f926b04e079412a5 AUX gdb-10.2-DW_LLE-riscv64.patch 1352 BLAKE2B 962c47c3791735162da4351c29fdb4c8bdc803824445a034cced8eb24d4028a27dd68f3238b3028299212eb5a9035e006dd48429d497b5a83a301c5a2e9cbc5d SHA512 c70c34be908ca2ae3545184730d49ebf024295ff382b632fe7186de0f9e019655476bef01e5ae1017856d12e7fe15ca1917a3f1b44ddf4c11214dfa4f47f766f AUX gdb-10.2-sparc-nat.patch 1683 BLAKE2B b5ef1ce44dd935ca8a69a6477cfea703109300e5c50b108b834ebcaaa3d4144b81ec10bd586db207cec2eab3355c2886c0af442a4046f378a08300cbd7d1783e SHA512 dc72e7e1d789dac8befd77ad07bdbcfa6ad96e82095cd807f12dcbc7f0521e4bbb6812841ec7bd311d2efe2f4aa9f249e4d114315ae88a04216f698448bb35b0 +AUX gdb-11.1-glibc-2.34-sim.patch 4406 BLAKE2B a1884d9bc430094b7505a68ccccba9ea634f610643c40cc89b98c8a3df95ce59cd5994ec6e57f24f85d6db3a42ff33367a52afd09540025504c0331580aa96e2 SHA512 c75b4e197416fbbb47226b9a846174fc07835a159eac304303f952f5cd15afceeb165a3f867ab3807c7687b294af805a0249ed3ab257dcb270d9d31d7ef6b6a7 AUX gdb-8.3.1-verbose-build.patch 395 BLAKE2B e2e82307ceae64d16aa9b57a5e639eb5d217c4d977aed0847fdf125bb13ebc004906d9afb8e3f629c41efccca88df0040015e7799c1fd24de5fb50f62f5bbd90 SHA512 c2bb013e4fcabefddcd8042bd3cbb53471f83182cc8769fe0d19eed80ccc4a83bd84d120006fa25b3b7d0310dc2f2ec6b44a6ff74909cd312b7e491f371777a3 -DIST gdb-10.1.tar.xz 21507112 BLAKE2B 69d79cd667ecb6e936b41a03817ade5dd9b761f97bc123d668b5f968d123c37d048fc8ec1289151e989f01bb01a43cc3d8b5b54f1807f1e3eb5f43e6bf0aa55b SHA512 0dc54380435c6853db60f1e388b94836d294dfa9ad7f518385a27db4edd03cb970f8717d5f1e9c9a0d4a33d7fcf91bc2e5d6c9cf9e4b561dcc74e65b806c1537 DIST gdb-10.2.tar.xz 21518900 BLAKE2B c5d31d80d2b454767d6f844e8471b012ad437c3872391b618fd7b14c5cf251b78e55d28c12e81382fd600f67e2f618ff5dbe3a7b737a5d5161ceb3542afbb90b SHA512 3653762ac008e065c37cd641653184c9ff7ce51ee2222ade1122bec9d6cc64dffd4fb74888ef11ac1942064a08910e96b7865112ad37f4602eb0a16bed074caa DIST gdb-11.1.tar.xz 22040696 BLAKE2B 6a639f6533f4008bfb469c23a26c4fcd039f1bc5dd33745f4876344451beb595d7a8843caeb5db70214924624c5b999f8831237d459bebf1cb2d2866f8b41ee2 SHA512 c40bf970e2f7c2107b29c5aa6a7150daa709d75ddadb73ac20742419d4637d158e3063a4c6ff6e47fae8ca8e1d36253973f85ea15445d004be6d5d7a2dd9bd46 -EBUILD gdb-10.1.ebuild 7003 BLAKE2B b98d23ee8b9ba2d9fa573e488fd8f4d941ff34b6e2afc4b7a6d2e7e74ec444f379ac2af9da840cd811aa823ebb5905e426200765bfaf0f0ada06574866ee768d SHA512 bfd8581d2d9cf4631769b1366997974cf08449d4b2166fc48d8b7a5ca9f56560a1350a4141e92946f98176b998780ca118c199d4e0873b3a5f59d1e7bc238c40 -EBUILD gdb-10.2-r1.ebuild 7094 BLAKE2B f958c527865171cd695f3da60857d8ece8cb44cbafa22a1760536170e6d556770e7204ae3e4063f6b29cf4ee3b1f75ef94143328b8011fc54c819fb3e53958d9 SHA512 d67c05ce13c341506e50fe5fd51d699f5416c6ccead0ece810893d1c0704c652e9f49939c1a815f93ca3e80d951027a5898aca4191c78d4018fdddcfa97f3269 -EBUILD gdb-10.2.ebuild 7045 BLAKE2B 85d2a4b2ac11a44c46e42a00a4fd36de82d6b9d9e8fc1134625550356d93f115aab03bb5d16b9c5c7a876193c2351ad5de15160a39efe4bea44627a7c375d8c3 SHA512 07dc3c738ee21e83f6cd59b171f7c9676774693522ff22e6ef126698052a8e29bc0c64d3d6683ffb75d6d4b4be2d20f7eb5e6bd808346bfbcf4b91d330bb47fa -EBUILD gdb-11.1.ebuild 7009 BLAKE2B 1b660541d730d7e449b76d12f0ca05b8bdf4695721fe79344ee1630ec336137bb34f4f4fb3640f790fd218e1dcd5fc04dce2055c0ddb7ac8e4c92e1a122e15af SHA512 8da08ee0856f5550faec5a5e6d45f07a4c21766f39d425d65bd7ebc94bf138b83c4c53f16dc8bbd04a66be965a61ef7d3b17f83dc26561fe192e1d76a2050a4a +EBUILD gdb-10.2-r1.ebuild 7092 BLAKE2B 89bab33b3e98e2005ce9f5efb5d410225feaa6f70125d99e157fa7b0263f9ca130e2451d6833a216a9cbe9af5a879b7979c35bf6d8982ca9a8779cbd7bb5b691 SHA512 500eecef57264f641f8d5702c7248f95b48c3564c79b11d9ac9f2d05d0f2e93492db55b25d94206fd2b32f7d01e168c8898ac19d57b557d155a23662715df98f +EBUILD gdb-11.1.ebuild 7050 BLAKE2B ac957978d5d9cea167cea588968061edad3f821abf9d5a8fb84ca8f7452bdf9861979042cca1123584ca0d3dd893413c2dabd67133b3d0e9f39456305c252791 SHA512 3cfa51ab46ef4d62bd453354e4cac9e4a9b62774dd998b6cdf191d551c1f177cfa95212bb66f6448256f7970882e944583f0f684c9ff61149e00945cdfe5b08b EBUILD gdb-9999.ebuild 7009 BLAKE2B 1b660541d730d7e449b76d12f0ca05b8bdf4695721fe79344ee1630ec336137bb34f4f4fb3640f790fd218e1dcd5fc04dce2055c0ddb7ac8e4c92e1a122e15af SHA512 8da08ee0856f5550faec5a5e6d45f07a4c21766f39d425d65bd7ebc94bf138b83c4c53f16dc8bbd04a66be965a61ef7d3b17f83dc26561fe192e1d76a2050a4a MISC metadata.xml 1103 BLAKE2B e63ea2e52649ac2f4ac21381cadb7cc76525792e99a4a6581535475480b6c45e654c8222b0b58585435d4c858cf3eef00dcaecf7edecae2b2fd336f1b56e6e56 SHA512 f7f1b4da71b18cb68a2f32aa6faae6251528047069071c9bee1be504267d0baf2cbac4fb928e0cbe9df100e3a681e2c3b6c7be14514a45a2f52d30364a8626f4 diff --git a/sys-devel/gdb/files/gdb-11.1-glibc-2.34-sim.patch b/sys-devel/gdb/files/gdb-11.1-glibc-2.34-sim.patch new file mode 100644 index 000000000000..15ab45f278f1 --- /dev/null +++ b/sys-devel/gdb/files/gdb-11.1-glibc-2.34-sim.patch @@ -0,0 +1,110 @@ +https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=39d53d04357606a15efd400147fa7369d71baf2c;hp=46039d3632e32d9a404c1f18cf55f14c894e4627 +https://bugs.gentoo.org/813831 + +From 39d53d04357606a15efd400147fa7369d71baf2c Mon Sep 17 00:00:00 2001 +From: Mike Frysinger +Date: Sun, 3 Oct 2021 12:02:53 -0400 +Subject: [PATCH 1/1] sim: filter out SIGSTKSZ [PR sim/28302] + +We map target signals to host signals so we can propagate signals +between the host & simulated worlds. That means we need to know +the symbolic names & values of all signals that might be sent. + +The tools that generate that list use signal.h and include all +symbols that start with "SIG" so as to automatically include any +new symbols that the C library might add. Unfortunately, this +also picks up "SIGSTKSZ" which is not actually a signal itself, +but a signal related setting -- it's the size of the stack when +a signal is handled. + +By itself this doesn't super matter as we will never see a signal +with that same value (since the range of valid signals tend to be +way less than 1024, and the size of the default signal stack will +never be that small). But with recent glibc changes that make this +into a dynamic value instead of a compile-time constant, some users +see build failures when building the sim. + +As suggested by Adam Sampson, update our scripts to ignore this +symbol to simplify everything and avoid the build failure. + +Bug: https://sourceware.org/PR28302 +--- + sim/bfin/linux-targ-map.h | 5 +---- + sim/common/gennltvals.py | 6 ++++-- + sim/common/nltvals.def | 1 - + 3 files changed, 5 insertions(+), 7 deletions(-) + +diff --git a/sim/bfin/linux-targ-map.h b/sim/bfin/linux-targ-map.h +index e9c8c8f273b..0340ed54764 100644 +--- a/sim/bfin/linux-targ-map.h ++++ b/sim/bfin/linux-targ-map.h +@@ -30,6 +30,7 @@ echo + # XXX: nothing uses this ? + echo '#include ' | \ + bfin-uclinux-gcc -E -dD -P - | \ ++grep -v SIGSTKSZ | \ + sed -r -n \ + -e '1istatic CB_TARGET_DEFS_MAP cb_linux_signal_map[] = {' \ + -e '$i\ \ { 0, -1, -1 }\n};' \ +@@ -1987,10 +1988,6 @@ static CB_TARGET_DEFS_MAP cb_linux_signal_map[] = + #ifdef SIG_SETMASK + # define TARGET_LINUX_SIG_SETMASK 2 + { "SIG_SETMASK", SIG_SETMASK, TARGET_LINUX_SIG_SETMASK }, +-#endif +-#ifdef SIGSTKSZ +-# define TARGET_LINUX_SIGSTKSZ 8192 +- { "SIGSTKSZ", SIGSTKSZ, TARGET_LINUX_SIGSTKSZ }, + #endif + { 0, -1, -1 } + }; +diff --git a/sim/common/gennltvals.py b/sim/common/gennltvals.py +index db3ff641d40..955ace34311 100755 +--- a/sim/common/gennltvals.py ++++ b/sim/common/gennltvals.py +@@ -67,6 +67,7 @@ FILE_HEADER = f"""\ + def gentvals(output: TextIO, cpp: str, srctype: str, srcdir: Path, + headers: Iterable[str], + pattern: str, ++ filter: str = r'^$', + target: str = None): + """Extract constants from the specified files using a regular expression. + +@@ -94,12 +95,13 @@ def gentvals(output: TextIO, cpp: str, srctype: str, srcdir: Path, + srcfile = ''.join(f'#include <{x}>\n' for x in headers) + syms = set() + define_pattern = re.compile(r'^#\s*define\s+(' + pattern + ')') ++ filter_pattern = re.compile(filter) + for header in headers: + with open(srcdir / header, 'r', encoding='utf-8') as fp: + data = fp.read() + for line in data.splitlines(): + m = define_pattern.match(line) +- if m: ++ if m and not filter_pattern.search(line): + syms.add(m.group(1)) + for sym in sorted(syms): + srcfile += f'#ifdef {sym}\nDEFVAL {{ "{sym}", {sym} }},\n#endif\n' +@@ -129,7 +131,7 @@ def gen_common(output: TextIO, newlib: Path, cpp: str): + ('errno.h', 'sys/errno.h'), 'E[A-Z0-9]*') + + gentvals(output, cpp, 'signal', newlib / 'newlib/libc/include', +- ('signal.h', 'sys/signal.h'), r'SIG[A-Z0-9]*') ++ ('signal.h', 'sys/signal.h'), r'SIG[A-Z0-9]*', filter=r'SIGSTKSZ') + + gentvals(output, cpp, 'open', newlib / 'newlib/libc/include', + ('fcntl.h', 'sys/fcntl.h', 'sys/_default_fcntl.h'), r'O_[A-Z0-9]*') +diff --git a/sim/common/nltvals.def b/sim/common/nltvals.def +index 8ae88397249..8bc6ae59026 100644 +--- a/sim/common/nltvals.def ++++ b/sim/common/nltvals.def +@@ -116,7 +116,6 @@ + { "SIGPROF", 27 }, + { "SIGQUIT", 3 }, + { "SIGSEGV", 11 }, +- { "SIGSTKSZ", 8192 }, + { "SIGSTOP", 17 }, + { "SIGSYS", 12 }, + { "SIGTERM", 15 }, +-- +2.27.0 + diff --git a/sys-devel/gdb/gdb-10.1.ebuild b/sys-devel/gdb/gdb-10.1.ebuild deleted file mode 100644 index c751cccea855..000000000000 --- a/sys-devel/gdb/gdb-10.1.ebuild +++ /dev/null @@ -1,259 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{7,8,9,10} ) - -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 guile 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} ) - guile? ( >=dev-scheme/guile-2.0 ) - 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 -) - -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 - --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) - $(use_with guile) - ) - 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-10.2-r1.ebuild b/sys-devel/gdb/gdb-10.2-r1.ebuild index e5672e27b028..ea2f58b6ef9f 100644 --- a/sys-devel/gdb/gdb-10.2-r1.ebuild +++ b/sys-devel/gdb/gdb-10.2-r1.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 guile lzma multitarget nls +python +server source-highlight test vanilla xml xxhash" REQUIRED_USE=" diff --git a/sys-devel/gdb/gdb-10.2.ebuild b/sys-devel/gdb/gdb-10.2.ebuild deleted file mode 100644 index 7cd5db524ba2..000000000000 --- a/sys-devel/gdb/gdb-10.2.ebuild +++ /dev/null @@ -1,260 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{7,8,9,10} ) - -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 guile 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} ) - guile? ( >=dev-scheme/guile-2.0 ) - 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 - --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) - $(use_with guile) - ) - 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-11.1.ebuild b/sys-devel/gdb/gdb-11.1.ebuild index 8b1a81f909e0..bcd3ce89b95c 100644 --- a/sys-devel/gdb/gdb-11.1.ebuild +++ b/sys-devel/gdb/gdb-11.1.ebuild @@ -88,6 +88,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-8.3.1-verbose-build.patch + "${FILESDIR}"/${P}-glibc-2.34-sim.patch ) pkg_setup() { -- cgit v1.2.3