diff options
author | Sergey A. Osokin <osa@FreeBSD.org> | 2020-01-28 15:11:34 +0000 |
---|---|---|
committer | Sergey A. Osokin <osa@FreeBSD.org> | 2020-01-28 15:11:34 +0000 |
commit | 4bee84503efe2beb7476dda64c68d0b644aed20a (patch) | |
tree | 66e561fa9b9aeb45ca31aada8669ea0b7e3e7b85 /www/nginx-devel/files | |
parent | - Update to 2.33.1 (diff) |
Commit missing patches for r524122.
Eagle eye notice from: joneum
No cookie for: osa
Notes
Notes:
svn path=/head/; revision=524489
Diffstat (limited to 'www/nginx-devel/files')
-rw-r--r-- | www/nginx-devel/files/extra-patch-nginx-link-function-config | 43 | ||||
-rw-r--r-- | www/nginx-devel/files/extra-patch-ngx_link_func_module.c | 11 |
2 files changed, 54 insertions, 0 deletions
diff --git a/www/nginx-devel/files/extra-patch-nginx-link-function-config b/www/nginx-devel/files/extra-patch-nginx-link-function-config new file mode 100644 index 000000000000..932ed09aefce --- /dev/null +++ b/www/nginx-devel/files/extra-patch-nginx-link-function-config @@ -0,0 +1,43 @@ +--- ../nginx-link-function-3.2.1/config.orig 2019-02-22 21:19:02.000000000 -0500 ++++ ../nginx-link-function-3.2.1/config 2020-01-24 10:29:53.871805000 -0500 +@@ -15,24 +15,6 @@ + #echo "#define NGINX_HTTP_HTTP_LINK_FUNC_VERSION \""$HTTP_LINK_FUNC_VERSION"\"" > $NGX_OBJS/ngx_vod_version.h + + +-# ngx_link_func_module headers +-# to Test this in order to share the header file to other client instead of just depend on it owns +-ngx_feature="ngx_http_link_func" +-ngx_feature_name="NGX_HAVE_HTTP_LINK_FUNC_HEADERS" +-ngx_feature_run=no +-ngx_feature_incs="#include <ngx_link_func_module.h>" +-ngx_feature_path= +-ngx_feature_libs= +-# ngx_feature_exit_if_not_found=yes +-ngx_feature_test="int ngx_link_func_module_current_version_=ngx_link_func_module_version_33;" +-. auto/feature +- +-if [ $ngx_found != yes ]; then +-echo "ngx_link_func_module.h not found in your system c header path, please copy latest ngx_link_func_module.h to your /usr/include or /usr/local/include or relavent header search path with read and write permission given." +-echo "e.g install -m 644 ../nginx-link-function/src/ngx_link_func_module.h /usr/local/include/" +-echo +-exit 1 +-else + cat $ngx_addon_dir/build_test_resources/sanity_test_raw_parse.t > $ngx_addon_dir/t/sanity.t + if [ $USE_THREADS = YES ]; then + cat $ngx_addon_dir/build_test_resources/sanity_test_aio_parse.t >> $ngx_addon_dir/t/sanity.t +@@ -42,13 +24,13 @@ + if [ $USE_THREADS = YES ]; then + cat $ngx_addon_dir/build_test_resources/sanity_test_subrequest_aio_parse.t >> $ngx_addon_dir/t/sanity.t + fi +-fi ++ + ABSOLUTE_NGX_LINKFUNC_CURRENT_PATH="$( cd "$ngx_addon_dir" ; pwd -P )" + if [ "$NGX_SYSTEM" = "Darwin" ]; then + clang -dynamiclib -o $ngx_addon_dir/t/liblinkfuntest.dylib -fPIC $ngx_addon_dir/build_test_resources/linkfuntest.c -Wl,-undefined,dynamic_lookup + sed -i '' "s@NGINX_HTTP_LINK_FUNC_TEST_LIB_PATH@$ABSOLUTE_NGX_LINKFUNC_CURRENT_PATH/t/liblinkfuntest.dylib@g" $ngx_addon_dir/t/sanity.t + else +-if [ "$NGX_PLATFORM" != win32 ]; then ++if [ "$NGX_PLATFORM" = win32 ]; then + cc -shared -o $ngx_addon_dir/t/liblinkfuntest.so -fPIC $ngx_addon_dir/build_test_resources/linkfuntest.c + sed -i "s@NGINX_HTTP_LINK_FUNC_TEST_LIB_PATH@$ABSOLUTE_NGX_LINKFUNC_CURRENT_PATH/t/liblinkfuntest.so@g" $ngx_addon_dir/t/sanity.t + fi diff --git a/www/nginx-devel/files/extra-patch-ngx_link_func_module.c b/www/nginx-devel/files/extra-patch-ngx_link_func_module.c new file mode 100644 index 000000000000..bbdbe6975ad5 --- /dev/null +++ b/www/nginx-devel/files/extra-patch-ngx_link_func_module.c @@ -0,0 +1,11 @@ +--- ../nginx-link-function-3.2.1/src/ngx_link_func_module.c.orig 2020-01-24 10:32:50.550797000 -0500 ++++ ../nginx-link-function-3.2.1/src/ngx_link_func_module.c 2020-01-24 10:33:17.135348000 -0500 +@@ -35,7 +35,7 @@ + #include <ngx_config.h> + #include <ngx_core.h> + #include <ngx_http.h> +-#include <ngx_link_func_module.h> ++#include "ngx_link_func_module.h" + + #define MODULE_NAME "nginx_link_function" + |