Browse Source

Merge pull request #11548 from commodo/libzdb-update

libs: libzdb: bump to version 3.2.1
lilik-openwrt-22.03
Hannu Nyman 5 years ago
committed by GitHub
parent
commit
9aefe04521
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 33 additions and 20 deletions
  1. +3
    -2
      libs/libzdb/Makefile
  2. +19
    -0
      libs/libzdb/patches/010-do-not-run-test-progs.patch
  3. +0
    -7
      libs/libzdb/patches/010-missing-header.patch
  4. +11
    -11
      libs/libzdb/patches/020-filterh-use-host-built-version.patch

+ 3
- 2
libs/libzdb/Makefile View File

@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=libzdb
PKG_VERSION:=3.2
PKG_VERSION:=3.2.1
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://www.tildeslash.com/libzdb/dist/
PKG_HASH:=005ddf4b29c6db622e16303298c2f914dfd82590111cea7cfd09b4acf46cf4f2
PKG_HASH:=b9a7b59a0a9f53dc87ce1b5a919f21b8cd6448c04a9157bccef1e3c1dffd3ff1
PKG_MAINTAINER:=Alexandru Ardelean <ardeleanalex@gmail.com>
PKG_LICENSE:=GPL-3.0-or-later
@ -22,6 +22,7 @@ PKG_LICENSE_FILES:=COPYING
PKG_INSTALL:=1
PKG_BUILD_PARALLEL:=1
PKG_BUILD_DEPENDS:=libzdb/host
PKG_FIXUP:=autoreconf
include $(INCLUDE_DIR)/uclibc++.mk
include $(INCLUDE_DIR)/package.mk


+ 19
- 0
libs/libzdb/patches/010-do-not-run-test-progs.patch View File

@ -0,0 +1,19 @@
--- a/configure.ac
+++ b/configure.ac
@@ -454,16 +454,6 @@ if test $ondarwin -eq 1; then
else
stdc="gnu"
fi
-AC_RUN_IFELSE(
-[AC_LANG_PROGRAM([], [dnl
- #ifdef __STDC_VERSION__
- #if __STDC_VERSION__ >= 201112L
- return 0;
- #endif
- #endif
- return 1;
- ])], [CFLAGS="$CFLAGS -std=${stdc}11"], [CFLAGS="$CFLAGS -std=${stdc}99"])
-AC_CHECK_HEADERS([stdint.h stdbool.h], [], [AC_MSG_ERROR([toolchain does not have C99 headers])])
# ---------------------------------------------------------------------------
# Outputs

+ 0
- 7
libs/libzdb/patches/010-missing-header.patch View File

@ -1,7 +0,0 @@
--- a/test/zdbpp.cpp
+++ b/test/zdbpp.cpp
@@ -1,3 +1,4 @@
+#include <cassert>
#include <iostream>
#include <string>
#include <map>

+ 11
- 11
libs/libzdb/patches/020-filterh-use-host-built-version.patch View File

@ -1,11 +1,11 @@
--- a/Makefile.in
+++ b/Makefile.in
@@ -476,7 +476,7 @@ DIST_SUBDIRS = . test
EXTRA_DIST = README AUTHORS CHANGES COPYING bootstrap doc test src tools config
LIBRARY_NAME = zdb
RE2CFLAGS = -b
-FILTERH = ./tools/bin/filterh
+FILTERH = $(STAGING_DIR_HOSTPKG)/bin/filterh
AM_CPPFLAGS = $(CPPFLAGS) $(DBCPPFLAGS) -Isrc -Isrc/util -Isrc/net \
-Isrc/db -Isrc/db/oracle -Isrc/exceptions
pkgconfigdir = $(libdir)/pkgconfig
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,7 +12,7 @@ LIBRARY_NAME = zdb
RE2C = @RE2C@
RE2CFLAGS = -b
-FILTERH = ./tools/bin/filterh
+FILTERH = $(STAGING_DIR_HOSTPKG)/bin/filterh
AM_CPPFLAGS = $(CPPFLAGS) $(DBCPPFLAGS)
AM_CPPFLAGS += -Isrc -Isrc/util -Isrc/net -Isrc/db -Isrc/db/oracle -Isrc/exceptions

Loading…
Cancel
Save