From ca93d1292103553af4dedf6fc4d3eff42900dd95 Mon Sep 17 00:00:00 2001 From: Christian Neukirchen Date: Sat, 21 May 2016 23:44:26 +0200 Subject: [PATCH] nginx: fix PIE, add manpage. --- srcpkgs/nginx/template | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/srcpkgs/nginx/template b/srcpkgs/nginx/template index c87576ac839..e6e905acba4 100644 --- a/srcpkgs/nginx/template +++ b/srcpkgs/nginx/template @@ -1,7 +1,7 @@ # Template file for 'nginx' pkgname=nginx version=1.8.1 -revision=2 +revision=3 makedepends="pcre-devel libressl-devel $(vopt_if geoip geoip-devel)" if [ "$CROSS_BUILD" ]; then # fake configure run on host @@ -38,6 +38,7 @@ do_configure() { local tmpdir=/var/tmp/nginx if [ "$CROSS_BUILD" ]; then + # fake configure run on host unset CC CPP LD CFLAGS CPPFLAGS LDFLAGS fi @@ -71,10 +72,12 @@ do_configure() { arm*) cp ${FILESDIR}/ngx_auto_config.h.armv6l objs/ngx_auto_config.h;; esac fi + + sed -i 's/-lpthread/$(LDFLAGS) &/' objs/Makefile } do_build() { - make ${makejobs} CC="${CC}" LD="${LD}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" + make ${makejobs} CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" } do_install() { make DESTDIR=$DESTDIR install @@ -88,6 +91,8 @@ do_install() { vmkdir usr/share/nginx mv $DESTDIR/etc/nginx/html/ $DESTDIR/usr/share/nginx + vman man/nginx.8 + vlicense LICENSE vsv nginx }