From d96bb907652bd83abc1386555a93678dd64ced4f Mon Sep 17 00:00:00 2001 From: zhengruoqin Date: Tue, 5 Jan 2021 15:38:42 +0800 Subject: gdbm: upgrade 1.18.1 -> 1.19 gdbm-fix-link-failure-against-gcc-10.patch Removed since this is included in 1.19 Signed-off-by: Zheng Ruoqin Signed-off-by: Richard Purdie --- .../gdbm-fix-link-failure-against-gcc-10.patch | 47 ---------------------- meta/recipes-support/gdbm/gdbm_1.18.1.bb | 44 -------------------- meta/recipes-support/gdbm/gdbm_1.19.bb | 43 ++++++++++++++++++++ 3 files changed, 43 insertions(+), 91 deletions(-) delete mode 100644 meta/recipes-support/gdbm/files/gdbm-fix-link-failure-against-gcc-10.patch delete mode 100644 meta/recipes-support/gdbm/gdbm_1.18.1.bb create mode 100644 meta/recipes-support/gdbm/gdbm_1.19.bb (limited to 'meta/recipes-support') diff --git a/meta/recipes-support/gdbm/files/gdbm-fix-link-failure-against-gcc-10.patch b/meta/recipes-support/gdbm/files/gdbm-fix-link-failure-against-gcc-10.patch deleted file mode 100644 index c1580418dc..0000000000 --- a/meta/recipes-support/gdbm/files/gdbm-fix-link-failure-against-gcc-10.patch +++ /dev/null @@ -1,47 +0,0 @@ -From f993697af81c37df9c55e0ebedeb1b8b880506ae Mon Sep 17 00:00:00 2001 -From: Richard Leitner -Date: Tue, 5 May 2020 11:59:42 +0200 -Subject: [PATCH] gdbm: fix link failure against gcc-10 - -Copied from gentoo's solution at https://bugs.gentoo.org/show_bug.cgi?id=705898 -Original patch by Sergei Trofimovich - -Original description: - -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. - -Upstream-Status: Pending -Signed-off-by: Richard Leitner ---- - src/parseopt.c | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/src/parseopt.c b/src/parseopt.c -index 268e080..a4c8576 100644 ---- 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/meta/recipes-support/gdbm/gdbm_1.18.1.bb b/meta/recipes-support/gdbm/gdbm_1.18.1.bb deleted file mode 100644 index fbb1fe72d7..0000000000 --- a/meta/recipes-support/gdbm/gdbm_1.18.1.bb +++ /dev/null @@ -1,44 +0,0 @@ -SUMMARY = "Key/value database library with extensible hashing" -HOMEPAGE = "http://www.gnu.org/software/gdbm/" -SECTION = "libs" -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=241da1b9fe42e642cbb2c24d5e0c4d24" - - -SRC_URI = "${GNU_MIRROR}/gdbm/gdbm-${PV}.tar.gz \ - file://run-ptest \ - file://ptest.patch \ - file://gdbm-fix-link-failure-against-gcc-10.patch \ - " - -SRC_URI[md5sum] = "988dc82182121c7570e0cb8b4fcd5415" -SRC_URI[sha256sum] = "86e613527e5dba544e73208f42b78b7c022d4fa5a6d5498bf18c8d6f745b91dc" - -inherit autotools gettext texinfo lib_package ptest - -# Needed for dbm python module -EXTRA_OECONF = "--enable-libgdbm-compat --without-readline" - -# Stop presence of dbm/nbdm on the host contaminating builds -CACHED_CONFIGUREVARS += "ac_cv_lib_ndbm_main=no ac_cv_lib_dbm_main=no" - -BBCLASSEXTEND = "native nativesdk" - -do_install_append () { - # Create a symlink to ndbm.h and gdbm.h in include/gdbm to let other packages to find - # these headers - install -d ${D}${includedir}/gdbm - ln -sf ../ndbm.h ${D}/${includedir}/gdbm/ndbm.h - ln -sf ../gdbm.h ${D}/${includedir}/gdbm/gdbm.h -} - -RDEPENDS_${PN}-ptest += "diffutils ${PN}-bin" - -do_compile_ptest() { - oe_runmake -C tests buildtests -} - -PACKAGES =+ "${PN}-compat \ - " -FILES_${PN}-compat = "${libdir}/libgdbm_compat${SOLIBS} \ - " diff --git a/meta/recipes-support/gdbm/gdbm_1.19.bb b/meta/recipes-support/gdbm/gdbm_1.19.bb new file mode 100644 index 0000000000..1f390a4aa2 --- /dev/null +++ b/meta/recipes-support/gdbm/gdbm_1.19.bb @@ -0,0 +1,43 @@ +SUMMARY = "Key/value database library with extensible hashing" +HOMEPAGE = "http://www.gnu.org/software/gdbm/" +SECTION = "libs" +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=241da1b9fe42e642cbb2c24d5e0c4d24" + + +SRC_URI = "${GNU_MIRROR}/gdbm/gdbm-${PV}.tar.gz \ + file://run-ptest \ + file://ptest.patch \ + " + +SRC_URI[md5sum] = "aeb29c6a90350a4c959cd1df38cd0a7e" +SRC_URI[sha256sum] = "37ed12214122b972e18a0d94995039e57748191939ef74115b1d41d8811364bc" + +inherit autotools gettext texinfo lib_package ptest + +# Needed for dbm python module +EXTRA_OECONF = "--enable-libgdbm-compat --without-readline" + +# Stop presence of dbm/nbdm on the host contaminating builds +CACHED_CONFIGUREVARS += "ac_cv_lib_ndbm_main=no ac_cv_lib_dbm_main=no" + +BBCLASSEXTEND = "native nativesdk" + +do_install_append () { + # Create a symlink to ndbm.h and gdbm.h in include/gdbm to let other packages to find + # these headers + install -d ${D}${includedir}/gdbm + ln -sf ../ndbm.h ${D}/${includedir}/gdbm/ndbm.h + ln -sf ../gdbm.h ${D}/${includedir}/gdbm/gdbm.h +} + +RDEPENDS_${PN}-ptest += "diffutils ${PN}-bin" + +do_compile_ptest() { + oe_runmake -C tests buildtests +} + +PACKAGES =+ "${PN}-compat \ + " +FILES_${PN}-compat = "${libdir}/libgdbm_compat${SOLIBS} \ + " -- cgit 1.2.3-korg