From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 854D9158092 for ; Sun, 19 Sep 2021 02:24:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 47CE6E0933; Sun, 19 Sep 2021 02:24:53 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E7083E0930 for ; Sun, 19 Sep 2021 02:24:52 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8B419343278 for ; Sun, 19 Sep 2021 02:24:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9D35EEA for ; Sun, 19 Sep 2021 02:24:49 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1632018256.96ce056a7c6e298cf8f595899b295a7f246e4af0.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/gdb/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-devel/gdb/Manifest sys-devel/gdb/gdb-11.1.ebuild sys-devel/gdb/gdb-9999.ebuild X-VCS-Directories: sys-devel/gdb/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 96ce056a7c6e298cf8f595899b295a7f246e4af0 X-VCS-Branch: master Date: Sun, 19 Sep 2021 02:24:49 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 826cd5b8-580c-4a96-8c4b-d4f58d1b533f X-Archives-Hash: e88380f544f0637bd9ae6c76b9f3955e commit: 96ce056a7c6e298cf8f595899b295a7f246e4af0 Author: Sam James gentoo org> AuthorDate: Sun Sep 19 02:01:05 2021 +0000 Commit: Sam James gentoo org> CommitDate: Sun Sep 19 02:24:16 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96ce056a sys-devel/gdb: add 11.1 Signed-off-by: Sam James gentoo.org> sys-devel/gdb/Manifest | 1 + sys-devel/gdb/{gdb-9999.ebuild => gdb-11.1.ebuild} | 56 +++++++++++++--------- sys-devel/gdb/gdb-9999.ebuild | 56 +++++++++++++--------- 3 files changed, 67 insertions(+), 46 deletions(-) diff --git a/sys-devel/gdb/Manifest b/sys-devel/gdb/Manifest index 563fc11c108..b8e17615d04 100644 --- a/sys-devel/gdb/Manifest +++ b/sys-devel/gdb/Manifest @@ -1,2 +1,3 @@ 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 diff --git a/sys-devel/gdb/gdb-9999.ebuild b/sys-devel/gdb/gdb-11.1.ebuild similarity index 90% copy from sys-devel/gdb/gdb-9999.ebuild copy to sys-devel/gdb/gdb-11.1.ebuild index fde1ad99243..8b1a81f909e 100644 --- a/sys-devel/gdb/gdb-9999.ebuild +++ b/sys-devel/gdb/gdb-11.1.ebuild @@ -2,34 +2,36 @@ # 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 +PYTHON_COMPAT=( python3_{8,9,10} ) +inherit flag-o-matic python-single-r1 strip-linguas 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" - ;; + 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="" @@ -43,23 +45,23 @@ 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" fi + IUSE="cet guile lzma multitarget nls +python +server source-highlight test vanilla xml xxhash" -REQUIRED_USE=" - python? ( ${PYTHON_REQUIRED_USE} ) -" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" # ia64 kernel crashes when gdb testsuite is running RESTRICT=" ia64? ( test ) - !test? ( test ) " RDEPEND=" dev-libs/mpfr:0= + dev-libs/gmp:= >=sys-libs/ncurses-5.2-r2:0= >=sys-libs/readline-7:0= sys-libs/zlib @@ -105,11 +107,13 @@ src_prepare() { 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}" } @@ -137,7 +141,9 @@ src_configure() { # 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" @@ -176,8 +182,9 @@ src_configure() { $(use_with xxhash) $(use_with guile) ) + if use sparc-solaris || use x86-solaris ; then - # disable largefile support + # Disable largefile support # https://sourceware.org/ml/gdb-patches/2014-12/msg00058.html myconf+=( --disable-largefile ) fi @@ -190,6 +197,7 @@ src_configure() { src_install() { default + find "${ED}"/usr -name libiberty.a -delete || die # Delete translations that conflict with binutils-libs. #528088 @@ -211,6 +219,7 @@ src_install() { 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 @@ -222,6 +231,7 @@ src_install() { gdb/NEWS gdb/ChangeLog gdb/PROBLEMS docinto sim dodoc sim/{ChangeLog,MAINTAINERS,README-HACKING} + if use server ; then docinto gdbserver dodoc gdbserver/{ChangeLog,README} @@ -245,7 +255,7 @@ src_install() { } pkg_postinst() { - # portage sucks and doesnt unmerge files in /etc + # Portage doesn't unmerge files in /etc rm -vf "${EROOT}"/etc/skel/.gdbinit if use prefix && [[ ${CHOST} == *-darwin* ]] ; then diff --git a/sys-devel/gdb/gdb-9999.ebuild b/sys-devel/gdb/gdb-9999.ebuild index fde1ad99243..8b1a81f909e 100644 --- a/sys-devel/gdb/gdb-9999.ebuild +++ b/sys-devel/gdb/gdb-9999.ebuild @@ -2,34 +2,36 @@ # 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 +PYTHON_COMPAT=( python3_{8,9,10} ) +inherit flag-o-matic python-single-r1 strip-linguas 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" - ;; + 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="" @@ -43,23 +45,23 @@ 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" fi + IUSE="cet guile lzma multitarget nls +python +server source-highlight test vanilla xml xxhash" -REQUIRED_USE=" - python? ( ${PYTHON_REQUIRED_USE} ) -" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" # ia64 kernel crashes when gdb testsuite is running RESTRICT=" ia64? ( test ) - !test? ( test ) " RDEPEND=" dev-libs/mpfr:0= + dev-libs/gmp:= >=sys-libs/ncurses-5.2-r2:0= >=sys-libs/readline-7:0= sys-libs/zlib @@ -105,11 +107,13 @@ src_prepare() { 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}" } @@ -137,7 +141,9 @@ src_configure() { # 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" @@ -176,8 +182,9 @@ src_configure() { $(use_with xxhash) $(use_with guile) ) + if use sparc-solaris || use x86-solaris ; then - # disable largefile support + # Disable largefile support # https://sourceware.org/ml/gdb-patches/2014-12/msg00058.html myconf+=( --disable-largefile ) fi @@ -190,6 +197,7 @@ src_configure() { src_install() { default + find "${ED}"/usr -name libiberty.a -delete || die # Delete translations that conflict with binutils-libs. #528088 @@ -211,6 +219,7 @@ src_install() { 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 @@ -222,6 +231,7 @@ src_install() { gdb/NEWS gdb/ChangeLog gdb/PROBLEMS docinto sim dodoc sim/{ChangeLog,MAINTAINERS,README-HACKING} + if use server ; then docinto gdbserver dodoc gdbserver/{ChangeLog,README} @@ -245,7 +255,7 @@ src_install() { } pkg_postinst() { - # portage sucks and doesnt unmerge files in /etc + # Portage doesn't unmerge files in /etc rm -vf "${EROOT}"/etc/skel/.gdbinit if use prefix && [[ ${CHOST} == *-darwin* ]] ; then