git: 9b1daa854f85 - main - sysutils/conky: Force linking against correct LUA

Guido Falsi madpilot at FreeBSD.org
Sun Apr 25 08:54:00 UTC 2021


The branch main has been updated by madpilot:

URL: https://cgit.FreeBSD.org/ports/commit/?id=9b1daa854f85e486ed1177746408892e09e3a138

commit 9b1daa854f85e486ed1177746408892e09e3a138
Author:     Guido Falsi <madpilot at FreeBSD.org>
AuthorDate: 2021-04-25 08:51:18 +0000
Commit:     Guido Falsi <madpilot at FreeBSD.org>
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 <moskalewski at jmos.net>
---
 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)


More information about the dev-commits-ports-all mailing list