diff --git a/meta/recipes-support/gdbm/files/ptest.patch b/meta/recipes-support/gdbm/files/ptest.patch index 989f9524bc..5f4078101b 100644 --- a/meta/recipes-support/gdbm/files/ptest.patch +++ b/meta/recipes-support/gdbm/files/ptest.patch @@ -28,10 +28,10 @@ diff --git a/tests/Makefile.am b/tests/Makefile.am index eb071ac..9d14fe8 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am -@@ -145,3 +145,15 @@ d_creat_ce_LDADD = ../src/libgdbm.la ../compat/libgdbm_compat.la - t_wordwrap_LDADD = ../tools/libgdbmapp.a +@@ -150,3 +150,15 @@ + t_wordwrap_LDADD = ../tools/libgdbmapp.a @LTLIBINTL@ - SUBDIRS = gdbmtool + SUBDIRS = dejagnu + +buildtests: $(check_PROGRAMS) $(TESTSUITE) + @@ -42,5 +42,5 @@ index eb071ac..9d14fe8 100644 + $(INSTALL_PROGRAM) .libs/$$file $(DESTDIR)/$$file; \ + else \ + $(INSTALL_PROGRAM) $$file $(DESTDIR) ; \ -+ fi \ ++ fi \ + done diff --git a/meta/recipes-support/gdbm/gdbm_1.24.bb b/meta/recipes-support/gdbm/gdbm_1.26.bb similarity index 83% rename from meta/recipes-support/gdbm/gdbm_1.24.bb rename to meta/recipes-support/gdbm/gdbm_1.26.bb index f400462a7a..0c8c7ec690 100644 --- a/meta/recipes-support/gdbm/gdbm_1.24.bb +++ b/meta/recipes-support/gdbm/gdbm_1.26.bb @@ -12,7 +12,7 @@ SRC_URI = "${GNU_MIRROR}/gdbm/gdbm-${PV}.tar.gz \ file://ptest.patch \ " -SRC_URI[sha256sum] = "695e9827fdf763513f133910bc7e6cfdb9187943a4fec943e57449723d2b8dbf" +SRC_URI[sha256sum] = "6a24504a14de4a744103dcb936be976df6fbe88ccff26065e54c1c47946f4a5e" inherit autotools gettext texinfo lib_package ptest @@ -22,9 +22,6 @@ 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" -# Not yet ready for C23 -CFLAGS += "-std=gnu11" - BBCLASSEXTEND = "native nativesdk" do_install:append () { @@ -41,7 +38,5 @@ do_compile_ptest() { oe_runmake -C tests buildtests } -PACKAGES =+ "${PN}-compat \ - " -FILES:${PN}-compat = "${libdir}/libgdbm_compat${SOLIBS} \ - " +PACKAGES =+ "${PN}-compat" +FILES:${PN}-compat = "${libdir}/libgdbm_compat${SOLIBS}"