From 1e04e38101dd0a05b37c1b3ca9b4298ac01e75b6 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 10 May 2017 12:35:23 +0300 Subject: gdbm: update to 1.13 Rebase ptest.patch. Signed-off-by: Alexander Kanavin Signed-off-by: Ross Burton --- meta/recipes-support/gdbm/files/ptest.patch | 40 ++++++++++++++++++--------- meta/recipes-support/gdbm/gdbm_1.12.bb | 43 ----------------------------- meta/recipes-support/gdbm/gdbm_1.13.bb | 43 +++++++++++++++++++++++++++++ 3 files changed, 70 insertions(+), 56 deletions(-) delete mode 100644 meta/recipes-support/gdbm/gdbm_1.12.bb create mode 100644 meta/recipes-support/gdbm/gdbm_1.13.bb (limited to 'meta/recipes-support/gdbm') diff --git a/meta/recipes-support/gdbm/files/ptest.patch b/meta/recipes-support/gdbm/files/ptest.patch index 65236fb48b..b9461bec6b 100644 --- a/meta/recipes-support/gdbm/files/ptest.patch +++ b/meta/recipes-support/gdbm/files/ptest.patch @@ -1,30 +1,41 @@ -Add install-ptest rules. +From 4e4b70a4a3dcf1fdbee9e68bed3b62f42b197a3a 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. Signed-off-by: Josep Puigdemont Signed-off-by: Maxin B. John Upstream-Status: Pending -diff -ur a/Makefile.am b/Makefile.am ---- a/Makefile.am 2011-08-16 10:13:10.000000000 +0200 -+++ b/Makefile.am 2013-04-12 18:02:16.473715873 +0200 -@@ -31,3 +31,8 @@ - d=`date '+%d/%m/%Y'`; \ - sed 's|/\*@DIST_DATE@\*/|"'"$$d"'"|' $(srcdir)/src/version.c > \ - $(distdir)/src/version.c +--- + Makefile.am | 5 +++++ + tests/Makefile.am | 12 +++++++++++- + 2 files changed, 16 insertions(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index 4cdc734..24b99f0 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -45,3 +45,8 @@ ChangeLog: + awk -f $(top_srcdir)/git2chg.awk \ + -v append=$(top_srcdir)/$(prev_change_log) > ChangeLog; \ + fi + +install-ptest: + @for subdir in $(SUBDIRS); do \ + $(MAKE) -C $$subdir DESTDIR=$(DESTDIR)/$$subdir $@; \ + done -diff -ur a/tests/Makefile.am b/tests/Makefile.am ---- a/tests/Makefile.am 2011-11-11 19:39:42.000000000 +0100 -+++ b/tests/Makefile.am 2013-04-12 18:30:57.066301037 +0200 -@@ -132,4 +132,14 @@ +diff --git a/tests/Makefile.am b/tests/Makefile.am +index 3dbb580..22ffc44 100644 +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -130,4 +130,14 @@ dtfetch_LDADD = ../src/libgdbm.la ../compat/libgdbm_compat.la dtdel_LDADD = ../src/libgdbm.la ../compat/libgdbm_compat.la d_creat_ce_LDADD = ../src/libgdbm.la ../compat/libgdbm_compat.la +- +buildtests: $(check_PROGRAMS) $(TESTSUITE) - ++ +install-ptest: $(check_PROGRAMS) $(TESTSUITE) + @$(INSTALL) -d $(DESTDIR) + @for file in $^; do \ @@ -34,3 +45,6 @@ diff -ur a/tests/Makefile.am b/tests/Makefile.am + $(INSTALL_PROGRAM) $$file $(DESTDIR) ; \ + fi \ + done +-- +2.11.0 + diff --git a/meta/recipes-support/gdbm/gdbm_1.12.bb b/meta/recipes-support/gdbm/gdbm_1.12.bb deleted file mode 100644 index c380073c35..0000000000 --- a/meta/recipes-support/gdbm/gdbm_1.12.bb +++ /dev/null @@ -1,43 +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 \ - " - -SRC_URI[md5sum] = "9ce96ff4c99e74295ea19040931c8fb9" -SRC_URI[sha256sum] = "d97b2166ee867fd6ca5c022efee80702d6f30dd66af0e03ed092285c3af9bcea" - -inherit autotools gettext texinfo lib_package ptest - -# Needed for dbm python module -EXTRA_OECONF = "-enable-libgdbm-compat" - -# 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" - -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.13.bb b/meta/recipes-support/gdbm/gdbm_1.13.bb new file mode 100644 index 0000000000..4bbe147df5 --- /dev/null +++ b/meta/recipes-support/gdbm/gdbm_1.13.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] = "8929dcda2a8de3fd2367bdbf66769376" +SRC_URI[sha256sum] = "9d252cbd7d793f7b12bcceaddda98d257c14f4d1890d851c386c37207000a253" + +inherit autotools gettext texinfo lib_package ptest + +# Needed for dbm python module +EXTRA_OECONF = "-enable-libgdbm-compat" + +# 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" + +do_compile_ptest() { + oe_runmake -C tests buildtests +} + +PACKAGES =+ "${PN}-compat \ + " +FILES_${PN}-compat = "${libdir}/libgdbm_compat${SOLIBS} \ + " -- cgit 1.2.3-korg