From owner-dev-commits-ports-all@freebsd.org Sun Apr 25 08:54:00 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 64E5B5FA9B9; Sun, 25 Apr 2021 08:54:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FShf02QLBz4slf; Sun, 25 Apr 2021 08:54:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 45917117BD; Sun, 25 Apr 2021 08:54:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13P8s0fn048243; Sun, 25 Apr 2021 08:54:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13P8s0L1048242; Sun, 25 Apr 2021 08:54:00 GMT (envelope-from git) Date: Sun, 25 Apr 2021 08:54:00 GMT Message-Id: <202104250854.13P8s0L1048242@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Guido Falsi Subject: git: 9b1daa854f85 - main - sysutils/conky: Force linking against correct LUA MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: madpilot X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9b1daa854f85e486ed1177746408892e09e3a138 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Apr 2021 08:54:00 -0000 The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=9b1daa854f85e486ed1177746408892e09e3a138 commit 9b1daa854f85e486ed1177746408892e09e3a138 Author: Guido Falsi AuthorDate: 2021-04-25 08:51:18 +0000 Commit: Guido Falsi CommitDate: 2021-04-25 08:51:18 +0000 sysutils/conky: Force linking against correct LUA When multiple LUA versions are present conky could link against version 5.3 but register dependency against version 5.2. Try to force conky build system to actually link against the desired version of the library. Reported by: Joachim Moskalewski --- sysutils/conky/Makefile | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sysutils/conky/Makefile b/sysutils/conky/Makefile index 4eabc66d7ca7..045a8d395c8e 100644 --- a/sysutils/conky/Makefile +++ b/sysutils/conky/Makefile @@ -144,6 +144,15 @@ post-patch: ${WRKSRC}/cmake/ConkyPlatformChecks.cmake @${REINPLACE_CMD} -e 's,LOCALBASE,${LOCALBASE},' \ ${WRKSRC}/doc/docgen.sh +.if ${LUA_DEFAULT} == 5.2 + # Force using lua 5.2 + @${REINPLACE_CMD} -e 's/lua.*5\.*3//' \ + ${WRKSRC}/cmake/ConkyPlatformChecks.cmake +.elif ${LUA_DEFAULT} == 5.3 + # Force using lua 5.3 + @${REINPLACE_CMD} -e 's/lua.*5\.*2//' \ + ${WRKSRC}/cmake/ConkyPlatformChecks.cmake +.endif post-build: (cd ${WRKSRC}/doc && ${SH} docgen.sh)