Skip to content

bugfix: ensured the 'pcre_version' symbol is preserved and undefined when PCRE is statically linked. #168

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

Closed
thibaultcha wants to merge 3 commits into from
Closed

bugfix: ensured the 'pcre_version' symbol is preserved and undefined when PCRE is statically linked. #168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8c4352f
api: bumped API version to 0.0.8.
thibaultcha Jul 11, 2019
5941306
bugfix: ensured the 'pcre_version()' symbol is preserved and undefine…
thibaultcha Jul 11, 2019
36d164f
[removeme] travis-ci: switched to the contributor's branch of lua-res…
thibaultcha Jul 11, 2019
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
4 changes: 2 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,12 @@ install:
- git clone https://github.com/openresty/mockeagain.git
- git clone https://github.com/openresty/test-nginx.git
- git clone -b v2.1-agentzh https://github.com/openresty/luajit2.git
- git clone https://github.com/openresty/lua-nginx-module.git ../lua-nginx-module
- git clone -b fix/static-libpcre https://github.com/thibaultcha/lua-nginx-module.git ../lua-nginx-module
- git clone https://github.com/openresty/echo-nginx-module.git ../echo-nginx-module
- git clone https://github.com/openresty/memc-nginx-module.git ../memc-nginx-module
- git clone https://github.com/openresty/headers-more-nginx-module.git ../headers-more-nginx-module
- git clone https://github.com/openresty/lua-resty-lrucache.git ../lua-resty-lrucache
- git clone https://github.com/openresty/lua-resty-core.git ../lua-resty-core
- git clone -b chore/bump-api https://github.com/thibaultcha/lua-resty-core.git ../lua-resty-core

script:
- sudo iptables -I OUTPUT 1 -p udp --dport 10086 -j REJECT
Expand Down
18 changes: 18 additions & 0 deletions config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -450,5 +450,23 @@ ngx_feature_test='struct sigaction act;

. auto/feature

if [ $PCRE != NO -a $PCRE != YES ]; then
# force pcre_version symbol to be undefined when PCRE is statically linked

ngx_feature="force undefined symbols (--undefined)"
ngx_feature_libs="-Wl,--undefined=printf"
ngx_feature_name=
ngx_feature_run=no
ngx_feature_incs="#include <stdio.h>"
ngx_feature_path=
ngx_feature_test='printf("hello");'

. auto/feature

if [ $ngx_found = yes ]; then
CORE_LIBS="$CORE_LIBS -Wl,--undefined=pcre_version"
fi
fi

#CFLAGS=$"$CFLAGS -DLUA_DEFAULT_PATH='\"/usr/local/openresty/lualib/?.lua\"'"
#CFLAGS=$"$CFLAGS -DLUA_DEFAULT_CPATH='\"/usr/local/openresty/lualib/?.so\"'"
2 changes: 1 addition & 1 deletion src/api/ngx_stream_lua_api.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
/* Public API for other Nginx modules */


#define ngx_stream_lua_version 7
#define ngx_stream_lua_version 8


typedef struct {
Expand Down