已开启
remove incomplete bdb #18
AtomGit-Bot创建于 2024年5月31日
remove incomplete bdb #18
已开启
从refs/pull/18/head合入到master
共 2 个文件变更+35-1
| @@ -0,0 +1,30 @@ | |||
| 1 | +From ffae1df27d6bb7154b2ba76fb0521d6291dc6484 Mon Sep 17 00:00:00 2001 | ||
| 2 | +From: zhangxianting <zhangxianting@uniontech.com> | ||
| 3 | +Date: Fri, 31 May 2024 17:58:13 +0800 | ||
| 4 | +Subject: [PATCH] set default default_storage_options when undeine | ||
| 5 | + HAVE_BDB_HASH | ||
| 6 | + | ||
| 7 | +--- | ||
| 8 | + utils/rdfproc.c | 5 ++++- | ||
| 9 | + 1 file changed, 4 insertions(+), 1 deletion(-) | ||
| 10 | + | ||
| 11 | +diff --git a/utils/rdfproc.c b/utils/rdfproc.c | ||
| 12 | +index dc5b1e6..d515641 100644 | ||
| 13 | +--- a/utils/rdfproc.c | ||
| 14 | ++++ b/utils/rdfproc.c | ||
| 15 | +@@ -165,8 +165,11 @@ static struct option long_options[] = | ||
| 16 | + static const char *title_format_string="Redland RDF processor utility %s\n"; | ||
| 17 | + | ||
| 18 | + static const char *default_storage_name="hashes"; | ||
| 19 | ++#ifdef HAVE_BDB_HASH | ||
| 20 | + static const char *default_storage_options="hash-type='bdb',dir='.'"; | ||
| 21 | +- | ||
| 22 | ++#else | ||
| 23 | ++static const char *default_storage_options="hash-type='memory'"; | ||
| 24 | ++#endif | ||
| 25 | + | ||
| 26 | + static int REDLAND_CALLBACK_STDCALL | ||
| 27 | + log_handler(void *user_data, librdf_log_message *message) | ||
| 28 | +-- | ||
| 29 | +2.43.0 | ||
| 30 | + | ||
| @@ -1,6 +1,6 @@ | |||
| 1 | Name: redland | 1 | Name: redland |
| 2 | Version: 1.0.17 | 2 | Version: 1.0.17 |
| 3 | -Release: 21 | 3 | +Release: 22 |
| 4 | Summary: RDF iprovids support for the Resource Description Framework. | 4 | Summary: RDF iprovids support for the Resource Description Framework. |
| 5 | License: LGPLv2+ or ASL 2.0 | 5 | License: LGPLv2+ or ASL 2.0 |
| 6 | URL: http://librdf.org/ | 6 | URL: http://librdf.org/ |
| @@ -8,6 +8,7 @@ Source0: http://download.librdf.org/source/%{name}-%{version}.tar.gz | |||
| 8 | 8 | ||
| 9 | Patch0: 0001-Fix-unreachable-codes-break-after-return-mostly.patch | 9 | Patch0: 0001-Fix-unreachable-codes-break-after-return-mostly.patch |
| 10 | Patch6000: 0001-Add-Wunreachable-code.patch | 10 | Patch6000: 0001-Add-Wunreachable-code.patch |
| 11 | +Patch7000: 0001-set-default-default_storage_options-when-undeine-HAV.patch | ||
| 11 | 12 | ||
| 12 | BuildRequires: curl-devel gcc-c++ libtool-ltdl-devel libxml2-devel >= 2.4.0 mysql-devel | 13 | BuildRequires: curl-devel gcc-c++ libtool-ltdl-devel libxml2-devel >= 2.4.0 mysql-devel |
| 13 | BuildRequires: perl-interpreter postgresql-devel raptor2-devel rasqal-devel >= 0.9.26 | 14 | BuildRequires: perl-interpreter postgresql-devel raptor2-devel rasqal-devel >= 0.9.26 |
| @@ -113,6 +114,9 @@ make check | |||
| 113 | %{_mandir}/man3/redland.3* | 114 | %{_mandir}/man3/redland.3* |
| 114 | 115 | ||
| 115 | %changelog | 116 | %changelog |
| 117 | +* Fri May 31 2024 zhangxianting <zhangxianting@uniontech.com> - 1.0.17-22 | ||
| 118 | +- remove incomplete bdb | ||
| 119 | + | ||
| 116 | * Tue Mar 19 2024 xu_ping <707078654@qq.com> - 1.0.17-21 | 120 | * Tue Mar 19 2024 xu_ping <707078654@qq.com> - 1.0.17-21 |
| 117 | - drop libdb dependency from redland | 121 | - drop libdb dependency from redland |
| 118 | 122 | ||