wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-08-03 11:22:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

nginx: fix PIE, add manpage.

Browse source
This commit is contained in:
Christian Neukirchen 2016-05-21 23:44:26 +02:00
parent d53d63a3b6
commit ca93d12921
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
srcpkgs/nginx/template
View file

@ -1,7 +1,7 @@
# Template file for 'nginx' # Template file for 'nginx'
pkgname=nginx pkgname=nginx
version=1.8.1 version=1.8.1
revision=2 revision=3
makedepends="pcre-devel libressl-devel $(vopt_if geoip geoip-devel)" makedepends="pcre-devel libressl-devel $(vopt_if geoip geoip-devel)"
if [ "$CROSS_BUILD" ]; then if [ "$CROSS_BUILD" ]; then
# fake configure run on host # fake configure run on host
@ -38,6 +38,7 @@ do_configure() {
local tmpdir=/var/tmp/nginx local tmpdir=/var/tmp/nginx
if [ "$CROSS_BUILD" ]; then if [ "$CROSS_BUILD" ]; then
# fake configure run on host
unset CC CPP LD CFLAGS CPPFLAGS LDFLAGS unset CC CPP LD CFLAGS CPPFLAGS LDFLAGS
fi fi
@ -71,10 +72,12 @@ do_configure() {
arm*) cp ${FILESDIR}/ngx_auto_config.h.armv6l objs/ngx_auto_config.h;; arm*) cp ${FILESDIR}/ngx_auto_config.h.armv6l objs/ngx_auto_config.h;;
esac esac
fi fi
sed -i 's/-lpthread/$(LDFLAGS) &/' objs/Makefile
} }
do_build() { do_build() {
make ${makejobs} CC="${CC}" LD="${LD}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" make ${makejobs} CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
} }
do_install() { do_install() {
make DESTDIR=$DESTDIR install make DESTDIR=$DESTDIR install
@ -88,6 +91,8 @@ do_install() {
vmkdir usr/share/nginx vmkdir usr/share/nginx
mv $DESTDIR/etc/nginx/html/ $DESTDIR/usr/share/nginx mv $DESTDIR/etc/nginx/html/ $DESTDIR/usr/share/nginx
vman man/nginx.8
vlicense LICENSE vlicense LICENSE
vsv nginx vsv nginx
} }