Skip to content

nginx: fix https://github.com/Optware/Optware-ng/issues/324 #342

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

Open
stalchuk wants to merge 1 commit into
base: master
Choose a base branch
from
Open

nginx: fix https://github.com/Optware/Optware-ng/issues/324 #342

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion make/nginx.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ NGINX_CONFLICTS=
#
# NGINX_IPK_VERSION should be incremented when the ipk changes.
#
NGINX_IPK_VERSION?=1
NGINX_IPK_VERSION?=2

#
# NGINX_CONFFILES should be a list of user-editable files
Expand Down Expand Up @@ -184,6 +184,10 @@ ifneq (,$(filter nslu2 cs05q3armel, $(OPTWARE_TARGET)))
endif
ifeq ($(LIBC_STYLE), uclibc)
sed -i -e 's/#ifndef NGX_HAVE_GNU_CRYPT_R/#if 0/' $(@D)/src/os/unix/ngx_linux_config.h
endif
ifeq ($(OPTWARE_TARGET), $(filter buildroot-armv5eabi-ng-legacy, $(OPTWARE_TARGET)))
# no accept4() in 2.6.24.4 kernel
sed -i -e 's@#define NGX_HAVE_ACCEPT4 1@#define NGX_HAVE_ACCEPT4 0@' $(@D)/objs/ngx_auto_config.h
endif
touch $@

Expand Down