Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore(deps): bump lua-resty-lmdb to 1.3.0 #11227

Merged
merged 4 commits into from
Jul 14, 2023
Merged

chore(deps): bump lua-resty-lmdb to 1.3.0 #11227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6903a92
lmdb 1.3.0
chronolaw Jul 14, 2023
b819622
changelog
chronolaw Jul 14, 2023
7d0c1a6
try to fix patch
chronolaw Jul 14, 2023
a880b56
try to fix patch
chronolaw Jul 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .requirements
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ OPENSSL=3.1.1
PCRE=8.45

LUA_KONG_NGINX_MODULE=4d19e8d19c6dbc07eba5cf6f5ebacad95266f928 # 0.6.0
LUA_RESTY_LMDB=222546680e9c31a9b97733b5db595688a521cd1a # 1.1.0
LUA_RESTY_LMDB=951926f20b674a0622236a0e331b359df1c02d9b # 1.3.0
LUA_RESTY_EVENTS=2f6fa23eb3d0b76a3b35fd915711200e90bc6732 # 0.1.6
LUA_RESTY_WEBSOCKET=60eafc3d7153bceb16e6327074e0afc3d94b1316 # 0.4.0
ATC_ROUTER=72cc8fddeac024c54c9c1fa5a25c28a72d79080e # 1.1.0
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,8 @@
[#11181](https://github.com/Kong/kong/pull/11181)
- Bumped atc-router from 1.0.5 to 1.1.0
[#10100](https://github.com/Kong/kong/pull/10100)
- Bumped lua-resty-lmdb from 1.1.0 to 1.3.0
[#11227](https://github.com/Kong/kong/pull/11227)

## 3.3.0

Expand Down
18 changes: 8 additions & 10 deletions build/openresty/lua-resty-lmdb-cross.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ diff --git a/config b/config
index 126c78c..1f0b2aa 100644
--- a/config
+++ b/config
@@ -5,6 +5,8 @@ ngx_module_incs="$ngx_addon_dir/lmdb/libraries/liblmdb $ngx_addon_dir/src"
@@ -7,6 +7,8 @@ ngx_module_incs="$ngx_addon_dir/lmdb/libraries/liblmdb $ngx_addon_dir/src"

. auto/module

Expand All @@ -21,17 +21,17 @@ index 14d8cc2..cf17251 100644
@@ -3,7 +3,7 @@ cat <<EOF >>$NGX_MAKEFILE

$ngx_addon_dir/lmdb/libraries/liblmdb/liblmdb.a:
echo "Building liblmdb"; \\
- \$(MAKE) -C $ngx_addon_dir/lmdb/libraries/liblmdb; \\
+ \$(MAKE) -C $ngx_addon_dir/lmdb/libraries/liblmdb CC=\$(CC) AR=\$(AR); \\
echo "Finished building liblmdb"
echo "Building liblmdb"; \\
- \$(MAKE) -C $ngx_addon_dir/lmdb/libraries/liblmdb; \\
+ \$(MAKE) -C $ngx_addon_dir/lmdb/libraries/liblmdb CC=\$(CC) AR=\$(AR); \\
echo "Finished building liblmdb"

EOF
diff --git a/libraries/liblmdb/Makefile b/libraries/liblmdb/Makefile
index c252b50..1054432 100644
--- a/lmdb/libraries/liblmdb/Makefile
+++ b/lmdb/libraries/liblmdb/Makefile
@@ -18,13 +18,13 @@
@@ -18,11 +18,11 @@
# There may be other macros in mdb.c of interest. You should
# read mdb.c before changing any of them.
#
Expand All @@ -43,9 +43,7 @@ index c252b50..1054432 100644
THREADS = -pthread
OPT = -O2 -g
-CFLAGS = $(THREADS) $(OPT) $(W) $(XCFLAGS)
-LDFLAGS = $(THREADS)
+CFLAGS += $(THREADS) $(OPT) $(W) $(XCFLAGS)
+LDFLAGS += $(THREADS)
LDLIBS =
SOLIBS =
LDLIBS =
SOLIBS =
SOEXT = .so