diff options
| author | ohauer <ohauer@FreeBSD.org> | 2014-06-21 21:54:14 +0800 |
|---|---|---|
| committer | ohauer <ohauer@FreeBSD.org> | 2014-06-21 21:54:14 +0800 |
| commit | 7a025a1ee376bcdd8eb752bfd85d3938e7656feb (patch) | |
| tree | 02c59dc0408047e814347979efe6f433fca22d24 /www | |
| parent | 61403d52162c0ea42d648a7e1e2a81ee8e2ebd56 (diff) | |
| download | freebsd-ports-gnome-7a025a1ee376bcdd8eb752bfd85d3938e7656feb.tar.gz freebsd-ports-gnome-7a025a1ee376bcdd8eb752bfd85d3938e7656feb.tar.zst freebsd-ports-gnome-7a025a1ee376bcdd8eb752bfd85d3938e7656feb.zip | |
- fix build with lua51 / lua52
- strip trailing white space
- no PORTREVISION bump (LUA is not a default OPTION)
Lua build issue reported on apache@ and lua@
by Peter Olsson and Jason Hellenthal
Diffstat (limited to 'www')
| -rw-r--r-- | www/apache24/Makefile | 12 | ||||
| -rw-r--r-- | www/apache24/Makefile.modules | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/www/apache24/Makefile b/www/apache24/Makefile index 745d402816af..f5933b412a60 100644 --- a/www/apache24/Makefile +++ b/www/apache24/Makefile @@ -49,19 +49,18 @@ WITH_SSL_PORT?= 443 AUTHNZ_LDAP_CONFIGURE_ON= --enable-authnz-ldap # http://httpd.apache.org/docs/2.4/bind.html -IPV4_MAPPED_CONFIGURE_OFF= --disable-v4-mapped -IPV4_MAPPED_CONFIGURE_ON= --enable-v4-mapped +IPV4_MAPPED_CONFIGURE_ENABLE= v4-mapped LDAP_CONFIGURE_ON= --enable-ldap=shared LUAJIT_LIB_DEPENDS= luajit:${PORTSDIR}/lang/luajit -LUA_CONFIGURE_OFF= --without-lua -LUA_CONFIGURE_ON= --with-lua=${LOCALBASE} +LUA_CONFIGURE_WITH= lua +LUA_USES= lua SOCACHE_DC_CONFIGURE_ON= --with-distcache=${LOCALBASE} SOCACHE_DC_LIB_DEPENDS= distcache:${PORTSDIR}/security/distcache -# Note: +# Note: # OpenSSL version (base/ports) depends how devel/apr1 was build # apu-1-config --(includes|ldflags) and apr_rules.mk SSL_CFLAGS= -I${OPENSSLINC} @@ -116,7 +115,8 @@ MAKE_ENV+= EXPR_COMPAT=yes \ # here we do only OPTIONS fixups .if ${PORT_OPTIONS:MLUA} -USES+= lua:51 +CONFIGURE_ENV+= LUA_CFLAGS="-I${LUA_INCDIR}" \ + LUA_LIBS="-L${LUA_LIBDIR} -llua-${LUA_VER}" .endif .if ${PORT_OPTIONS:MPROXY_HTML} || ${PORT_OPTIONS:MXML2ENC} diff --git a/www/apache24/Makefile.modules b/www/apache24/Makefile.modules index 63a9088c20e1..ef7fbf9ed58b 100644 --- a/www/apache24/Makefile.modules +++ b/www/apache24/Makefile.modules @@ -62,7 +62,7 @@ IGNORE= SESSION_CRYPTO requires APR-util to have crypto openssl support build in # if build with shared MPM the last module will be activated # see apache issue 53882 -# XXX in case we use OPTIONS for MPM +# XXX in case we use OPTIONS for MPM # we do not have a WITH_MPM variable .if ${PORT_OPTIONS:MMPM_SHARED} PLIST_SUB+= MPM_SHARED="" |