Date: Sat, 17 Jan 2015 01:28:32 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r377207 - head/lang/lua51 Message-ID: <201501170128.t0H1SWQP015905@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Sat Jan 17 01:28:31 2015 New Revision: 377207 URL: https://svnweb.freebsd.org/changeset/ports/377207 QAT: https://qat.redports.org/buildarchive/r377207/ Log: Link on port version of libedit Avoid overlinking on liblua Modified: head/lang/lua51/Makefile Modified: head/lang/lua51/Makefile ============================================================================== --- head/lang/lua51/Makefile Sat Jan 17 00:52:29 2015 (r377206) +++ head/lang/lua51/Makefile Sat Jan 17 01:28:31 2015 (r377207) @@ -3,7 +3,7 @@ PORTNAME= lua PORTVERSION= 5.1.5 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= lang MASTER_SITES= http://www.lua.org/ftp/ PKGNAMESUFFIX= 51 @@ -14,7 +14,7 @@ COMMENT= Small, compilable scripting lan LICENSE= MIT LUA_VER= 5.1 -USES= readline +LIB_DEPENDS+= libedit.so.0:${PORTSDIR}/devel/libedit USE_LDCONFIG= yes # Overriding __MAKE_CONF makes sure that we don't re-parse @@ -26,10 +26,12 @@ USE_LDCONFIG= yes MAKE_ARGS= __MAKE_CONF=${NONEXISTENT} # liblua.so requires libm, so make sure it has an explicit dependency # so that applications need not second-guess lua's dependencies. +CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -lm -pthread BUILD_WRKSRC= ${WRKSRC}/src MAKE_ARGS+= MYCFLAGS="${CFLAGS} ${CPPFLAGS} -DLUA_USE_LINUX" \ - MYLDFLAGS="${LDFLAGS} -Wl,-E -lreadline" \ + MYLDFLAGS="${LDFLAGS}" \ + MYLIBS="-Wl,-E -ledit" \ CC="${CC}" \ LUA_T=lua51 \ LUAC_T=luac51 \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201501170128.t0H1SWQP015905>