Date: Sat, 21 Jun 2014 13:54:14 +0000 (UTC) From: Olli Hauer <ohauer@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r358701 - head/www/apache24 Message-ID: <201406211354.s5LDsEmu096624@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ohauer Date: Sat Jun 21 13:54:14 2014 New Revision: 358701 URL: http://svnweb.freebsd.org/changeset/ports/358701 QAT: https://qat.redports.org/buildarchive/r358701/ Log: - 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 Modified: head/www/apache24/Makefile head/www/apache24/Makefile.modules Modified: head/www/apache24/Makefile ============================================================================== --- head/www/apache24/Makefile Sat Jun 21 13:35:16 2014 (r358700) +++ head/www/apache24/Makefile Sat Jun 21 13:54:14 2014 (r358701) @@ -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} Modified: head/www/apache24/Makefile.modules ============================================================================== --- head/www/apache24/Makefile.modules Sat Jun 21 13:35:16 2014 (r358700) +++ head/www/apache24/Makefile.modules Sat Jun 21 13:54:14 2014 (r358701) @@ -62,7 +62,7 @@ IGNORE= SESSION_CRYPTO requires APR-util # 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=""
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406211354.s5LDsEmu096624>