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 3D16B1382C5 for ; Sun, 6 Jun 2021 15:43:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 22A76E086D; Sun, 6 Jun 2021 15:43:00 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EFB9EE086D for ; Sun, 6 Jun 2021 15:42:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D240B340CD2 for ; Sun, 6 Jun 2021 15:42:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C99227A6 for ; Sun, 6 Jun 2021 15:42:55 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1622994095.7ba9d678f443ba11c840254750b06b003e8904f1.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/gdbm/, sys-libs/gdbm/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/gdbm/Manifest sys-libs/gdbm/files/gdbm-1.18.1-gcc-10.patch sys-libs/gdbm/gdbm-1.18.1-r1.ebuild X-VCS-Directories: sys-libs/gdbm/files/ sys-libs/gdbm/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 7ba9d678f443ba11c840254750b06b003e8904f1 X-VCS-Branch: master Date: Sun, 6 Jun 2021 15:42:55 +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: 17fcf995-d0c5-4b3c-9501-bdfce7353599 X-Archives-Hash: 6d0462c40ed491436eedb4fe440ccdea commit: 7ba9d678f443ba11c840254750b06b003e8904f1 Author: David Seifert gentoo org> AuthorDate: Sun Jun 6 15:41:35 2021 +0000 Commit: David Seifert gentoo org> CommitDate: Sun Jun 6 15:41:35 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ba9d678 sys-libs/gdbm: drop 1.18.1-r1 Signed-off-by: David Seifert gentoo.org> sys-libs/gdbm/Manifest | 1 - sys-libs/gdbm/files/gdbm-1.18.1-gcc-10.patch | 40 --------------------- sys-libs/gdbm/gdbm-1.18.1-r1.ebuild | 53 ---------------------------- 3 files changed, 94 deletions(-) diff --git a/sys-libs/gdbm/Manifest b/sys-libs/gdbm/Manifest index 18e52567aea..17eea7760c5 100644 --- a/sys-libs/gdbm/Manifest +++ b/sys-libs/gdbm/Manifest @@ -1,2 +1 @@ -DIST gdbm-1.18.1.tar.gz 941863 BLAKE2B b7717224e966321d7499a90214bfb62d0402e867db475ed4eddacfe3944d8d9cca1052e41d625f447936bfb3cbd7f1b79cfe6ff435a018efed3d5a7c5eae52d7 SHA512 adf9d6c5bc843ff0d7f88c2a1667d509973b2d63378d0001d7e74cc10aee6ea498a4513cc88ddf78c32ba4db5cb040b2794f4f1b3338c65d9894058850e2f5ef DIST gdbm-1.19.tar.gz 967861 BLAKE2B 92a1a9c461c763b01d7abced58800aa8db200ae746240c8ef8079a615d920efe95f0d805a8cfa63d8aa6bcbda637bcb07d98d630f58de5678b7633c3fcf6bf9b SHA512 118c5b8cdf74898bfb7c2100302fedf80096be017bf08e80a44486563cad5d93b93567622f2e7c7aceb72f30460504bd0b4ddfccf34df994ed65166e12ecd495 diff --git a/sys-libs/gdbm/files/gdbm-1.18.1-gcc-10.patch b/sys-libs/gdbm/files/gdbm-1.18.1-gcc-10.patch deleted file mode 100644 index 9b3e3d736c1..00000000000 --- a/sys-libs/gdbm/files/gdbm-1.18.1-gcc-10.patch +++ /dev/null @@ -1,40 +0,0 @@ -From ab05ea727942b5c1469e2e86548581264c6e2de4 Mon Sep 17 00:00:00 2001 -From: Sergei Trofimovich -Date: Sat, 2 May 2020 12:39:39 +0100 -Subject: [PATCH] gdbm: fix link failure against gcc-10 - -Before the change on gcc-10 link failed as: -``` - CCLD gdbmtool -ld: ./libgdbmapp.a(parseopt.o):(.bss+0x8): multiple definition of `parseopt_program_args'; - gdbmtool.o:(.data.rel.local+0x260): first defined here -ld: ./libgdbmapp.a(parseopt.o):(.bss+0x10): multiple definition of `parseopt_program_doc'; - gdbmtool.o:(.data.rel.local+0x268): first defined here -``` - -gcc-10 will change the default from -fcommon to fno-common: - https://gcc.gnu.org/PR85678. - -The fix is to avoid multiple definition and rely on -declarations only. - -Bug: https://bugs.gentoo.org/705898 -Signed-off-by: Sergei Trofimovich ---- - src/parseopt.c | 2 -- - 1 file changed, 2 deletions(-) - ---- a/src/parseopt.c -+++ b/src/parseopt.c -@@ -255,8 +255,6 @@ print_option_descr (const char *descr, size_t lmargin, size_t rmargin) - } - - char *parseopt_program_name; --char *parseopt_program_doc; --char *parseopt_program_args; - const char *program_bug_address = "<" PACKAGE_BUGREPORT ">"; - void (*parseopt_help_hook) (FILE *stream); - --- -2.26.2 - diff --git a/sys-libs/gdbm/gdbm-1.18.1-r1.ebuild b/sys-libs/gdbm/gdbm-1.18.1-r1.ebuild deleted file mode 100644 index 87ad4ca3a37..00000000000 --- a/sys-libs/gdbm/gdbm-1.18.1-r1.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools multilib-minimal - -DESCRIPTION="Standard GNU database libraries" -HOMEPAGE="https://www.gnu.org/software/gdbm/" -SRC_URI="mirror://gnu/gdbm/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0/6" # libgdbm.so version -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="+berkdb nls +readline static-libs" - -DEPEND=" - readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] ) -" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}"/${PN}-1.18.1-gcc-10.patch - "${FILESDIR}"/${PN}-1.18.1-gettext.patch #696838 -) - -src_prepare() { - default - eautoreconf -} - -multilib_src_configure() { - # gdbm doesn't appear to use either of these libraries - export ac_cv_lib_dbm_main=no ac_cv_lib_ndbm_main=no - - local myeconfargs=( - --includedir="${EPREFIX}"/usr/include/gdbm - $(use_enable berkdb libgdbm-compat) - $(use_enable nls) - $(use_enable static-libs static) - $(use_with readline) - ) - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_install_all() { - einstalldocs - - if ! use static-libs ; then - find "${ED}" -name '*.la' -delete || die - fi - mv "${ED}"/usr/include/gdbm/gdbm.h "${ED}"/usr/include/ || die -}