| 1 |
commit: 7ba9d678f443ba11c840254750b06b003e8904f1 |
| 2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jun 6 15:41:35 2021 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jun 6 15:41:35 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ba9d678 |
| 7 |
|
| 8 |
sys-libs/gdbm: drop 1.18.1-r1 |
| 9 |
|
| 10 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
| 11 |
|
| 12 |
sys-libs/gdbm/Manifest | 1 - |
| 13 |
sys-libs/gdbm/files/gdbm-1.18.1-gcc-10.patch | 40 --------------------- |
| 14 |
sys-libs/gdbm/gdbm-1.18.1-r1.ebuild | 53 ---------------------------- |
| 15 |
3 files changed, 94 deletions(-) |
| 16 |
|
| 17 |
diff --git a/sys-libs/gdbm/Manifest b/sys-libs/gdbm/Manifest |
| 18 |
index 18e52567aea..17eea7760c5 100644 |
| 19 |
--- a/sys-libs/gdbm/Manifest |
| 20 |
+++ b/sys-libs/gdbm/Manifest |
| 21 |
@@ -1,2 +1 @@ |
| 22 |
-DIST gdbm-1.18.1.tar.gz 941863 BLAKE2B b7717224e966321d7499a90214bfb62d0402e867db475ed4eddacfe3944d8d9cca1052e41d625f447936bfb3cbd7f1b79cfe6ff435a018efed3d5a7c5eae52d7 SHA512 adf9d6c5bc843ff0d7f88c2a1667d509973b2d63378d0001d7e74cc10aee6ea498a4513cc88ddf78c32ba4db5cb040b2794f4f1b3338c65d9894058850e2f5ef |
| 23 |
DIST gdbm-1.19.tar.gz 967861 BLAKE2B 92a1a9c461c763b01d7abced58800aa8db200ae746240c8ef8079a615d920efe95f0d805a8cfa63d8aa6bcbda637bcb07d98d630f58de5678b7633c3fcf6bf9b SHA512 118c5b8cdf74898bfb7c2100302fedf80096be017bf08e80a44486563cad5d93b93567622f2e7c7aceb72f30460504bd0b4ddfccf34df994ed65166e12ecd495 |
| 24 |
|
| 25 |
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 |
| 26 |
deleted file mode 100644 |
| 27 |
index 9b3e3d736c1..00000000000 |
| 28 |
--- a/sys-libs/gdbm/files/gdbm-1.18.1-gcc-10.patch |
| 29 |
+++ /dev/null |
| 30 |
@@ -1,40 +0,0 @@ |
| 31 |
-From ab05ea727942b5c1469e2e86548581264c6e2de4 Mon Sep 17 00:00:00 2001 |
| 32 |
-From: Sergei Trofimovich <slyfox@g.o> |
| 33 |
-Date: Sat, 2 May 2020 12:39:39 +0100 |
| 34 |
-Subject: [PATCH] gdbm: fix link failure against gcc-10 |
| 35 |
- |
| 36 |
-Before the change on gcc-10 link failed as: |
| 37 |
-``` |
| 38 |
- CCLD gdbmtool |
| 39 |
-ld: ./libgdbmapp.a(parseopt.o):(.bss+0x8): multiple definition of `parseopt_program_args'; |
| 40 |
- gdbmtool.o:(.data.rel.local+0x260): first defined here |
| 41 |
-ld: ./libgdbmapp.a(parseopt.o):(.bss+0x10): multiple definition of `parseopt_program_doc'; |
| 42 |
- gdbmtool.o:(.data.rel.local+0x268): first defined here |
| 43 |
-``` |
| 44 |
- |
| 45 |
-gcc-10 will change the default from -fcommon to fno-common: |
| 46 |
- https://gcc.gnu.org/PR85678. |
| 47 |
- |
| 48 |
-The fix is to avoid multiple definition and rely on |
| 49 |
-declarations only. |
| 50 |
- |
| 51 |
-Bug: https://bugs.gentoo.org/705898 |
| 52 |
-Signed-off-by: Sergei Trofimovich <slyfox@g.o> |
| 53 |
---- |
| 54 |
- src/parseopt.c | 2 -- |
| 55 |
- 1 file changed, 2 deletions(-) |
| 56 |
- |
| 57 |
---- a/src/parseopt.c |
| 58 |
-+++ b/src/parseopt.c |
| 59 |
-@@ -255,8 +255,6 @@ print_option_descr (const char *descr, size_t lmargin, size_t rmargin) |
| 60 |
- } |
| 61 |
- |
| 62 |
- char *parseopt_program_name; |
| 63 |
--char *parseopt_program_doc; |
| 64 |
--char *parseopt_program_args; |
| 65 |
- const char *program_bug_address = "<" PACKAGE_BUGREPORT ">"; |
| 66 |
- void (*parseopt_help_hook) (FILE *stream); |
| 67 |
- |
| 68 |
--- |
| 69 |
-2.26.2 |
| 70 |
- |
| 71 |
|
| 72 |
diff --git a/sys-libs/gdbm/gdbm-1.18.1-r1.ebuild b/sys-libs/gdbm/gdbm-1.18.1-r1.ebuild |
| 73 |
deleted file mode 100644 |
| 74 |
index 87ad4ca3a37..00000000000 |
| 75 |
--- a/sys-libs/gdbm/gdbm-1.18.1-r1.ebuild |
| 76 |
+++ /dev/null |
| 77 |
@@ -1,53 +0,0 @@ |
| 78 |
-# Copyright 1999-2021 Gentoo Authors |
| 79 |
-# Distributed under the terms of the GNU General Public License v2 |
| 80 |
- |
| 81 |
-EAPI=7 |
| 82 |
- |
| 83 |
-inherit autotools multilib-minimal |
| 84 |
- |
| 85 |
-DESCRIPTION="Standard GNU database libraries" |
| 86 |
-HOMEPAGE="https://www.gnu.org/software/gdbm/" |
| 87 |
-SRC_URI="mirror://gnu/gdbm/${P}.tar.gz" |
| 88 |
- |
| 89 |
-LICENSE="GPL-3" |
| 90 |
-SLOT="0/6" # libgdbm.so version |
| 91 |
-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" |
| 92 |
-IUSE="+berkdb nls +readline static-libs" |
| 93 |
- |
| 94 |
-DEPEND=" |
| 95 |
- readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] ) |
| 96 |
-" |
| 97 |
-RDEPEND="${DEPEND}" |
| 98 |
- |
| 99 |
-PATCHES=( |
| 100 |
- "${FILESDIR}"/${PN}-1.18.1-gcc-10.patch |
| 101 |
- "${FILESDIR}"/${PN}-1.18.1-gettext.patch #696838 |
| 102 |
-) |
| 103 |
- |
| 104 |
-src_prepare() { |
| 105 |
- default |
| 106 |
- eautoreconf |
| 107 |
-} |
| 108 |
- |
| 109 |
-multilib_src_configure() { |
| 110 |
- # gdbm doesn't appear to use either of these libraries |
| 111 |
- export ac_cv_lib_dbm_main=no ac_cv_lib_ndbm_main=no |
| 112 |
- |
| 113 |
- local myeconfargs=( |
| 114 |
- --includedir="${EPREFIX}"/usr/include/gdbm |
| 115 |
- $(use_enable berkdb libgdbm-compat) |
| 116 |
- $(use_enable nls) |
| 117 |
- $(use_enable static-libs static) |
| 118 |
- $(use_with readline) |
| 119 |
- ) |
| 120 |
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" |
| 121 |
-} |
| 122 |
- |
| 123 |
-multilib_src_install_all() { |
| 124 |
- einstalldocs |
| 125 |
- |
| 126 |
- if ! use static-libs ; then |
| 127 |
- find "${ED}" -name '*.la' -delete || die |
| 128 |
- fi |
| 129 |
- mv "${ED}"/usr/include/gdbm/gdbm.h "${ED}"/usr/include/ || die |
| 130 |
-} |
Archives