From owner-svn-ports-all@freebsd.org Thu Jun 30 12:23:48 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5DC26B86B15; Thu, 30 Jun 2016 12:23:48 +0000 (UTC) (envelope-from koobs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 235BC2580; Thu, 30 Jun 2016 12:23:48 +0000 (UTC) (envelope-from koobs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u5UCNlVk035045; Thu, 30 Jun 2016 12:23:47 GMT (envelope-from koobs@FreeBSD.org) Received: (from koobs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u5UCNl2P035044; Thu, 30 Jun 2016 12:23:47 GMT (envelope-from koobs@FreeBSD.org) Message-Id: <201606301223.u5UCNl2P035044@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: koobs set sender to koobs@FreeBSD.org using -f From: Kubilay Kocak Date: Thu, 30 Jun 2016 12:23:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r417823 - head/textproc/libucl X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 30 Jun 2016 12:23:48 -0000 Author: koobs Date: Thu Jun 30 12:23:47 2016 New Revision: 417823 URL: https://svnweb.freebsd.org/changeset/ports/417823 Log: textproc/libucl: Fix builds with multiple lua versions installed The LUA_{LIB,INC}DIR variables point to the default Lua version specified in ports (in this case 5.2) or by the user. When multiple versions of Lua are installed (in this case 5.2 and 5.3), libucl's ./configure auto-detects Lua 5.3 (or perhaps the latest version available), which is a mismatch against those in the provided include/library paths: checking for a Lua interpreter with version >= 5.1... lua53 <-- detected checking for lua53... /usr/local/bin/lua53 checking for lua53 version... 5.3 ... checking for Lua header version... 5.2 <-- Passed by LUA_INCDIR checking if Lua header version matches 5.3... no This change explicitly specifies the version of the Lua interpreter we want to use, which appears to sufficienty influence the behaviour of the ./configure macros. PR: 209887 Reported by: olgeni MFH: 2016Q2 Modified: head/textproc/libucl/Makefile Modified: head/textproc/libucl/Makefile ============================================================================== --- head/textproc/libucl/Makefile Thu Jun 30 10:12:05 2016 (r417822) +++ head/textproc/libucl/Makefile Thu Jun 30 12:23:47 2016 (r417823) @@ -21,7 +21,7 @@ URLS_DESC= Enable fetching URLs UTILS_DESC= Enable tools: ucl_chargen, ucl_ucldump, ucl_tool LUA_CONFIGURE_ENABLE= lua -LUA_CPPFLAGS= -I${LUA_INCDIR} +LUA_CONFIGURE_ENV= LUA=${LOCALBASE}/bin/${LUA_CMD} LUA_LDFLAGS= -L${LUA_LIBDIR} LUA_USES= lua