mirror of
https://github.com/coolsnowwolf/packages.git
synced 2025-05-01 23:13:13 +08:00
nginx: bump to 1.21.1 and improve makefile
- Bump to 1.21.1 - Rework makefile to fix bad make refresh - Refresh patch Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
This commit is contained in:
parent
6e2662ac56
commit
87d978f5e6
@ -8,12 +8,12 @@
|
|||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=nginx
|
PKG_NAME:=nginx
|
||||||
PKG_VERSION:=1.19.6
|
PKG_VERSION:=1.21.1
|
||||||
PKG_RELEASE:=2
|
PKG_RELEASE:=1
|
||||||
|
|
||||||
PKG_SOURCE:=nginx-$(PKG_VERSION).tar.gz
|
PKG_SOURCE:=nginx-$(PKG_VERSION).tar.gz
|
||||||
PKG_SOURCE_URL:=https://nginx.org/download/
|
PKG_SOURCE_URL:=https://nginx.org/download/
|
||||||
PKG_HASH:=b11195a02b1d3285ddf2987e02c6b6d28df41bb1b1dd25f33542848ef4fc33b5
|
PKG_HASH:=68ba0311342115163a0354cad34f90c05a7e8bf689dc498abf07899eda155560
|
||||||
|
|
||||||
PKG_MAINTAINER:=Thomas Heil <heil@terminal-consulting.de> \
|
PKG_MAINTAINER:=Thomas Heil <heil@terminal-consulting.de> \
|
||||||
Ansuel Smith <ansuelsmth@gmail.com>
|
Ansuel Smith <ansuelsmth@gmail.com>
|
||||||
@ -387,163 +387,187 @@ endef
|
|||||||
|
|
||||||
Package/nginx-all-module/prerm = $(Package/nginx-ssl/prerm)
|
Package/nginx-all-module/prerm = $(Package/nginx-ssl/prerm)
|
||||||
|
|
||||||
define Build/Prepare
|
define Download/nginx-headers-more
|
||||||
$(Build/Prepare/Default)
|
|
||||||
$(Prepare/nginx-naxsi)
|
|
||||||
$(Prepare/lua-nginx)
|
|
||||||
$(Prepare/nginx-brotli)
|
|
||||||
$(Prepare/nginx-headers-more)
|
|
||||||
$(Prepare/nginx-rtmp)
|
|
||||||
$(Prepare/nginx-ts)
|
|
||||||
$(Prepare/nginx-dav-ext-module)
|
|
||||||
$(Prepare/nginx-ubus-module)
|
|
||||||
endef
|
|
||||||
|
|
||||||
|
|
||||||
ifeq ($(CONFIG_NGINX_HEADERS_MORE),y)
|
|
||||||
define Download/nginx-headers-more
|
|
||||||
VERSION:=a9f7c7e86cc7441d04e2f11f01c2e3a9c4b0301d
|
VERSION:=a9f7c7e86cc7441d04e2f11f01c2e3a9c4b0301d
|
||||||
SUBDIR:=nginx-headers-more
|
SUBDIR:=nginx-headers-more
|
||||||
FILE:=headers-more-nginx-module-$$(VERSION).tar.xz
|
FILE:=headers-more-nginx-module-$$(VERSION).tar.xz
|
||||||
URL:=https://github.com/openresty/headers-more-nginx-module.git
|
URL:=https://github.com/openresty/headers-more-nginx-module.git
|
||||||
MIRROR_HASH:=ce0b9996ecb2cff790831644d6ab1adc087aa2771d77d3931c06246d11bc59fd
|
MIRROR_HASH:=ce0b9996ecb2cff790831644d6ab1adc087aa2771d77d3931c06246d11bc59fd
|
||||||
PROTO:=git
|
PROTO:=git
|
||||||
endef
|
endef
|
||||||
$(eval $(call Download,nginx-headers-more))
|
|
||||||
|
|
||||||
define Prepare/nginx-headers-more
|
define Prepare/nginx-headers-more
|
||||||
$(eval $(Download/nginx-headers-more))
|
$(eval $(Download/nginx-headers-more))
|
||||||
xzcat $(DL_DIR)/$(FILE) | tar -C $(PKG_BUILD_DIR) $(TAR_OPTIONS)
|
xzcat $(DL_DIR)/$(FILE) | tar -C $(PKG_BUILD_DIR) $(TAR_OPTIONS)
|
||||||
endef
|
endef
|
||||||
endif
|
|
||||||
|
|
||||||
|
define Download/nginx-brotli
|
||||||
ifeq ($(CONFIG_NGINX_HTTP_BROTLI),y)
|
|
||||||
define Download/nginx-brotli
|
|
||||||
VERSION:=e505dce68acc190cc5a1e780a3b0275e39f160ca
|
VERSION:=e505dce68acc190cc5a1e780a3b0275e39f160ca
|
||||||
SUBDIR:=nginx-brotli
|
SUBDIR:=nginx-brotli
|
||||||
FILE:=ngx-brotli-module-$$(VERSION).tar.xz
|
FILE:=ngx-brotli-module-$$(VERSION).tar.xz
|
||||||
URL:=https://github.com/google/ngx_brotli.git
|
URL:=https://github.com/google/ngx_brotli.git
|
||||||
MIRROR_HASH:=04847f11ef808fed50f44b2af0ef3abf59ff0ffc06dfc7394d9ab51d53fef31f
|
MIRROR_HASH:=04847f11ef808fed50f44b2af0ef3abf59ff0ffc06dfc7394d9ab51d53fef31f
|
||||||
PROTO:=git
|
PROTO:=git
|
||||||
endef
|
endef
|
||||||
$(eval $(call Download,nginx-brotli))
|
|
||||||
|
|
||||||
define Prepare/nginx-brotli
|
define Prepare/nginx-brotli
|
||||||
$(eval $(Download/nginx-brotli))
|
$(eval $(Download/nginx-brotli))
|
||||||
xzcat $(DL_DIR)/$(FILE) | tar -C $(PKG_BUILD_DIR) $(TAR_OPTIONS)
|
xzcat $(DL_DIR)/$(FILE) | tar -C $(PKG_BUILD_DIR) $(TAR_OPTIONS)
|
||||||
endef
|
endef
|
||||||
endif
|
|
||||||
|
|
||||||
|
define Download/nginx-rtmp
|
||||||
ifeq ($(CONFIG_NGINX_RTMP_MODULE),y)
|
|
||||||
define Download/nginx-rtmp
|
|
||||||
VERSION:=f0ea62342a4eca504b311cd5df910d026c3ea4cf
|
VERSION:=f0ea62342a4eca504b311cd5df910d026c3ea4cf
|
||||||
SUBDIR:=nginx-rtmp
|
SUBDIR:=nginx-rtmp
|
||||||
FILE:=ngx-rtmp-module-$$(VERSION).tar.xz
|
FILE:=ngx-rtmp-module-$$(VERSION).tar.xz
|
||||||
URL:=https://github.com/ut0mt8/nginx-rtmp-module.git
|
URL:=https://github.com/ut0mt8/nginx-rtmp-module.git
|
||||||
MIRROR_HASH:=d3f58066f0f858ed79f7f2b0c9b89de2ccc512c94ab3d0625f6dcff3df0b72c1
|
MIRROR_HASH:=d3f58066f0f858ed79f7f2b0c9b89de2ccc512c94ab3d0625f6dcff3df0b72c1
|
||||||
PROTO:=git
|
PROTO:=git
|
||||||
endef
|
endef
|
||||||
$(eval $(call Download,nginx-rtmp))
|
|
||||||
|
|
||||||
define Prepare/nginx-rtmp
|
define Prepare/nginx-rtmp
|
||||||
$(eval $(Download/nginx-rtmp))
|
$(eval $(Download/nginx-rtmp))
|
||||||
xzcat $(DL_DIR)/$(FILE) | tar -C $(PKG_BUILD_DIR) $(TAR_OPTIONS)
|
xzcat $(DL_DIR)/$(FILE) | tar -C $(PKG_BUILD_DIR) $(TAR_OPTIONS)
|
||||||
$(call PatchDir,$(PKG_BUILD_DIR)/nginx-rtmp,./patches-rtmp-nginx)
|
endef
|
||||||
endef
|
|
||||||
endif
|
|
||||||
|
|
||||||
|
define Download/nginx-ts
|
||||||
ifeq ($(CONFIG_NGINX_TS_MODULE),y)
|
|
||||||
define Download/nginx-ts
|
|
||||||
VERSION:=ef2f874d95cc75747eb625a292524a702aefb0fd
|
VERSION:=ef2f874d95cc75747eb625a292524a702aefb0fd
|
||||||
SUBDIR:=nginx-ts
|
SUBDIR:=nginx-ts
|
||||||
FILE:=ngx-ts-module-$$(VERSION).tar.xz
|
FILE:=ngx-ts-module-$$(VERSION).tar.xz
|
||||||
URL:=https://github.com/arut/nginx-ts-module.git
|
URL:=https://github.com/arut/nginx-ts-module.git
|
||||||
MIRROR_HASH:=73938950bb286d40d9e54b0994d1a63827340c1156c72eb04d7041b25b20ec18
|
MIRROR_HASH:=73938950bb286d40d9e54b0994d1a63827340c1156c72eb04d7041b25b20ec18
|
||||||
PROTO:=git
|
PROTO:=git
|
||||||
endef
|
endef
|
||||||
$(eval $(call Download,nginx-ts))
|
|
||||||
|
|
||||||
define Prepare/nginx-ts
|
define Prepare/nginx-ts
|
||||||
$(eval $(Download/nginx-ts))
|
$(eval $(Download/nginx-ts))
|
||||||
xzcat $(DL_DIR)/$(FILE) | tar -C $(PKG_BUILD_DIR) $(TAR_OPTIONS)
|
xzcat $(DL_DIR)/$(FILE) | tar -C $(PKG_BUILD_DIR) $(TAR_OPTIONS)
|
||||||
endef
|
endef
|
||||||
endif
|
|
||||||
|
|
||||||
|
define Download/nginx-naxsi
|
||||||
ifeq ($(CONFIG_NGINX_NAXSI),y)
|
|
||||||
define Download/nginx-naxsi
|
|
||||||
VERSION:=951123ad456bdf5ac94e8d8819342fe3d49bc002
|
VERSION:=951123ad456bdf5ac94e8d8819342fe3d49bc002
|
||||||
SUBDIR:=nginx-naxsi
|
SUBDIR:=nginx-naxsi
|
||||||
FILE:=nginx-naxsi-module-$$(VERSION).tar.xz
|
FILE:=nginx-naxsi-module-$$(VERSION).tar.xz
|
||||||
URL:=https://github.com/nbs-system/naxsi.git
|
URL:=https://github.com/nbs-system/naxsi.git
|
||||||
MIRROR_HASH:=c734cae19a596affadd62a2df1b58d3df8d1364093a4e80a7cd1ab4555963535
|
MIRROR_HASH:=c734cae19a596affadd62a2df1b58d3df8d1364093a4e80a7cd1ab4555963535
|
||||||
PROTO:=git
|
PROTO:=git
|
||||||
endef
|
endef
|
||||||
$(eval $(call Download,nginx-naxsi))
|
|
||||||
|
|
||||||
define Prepare/nginx-naxsi
|
define Prepare/nginx-naxsi
|
||||||
$(eval $(Download/nginx-naxsi))
|
$(eval $(Download/nginx-naxsi))
|
||||||
xzcat $(DL_DIR)/$(FILE) | tar -C $(PKG_BUILD_DIR) $(TAR_OPTIONS)
|
xzcat $(DL_DIR)/$(FILE) | tar -C $(PKG_BUILD_DIR) $(TAR_OPTIONS)
|
||||||
endef
|
endef
|
||||||
endif
|
|
||||||
|
|
||||||
|
define Download/lua-nginx
|
||||||
ifeq ($(CONFIG_NGINX_LUA),y)
|
|
||||||
define Download/lua-nginx
|
|
||||||
VERSION:=e94f2e5d64daa45ff396e262d8dab8e56f5f10e0
|
VERSION:=e94f2e5d64daa45ff396e262d8dab8e56f5f10e0
|
||||||
SUBDIR:=lua-nginx
|
SUBDIR:=lua-nginx
|
||||||
FILE:=lua-nginx-module-$$(VERSION).tar.xz
|
FILE:=lua-nginx-module-$$(VERSION).tar.xz
|
||||||
URL:=https://github.com/openresty/lua-nginx-module.git
|
URL:=https://github.com/openresty/lua-nginx-module.git
|
||||||
MIRROR_HASH:=27729921964f066d97e99c263da153b34622a2f4b811114e4c3ee61c6fc71395
|
MIRROR_HASH:=27729921964f066d97e99c263da153b34622a2f4b811114e4c3ee61c6fc71395
|
||||||
PROTO:=git
|
PROTO:=git
|
||||||
endef
|
endef
|
||||||
$(eval $(call Download,lua-nginx))
|
|
||||||
|
|
||||||
define Prepare/lua-nginx
|
define Prepare/lua-nginx
|
||||||
$(eval $(Download/lua-nginx))
|
$(eval $(Download/lua-nginx))
|
||||||
xzcat $(DL_DIR)/$(FILE) | tar -C $(PKG_BUILD_DIR) $(TAR_OPTIONS)
|
xzcat $(DL_DIR)/$(FILE) | tar -C $(PKG_BUILD_DIR) $(TAR_OPTIONS)
|
||||||
$(call PatchDir,$(PKG_BUILD_DIR),./patches-lua-nginx)
|
endef
|
||||||
endef
|
|
||||||
endif
|
|
||||||
|
|
||||||
|
define Download/nginx-dav-ext-module
|
||||||
ifeq ($(CONFIG_NGINX_DAV),y)
|
|
||||||
define Download/nginx-dav-ext-module
|
|
||||||
VERSION:=f5e30888a256136d9c550bf1ada77d6ea78a48af
|
VERSION:=f5e30888a256136d9c550bf1ada77d6ea78a48af
|
||||||
SUBDIR:=nginx-dav-ext-module
|
SUBDIR:=nginx-dav-ext-module
|
||||||
FILE:=nginx-dav-ext-module-$$(VERSION).tar.xz
|
FILE:=nginx-dav-ext-module-$$(VERSION).tar.xz
|
||||||
URL:=https://github.com/arut/nginx-dav-ext-module.git
|
URL:=https://github.com/arut/nginx-dav-ext-module.git
|
||||||
MIRROR_HASH:=70bb4c3907f4b783605500ba494e907aede11f8505702e370012abb3c177dc5b
|
MIRROR_HASH:=70bb4c3907f4b783605500ba494e907aede11f8505702e370012abb3c177dc5b
|
||||||
PROTO:=git
|
PROTO:=git
|
||||||
endef
|
endef
|
||||||
$(eval $(call Download,nginx-dav-ext-module))
|
|
||||||
|
|
||||||
define Prepare/nginx-dav-ext-module
|
define Prepare/nginx-dav-ext-module
|
||||||
$(eval $(Download/nginx-dav-ext-module))
|
$(eval $(Download/nginx-dav-ext-module))
|
||||||
xzcat $(DL_DIR)/$(FILE) | tar -C $(PKG_BUILD_DIR) $(TAR_OPTIONS)
|
xzcat $(DL_DIR)/$(FILE) | tar -C $(PKG_BUILD_DIR) $(TAR_OPTIONS)
|
||||||
$(call PatchDir,$(PKG_BUILD_DIR),./patches-dav-nginx)
|
endef
|
||||||
endef
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifeq ($(CONFIG_NGINX_UBUS),y)
|
define Download/nginx-ubus-module
|
||||||
define Download/nginx-ubus-module
|
|
||||||
VERSION:=b2d7260dcb428b2fb65540edb28d7538602b4a26
|
VERSION:=b2d7260dcb428b2fb65540edb28d7538602b4a26
|
||||||
SUBDIR:=nginx-ubus-module
|
SUBDIR:=nginx-ubus-module
|
||||||
FILE:=nginx-ubus-module-$$(VERSION).tar.xz
|
FILE:=nginx-ubus-module-$$(VERSION).tar.xz
|
||||||
URL:=https://github.com/Ansuel/nginx-ubus-module.git
|
URL:=https://github.com/Ansuel/nginx-ubus-module.git
|
||||||
MIRROR_HASH:=472cef416d25effcac66c85417ab6596e634a7a64d45b709bb090892d567553c
|
MIRROR_HASH:=472cef416d25effcac66c85417ab6596e634a7a64d45b709bb090892d567553c
|
||||||
PROTO:=git
|
PROTO:=git
|
||||||
endef
|
endef
|
||||||
$(eval $(call Download,nginx-ubus-module))
|
|
||||||
|
|
||||||
define Prepare/nginx-ubus-module
|
define Prepare/nginx-ubus-module
|
||||||
$(eval $(Download/nginx-ubus-module))
|
$(eval $(Download/nginx-ubus-module))
|
||||||
xzcat $(DL_DIR)/$(FILE) | tar -C $(PKG_BUILD_DIR) $(TAR_OPTIONS)
|
xzcat $(DL_DIR)/$(FILE) | tar -C $(PKG_BUILD_DIR) $(TAR_OPTIONS)
|
||||||
endef
|
endef
|
||||||
|
|
||||||
|
define Build/Patch
|
||||||
|
$(if $(QUILT),rm -rf $(PKG_BUILD_DIR)/patches; mkdir -p $(PKG_BUILD_DIR)/patches)
|
||||||
|
$(call PatchDir,$(PKG_BUILD_DIR),$(PATCH_DIR)/nginx,nginx/)
|
||||||
|
ifneq "$(or $(CONFIG_NGINX_DAV),$(QUILT))" ""
|
||||||
|
$(call PatchDir,$(PKG_BUILD_DIR),$(PATCH_DIR)/dav-nginx,dav-nginx/)
|
||||||
endif
|
endif
|
||||||
|
ifneq "$(or $(CONFIG_NGINX_LUA),$(QUILT))" ""
|
||||||
|
$(call PatchDir,$(PKG_BUILD_DIR),$(PATCH_DIR)/lua-nginx,lua-nginx/)
|
||||||
|
endif
|
||||||
|
ifneq "$(or $(CONFIG_NGINX_RTMP_MODULE),$(QUILT))" ""
|
||||||
|
$(call PatchDir,$(PKG_BUILD_DIR),$(PATCH_DIR)/rtmp-nginx,rtmp-nginx/)
|
||||||
|
endif
|
||||||
|
$(if $(QUILT),touch $(PKG_BUILD_DIR)/.quilt_used)
|
||||||
|
endef
|
||||||
|
|
||||||
|
define Quilt/Refresh/Package
|
||||||
|
$(call Quilt/RefreshDir,$(PKG_BUILD_DIR),$(PATCH_DIR)/nginx,nginx/)
|
||||||
|
$(call Quilt/RefreshDir,$(PKG_BUILD_DIR),$(PATCH_DIR)/dav-nginx,dav-nginx/)
|
||||||
|
$(call Quilt/RefreshDir,$(PKG_BUILD_DIR),$(PATCH_DIR)/lua-nginx,lua-nginx/)
|
||||||
|
$(call Quilt/RefreshDir,$(PKG_BUILD_DIR),$(PATCH_DIR)/rtmp-nginx,rtmp-nginx/)
|
||||||
|
endef
|
||||||
|
|
||||||
|
define Build/Prepare
|
||||||
|
rm -rf $(PKG_BUILD_DIR)
|
||||||
|
mkdir -p $(PKG_BUILD_DIR)
|
||||||
|
$(PKG_UNPACK)
|
||||||
|
|
||||||
|
ifeq ($(CONFIG_NGINX_NAXSI),y)
|
||||||
|
$(eval $(call Download,nginx-naxsi))
|
||||||
|
$(Prepare/nginx-naxsi)
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifneq "$(or $(CONFIG_NGINX_LUA),$(QUILT))" ""
|
||||||
|
$(eval $(call Download,lua-nginx))
|
||||||
|
$(Prepare/lua-nginx)
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifeq ($(CONFIG_NGINX_HTTP_BROTLI),y)
|
||||||
|
$(eval $(call Download,nginx-brotli))
|
||||||
|
$(Prepare/nginx-brotli)
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifeq ($(CONFIG_NGINX_HEADERS_MORE),y)
|
||||||
|
$(eval $(call Download,nginx-headers-more))
|
||||||
|
$(Prepare/nginx-headers-more)
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifneq "$(or $(CONFIG_NGINX_RTMP_MODULE),$(QUILT))" ""
|
||||||
|
$(eval $(call Download,nginx-rtmp))
|
||||||
|
$(Prepare/nginx-rtmp)
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifeq ($(CONFIG_NGINX_TS_MODULE),y)
|
||||||
|
$(eval $(call Download,nginx-ts))
|
||||||
|
$(Prepare/nginx-ts)
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifneq "$(or $(CONFIG_NGINX_DAV),$(QUILT))" ""
|
||||||
|
$(eval $(call Download,nginx-dav-ext-module))
|
||||||
|
$(Prepare/nginx-dav-ext-module)
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifeq ($(CONFIG_NGINX_UBUS),y)
|
||||||
|
$(eval $(call Download,nginx-ubus-module))
|
||||||
|
$(Prepare/nginx-ubus-module)
|
||||||
|
endif
|
||||||
|
|
||||||
|
$(Build/Patch)
|
||||||
|
endef
|
||||||
|
|
||||||
$(eval $(call BuildPackage,nginx-ssl))
|
$(eval $(call BuildPackage,nginx-ssl))
|
||||||
$(eval $(call BuildPackage,nginx-all-module))
|
$(eval $(call BuildPackage,nginx-all-module))
|
||||||
|
@ -1,14 +1,14 @@
|
|||||||
--- a/nginx-dav-ext-module/config 2018-12-17 08:45:12.000000000 +0000
|
--- a/nginx-dav-ext-module/config
|
||||||
+++ b/nginx-dav-ext-module/config 2019-10-11 13:49:41.446919258 +0000
|
+++ b/nginx-dav-ext-module/config
|
||||||
@@ -8,9 +8,8 @@ ngx_module_name=ngx_http_dav_ext_module
|
@@ -8,9 +8,8 @@ ngx_module_name=ngx_http_dav_ext_module
|
||||||
# building nginx with the xslt module, in which case libxslt will
|
# building nginx with the xslt module, in which case libxslt will
|
||||||
# be linked anyway. In other cases libxslt is just redundant.
|
# be linked anyway. In other cases libxslt is just redundant.
|
||||||
# If that's a big deal, libxml2 can be linked directly:
|
# If that's a big deal, libxml2 can be linked directly:
|
||||||
-# ngx_module_libs=-lxml2
|
-# ngx_module_libs=-lxml2
|
||||||
|
-
|
||||||
|
-ngx_module_libs=LIBXSLT
|
||||||
+ngx_module_libs=-lxml2
|
+ngx_module_libs=-lxml2
|
||||||
+ngx_module_incs=$(pkg-config --cflags-only-I libxml-2.0 | sed 's/^-I//')
|
+ngx_module_incs=$(pkg-config --cflags-only-I libxml-2.0 | sed 's/^-I//')
|
||||||
|
|
||||||
-ngx_module_libs=LIBXSLT
|
|
||||||
-
|
|
||||||
ngx_module_srcs="$ngx_addon_dir/ngx_http_dav_ext_module.c"
|
ngx_module_srcs="$ngx_addon_dir/ngx_http_dav_ext_module.c"
|
||||||
|
|
@ -49,7 +49,7 @@
|
|||||||
ngx_feature_incs="#include <sys/epoll.h>"
|
ngx_feature_incs="#include <sys/epoll.h>"
|
||||||
ngx_feature_path=
|
ngx_feature_path=
|
||||||
ngx_feature_libs=
|
ngx_feature_libs=
|
||||||
@@ -110,7 +110,7 @@ ngx_feature_test="int fd; struct stat sb
|
@@ -135,7 +135,7 @@ ngx_feature_test="int fd; struct stat sb
|
||||||
CC_AUX_FLAGS="$cc_aux_flags -D_GNU_SOURCE"
|
CC_AUX_FLAGS="$cc_aux_flags -D_GNU_SOURCE"
|
||||||
ngx_feature="sendfile()"
|
ngx_feature="sendfile()"
|
||||||
ngx_feature_name="NGX_HAVE_SENDFILE"
|
ngx_feature_name="NGX_HAVE_SENDFILE"
|
||||||
@ -58,7 +58,7 @@
|
|||||||
ngx_feature_incs="#include <sys/sendfile.h>
|
ngx_feature_incs="#include <sys/sendfile.h>
|
||||||
#include <errno.h>"
|
#include <errno.h>"
|
||||||
ngx_feature_path=
|
ngx_feature_path=
|
||||||
@@ -131,7 +131,7 @@ fi
|
@@ -156,7 +156,7 @@ fi
|
||||||
CC_AUX_FLAGS="$cc_aux_flags -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64"
|
CC_AUX_FLAGS="$cc_aux_flags -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64"
|
||||||
ngx_feature="sendfile64()"
|
ngx_feature="sendfile64()"
|
||||||
ngx_feature_name="NGX_HAVE_SENDFILE64"
|
ngx_feature_name="NGX_HAVE_SENDFILE64"
|
||||||
@ -67,7 +67,7 @@
|
|||||||
ngx_feature_incs="#include <sys/sendfile.h>
|
ngx_feature_incs="#include <sys/sendfile.h>
|
||||||
#include <errno.h>"
|
#include <errno.h>"
|
||||||
ngx_feature_path=
|
ngx_feature_path=
|
||||||
@@ -149,7 +149,7 @@ ngx_include="sys/prctl.h"; . auto/includ
|
@@ -174,7 +174,7 @@ ngx_include="sys/prctl.h"; . auto/includ
|
||||||
|
|
||||||
ngx_feature="prctl(PR_SET_DUMPABLE)"
|
ngx_feature="prctl(PR_SET_DUMPABLE)"
|
||||||
ngx_feature_name="NGX_HAVE_PR_SET_DUMPABLE"
|
ngx_feature_name="NGX_HAVE_PR_SET_DUMPABLE"
|
||||||
@ -78,7 +78,7 @@
|
|||||||
ngx_feature_libs=
|
ngx_feature_libs=
|
||||||
--- a/auto/unix
|
--- a/auto/unix
|
||||||
+++ b/auto/unix
|
+++ b/auto/unix
|
||||||
@@ -840,7 +840,7 @@ ngx_feature_test="void *p; p = memalign(
|
@@ -805,7 +805,7 @@ ngx_feature_test="void *p; p = memalign(
|
||||||
|
|
||||||
ngx_feature="mmap(MAP_ANON|MAP_SHARED)"
|
ngx_feature="mmap(MAP_ANON|MAP_SHARED)"
|
||||||
ngx_feature_name="NGX_HAVE_MAP_ANON"
|
ngx_feature_name="NGX_HAVE_MAP_ANON"
|
||||||
@ -87,7 +87,7 @@
|
|||||||
ngx_feature_incs="#include <sys/mman.h>"
|
ngx_feature_incs="#include <sys/mman.h>"
|
||||||
ngx_feature_path=
|
ngx_feature_path=
|
||||||
ngx_feature_libs=
|
ngx_feature_libs=
|
||||||
@@ -853,7 +853,7 @@ ngx_feature_test="void *p;
|
@@ -818,7 +818,7 @@ ngx_feature_test="void *p;
|
||||||
|
|
||||||
ngx_feature='mmap("/dev/zero", MAP_SHARED)'
|
ngx_feature='mmap("/dev/zero", MAP_SHARED)'
|
||||||
ngx_feature_name="NGX_HAVE_MAP_DEVZERO"
|
ngx_feature_name="NGX_HAVE_MAP_DEVZERO"
|
||||||
@ -96,7 +96,7 @@
|
|||||||
ngx_feature_incs="#include <sys/mman.h>
|
ngx_feature_incs="#include <sys/mman.h>
|
||||||
#include <sys/stat.h>
|
#include <sys/stat.h>
|
||||||
#include <fcntl.h>"
|
#include <fcntl.h>"
|
||||||
@@ -868,7 +868,7 @@ ngx_feature_test='void *p; int fd;
|
@@ -833,7 +833,7 @@ ngx_feature_test='void *p; int fd;
|
||||||
|
|
||||||
ngx_feature="System V shared memory"
|
ngx_feature="System V shared memory"
|
||||||
ngx_feature_name="NGX_HAVE_SYSVSHM"
|
ngx_feature_name="NGX_HAVE_SYSVSHM"
|
||||||
@ -105,7 +105,7 @@
|
|||||||
ngx_feature_incs="#include <sys/ipc.h>
|
ngx_feature_incs="#include <sys/ipc.h>
|
||||||
#include <sys/shm.h>"
|
#include <sys/shm.h>"
|
||||||
ngx_feature_path=
|
ngx_feature_path=
|
||||||
@@ -882,7 +882,7 @@ ngx_feature_test="int id;
|
@@ -847,7 +847,7 @@ ngx_feature_test="int id;
|
||||||
|
|
||||||
ngx_feature="POSIX semaphores"
|
ngx_feature="POSIX semaphores"
|
||||||
ngx_feature_name="NGX_HAVE_POSIX_SEM"
|
ngx_feature_name="NGX_HAVE_POSIX_SEM"
|
@ -8,5 +8,5 @@
|
|||||||
+#define NGX_SYS_NERR 128
|
+#define NGX_SYS_NERR 128
|
||||||
+#endif
|
+#endif
|
||||||
|
|
||||||
/*
|
static ngx_str_t ngx_unknown_error = ngx_string("Unknown error");
|
||||||
* The strerror() messages are copied because:
|
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user