- unbreak nginx on ld.bfd arches - gd library detection was failing in

configure (another place where it can't find required libraries in
/usr/X11R6/lib)

- remove bogus LIB_DEPENDS-rtmp, there are no WANTLIB, check-lib-depends
is happy

ok robert@
This commit is contained in:
sthen 2020-01-10 13:39:26 +00:00
parent 03aaa26071
commit c784357bfb
2 changed files with 21 additions and 3 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.140 2020/01/03 21:03:10 sthen Exp $
# $OpenBSD: Makefile,v 1.141 2020/01/10 13:39:26 sthen Exp $
BROKEN-hppa= src/core/ngx_rwlock.c:116:2: error: \#error ngx_atomic_cmp_set() is not defined!
@ -22,6 +22,7 @@ DISTNAME= nginx-${VERSION}
CATEGORIES= www
REVISION= 1
REVISION-rtmp= 2
VERSION-rtmp= 1.2.1
PKGNAME-main= ${DISTNAME}
@ -83,6 +84,7 @@ WANTLIB-stream=
WANTLIB-image_filter= gd
WANTLIB-geoip= GeoIP
WANTLIB-geoip2= maxminddb
WANTLIB-rtmp=
WANTLIB-xslt= exslt xml2 xslt
WANTLIB-naxsi=
WANTLIB-ldap_auth= ldap
@ -99,8 +101,7 @@ LIB_DEPENDS-geoip= net/GeoIP
LIB_DEPENDS-geoip2= net/libmaxminddb
LIB_DEPENDS-ldap_auth= databases/openldap
LIB_DEPENDS-lua= ${MODLUA_LIB_DEPENDS}
LIB_DEPENDS-rtmp= textproc/libxml \
textproc/libxslt
LIB_DEPENDS-rtmp=
MODLUA_RUNDEP= No
RUN_DEPENDS= www/nginx,-main=${VERSION}

View File

@ -0,0 +1,17 @@
$OpenBSD: patch-auto_lib_libgd_conf,v 1.1 2020/01/10 13:39:26 sthen Exp $
Index: auto/lib/libgd/conf
--- auto/lib/libgd/conf.orig
+++ auto/lib/libgd/conf
@@ -22,9 +22,9 @@ if [ $ngx_found = no ]; then
ngx_feature_path="/usr/local/include"
if [ $NGX_RPATH = YES ]; then
- ngx_feature_libs="-R/usr/local/lib -L/usr/local/lib -lgd"
+ ngx_feature_libs="-R/usr/local/lib -L/usr/local/lib -L/usr/X11R6/lib -lgd"
else
- ngx_feature_libs="-L/usr/local/lib -lgd"
+ ngx_feature_libs="-L/usr/local/lib -L/usr/X11R6/lib -lgd"
fi
. auto/feature