From f379e20f8e35ce1ddaf0669051b9c82c39a882ec Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Tue, 2 Nov 2021 09:42:47 +0100 Subject: gdbm: upgrade 1.19 -> 1.22 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-support/gdbm/files/ptest.patch | 18 +++++------ meta/recipes-support/gdbm/gdbm_1.19.bb | 46 ----------------------------- meta/recipes-support/gdbm/gdbm_1.22.bb | 45 ++++++++++++++++++++++++++++ 3 files changed, 54 insertions(+), 55 deletions(-) delete mode 100644 meta/recipes-support/gdbm/gdbm_1.19.bb create mode 100644 meta/recipes-support/gdbm/gdbm_1.22.bb diff --git a/meta/recipes-support/gdbm/files/ptest.patch b/meta/recipes-support/gdbm/files/ptest.patch index 1e67dbd554..187f09655d 100644 --- a/meta/recipes-support/gdbm/files/ptest.patch +++ b/meta/recipes-support/gdbm/files/ptest.patch @@ -1,4 +1,4 @@ -From 41448708e163c8ec1f980464e7dd6741db427c8a Mon Sep 17 00:00:00 2001 +From 8bea84a598b51a7ac7e50aa8f0f20857a9b6b07b Mon Sep 17 00:00:00 2001 From: Josep Puigdemont Date: Sun, 4 May 2014 16:02:07 +0200 Subject: [PATCH] Add install-ptest rules. @@ -13,12 +13,12 @@ Upstream-Status: Pending 2 files changed, 16 insertions(+) diff --git a/Makefile.am b/Makefile.am -index ecc03df..9fbbda5 100644 +index 25e200d..03d5ef0 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -55,3 +55,8 @@ ChangeLog: - awk -f $(top_srcdir)/git2chg.awk \ - -v append=$(top_srcdir)/$(prev_change_log) > ChangeLog; \ +@@ -64,3 +64,8 @@ ChangeLog: + mv ChangeLog.tmp ChangeLog; \ + rm -f ChangeLog.tmp; \ fi + +install-ptest: @@ -26,12 +26,12 @@ index ecc03df..9fbbda5 100644 + $(MAKE) -C $$subdir DESTDIR=$(DESTDIR)/$$subdir $@; \ + done diff --git a/tests/Makefile.am b/tests/Makefile.am -index dbe17dd..06f537f 100644 +index 337cbed..92ec3be 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am -@@ -169,3 +169,14 @@ EXTRA_DIST += \ - gdbmtool/base.exp\ - config/default.exp +@@ -139,3 +139,14 @@ d_creat_ce_LDADD = ../src/libgdbm.la ../compat/libgdbm_compat.la + + SUBDIRS = gdbmtool +buildtests: $(check_PROGRAMS) $(TESTSUITE) + diff --git a/meta/recipes-support/gdbm/gdbm_1.19.bb b/meta/recipes-support/gdbm/gdbm_1.19.bb deleted file mode 100644 index 1d1a0c8dd1..0000000000 --- a/meta/recipes-support/gdbm/gdbm_1.19.bb +++ /dev/null @@ -1,46 +0,0 @@ -SUMMARY = "Key/value database library with extensible hashing" -DESCRIPTION = "Library of database functions that use extensible hashing \ -and work similar to the standard UNIX dbm. These routines are provided \ -to a programmer needing to create and manipulate a hashed database." -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} \ - " diff --git a/meta/recipes-support/gdbm/gdbm_1.22.bb b/meta/recipes-support/gdbm/gdbm_1.22.bb new file mode 100644 index 0000000000..5cb12cd57c --- /dev/null +++ b/meta/recipes-support/gdbm/gdbm_1.22.bb @@ -0,0 +1,45 @@ +SUMMARY = "Key/value database library with extensible hashing" +DESCRIPTION = "Library of database functions that use extensible hashing \ +and work similar to the standard UNIX dbm. These routines are provided \ +to a programmer needing to create and manipulate a hashed database." +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[sha256sum] = "f366c823a6724af313b6bbe975b2809f9a157e5f6a43612a72949138d161d762" + +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