Date: Fri, 10 Jan 2014 08:39:13 +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: r339329 - in head/lang/lua52: . files Message-ID: <201401100839.s0A8dDmd001123@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Fri Jan 10 08:39:12 2014 New Revision: 339329 URL: http://svnweb.freebsd.org/changeset/ports/339329 Log: Add missing lua.pc files (missed in previous commits) Rework the makefile to use jmmv method from PR which is cleaner than my initial attempt PR: ports/180786 Submitted by: jmmv Added: head/lang/lua52/files/lua-5.2.pc.in (contents, props changed) Modified: head/lang/lua52/Makefile Modified: head/lang/lua52/Makefile ============================================================================== --- head/lang/lua52/Makefile Fri Jan 10 08:39:01 2014 (r339328) +++ head/lang/lua52/Makefile Fri Jan 10 08:39:12 2014 (r339329) @@ -16,8 +16,6 @@ LICENSE= MIT LUA_VER= 5.2 USES= pkgconfig readline USE_LDCONFIG= yes -SUB_FILES= lua-${LUA_VER}.pc -SUB_LIST= LUA_VERSION=${PORTVERSION} # Overriding __MAKE_CONF makes sure that we don't re-parse # /etc/make.conf during do-build, which would jeopardize the build @@ -43,11 +41,22 @@ MAKE_ARGS+= MYCFLAGS="${CFLAGS} -DLUA_US INSTALL_INC=${STAGEDIR}${PREFIX}/include/lua52 \ INSTALL_EXEC="${INSTALL_PROGRAM}" -.include <bsd.port.options.mk> +# Cope with the lack of support for Lua 5.2 in bsd.lua.mk. These +# overrides, which are required below, should be removed once bsd.lua.mk +# understands this lua version. +LUA_PREFIX?= ${PREFIX} +LUA_SUBDIR?= lua${PKGNAMESUFFIX} +LUA_INCDIR?= ${LUA_PREFIX}/include/${LUA_SUBDIR} +LUA_LIBDIR?= ${LUA_PREFIX}/lib + +SUB_FILES= lua-${LUA_VER}.pc +SUB_LIST= version=${PORTVERSION} \ + includedir=${LUA_INCDIR} \ + libdir=${LUA_LIBDIR} \ + soname=lua-${LUA_VER} -.if ${ARCH} == "amd64" || ${ARCH} == "powerpc" -CFLAGS+= -fPIC -.endif +CFLAGS_amd64= -fPIC +CFLAGS_powerpc= -fPIC post-patch: @${REINPLACE_CMD} -e 's,rand *(,random(,g' \ @@ -56,11 +65,12 @@ post-patch: ${WRKSRC}/src/luaconf.h post-install: - @${MV} ${WRKDIR}/lua-${LUA_VER}.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/liblua-${LUA_VER}.so @${MV} ${STAGEDIR}${PREFIX}/man/man1/lua.1 \ ${STAGEDIR}${PREFIX}/man/man1/lua52.1 @${MV} ${STAGEDIR}${PREFIX}/man/man1/luac.1 \ ${STAGEDIR}${PREFIX}/man/man1/luac52.1 + ${INSTALL_DATA} ${WRKDIR}/lua-${LUA_VER}.pc \ + ${STAGEDIR}${PREFIX}/libdata/pkgconfig .include <bsd.port.mk> Added: head/lang/lua52/files/lua-5.2.pc.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/lua52/files/lua-5.2.pc.in Fri Jan 10 08:39:12 2014 (r339329) @@ -0,0 +1,10 @@ +version=%%version%% +libdir=%%libdir%% +includedir=%%includedir%% +soname=%%soname%% + +Name: Lua +Description: An Extensible Extension Language +Version: ${version} +Libs: -L${libdir} -l${soname} -lm +Cflags: -I${includedir}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401100839.s0A8dDmd001123>