pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

lls: fix build



Module Name:	pkgsrc-wip
Committed By:	nikita <nikita%NetBSD.org@localhost>
Pushed By:	nikita
Date:		Wed Mar 29 19:33:58 2023 +0200
Changeset:	0c5a06b809704610b67d1bb6c1b235240200c2d9

Modified Files:
	lua-language-server/Makefile
Added Files:
	lua-language-server/TODO

Log Message:
lls: fix build

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=0c5a06b809704610b67d1bb6c1b235240200c2d9

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 lua-language-server/Makefile | 19 ++++++++++++++++---
 lua-language-server/TODO     |  1 +
 2 files changed, 17 insertions(+), 3 deletions(-)

diffs:
diff --git a/lua-language-server/Makefile b/lua-language-server/Makefile
index 4742cdfb57..cd9450389d 100644
--- a/lua-language-server/Makefile
+++ b/lua-language-server/Makefile
@@ -13,12 +13,16 @@ COMMENT=		Language server for Lua
 LICENSE=		mit
 
 MAKE_FLAGS+=		PREFIX=${PREFIX}
-MAKE_FLAGS+=		CC=${CC}
-MAKE_FLAGS+=		CFLAGS="${CFLAGS} -fPIC"
+MAKE_FLAGS+=		CC=${CC:Q}
+MAKE_FLAGS+=		CFLAGS=${CFLAGS:Q} -fPIC
 MAKE_FLAGS+=		LUA_VERSION=${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR}
 
+USE_TOOLS+=	pax
 TOOL_DEPENDS+=	ninja-build-[0-9]*:../../devel/ninja-build
 
+INSTALLATION_DIRS+=	share/lua-language-server/bin
+INSTALLATION_DIRS+=	bin
+
 # TODO: Maybe unbundle (some of) them? (lls does build with them included though)
 GITDEPS+=		luamake 3d8d1fde146da293240e86c1b99ff00a7d865ac0 https://github.com/actboy168/luamake luamake
 GITDEPS+=		bee.lua c4e989a2e2dbed6c063aa0460a451cd795925a88 https://github.com/actboy168/bee.lua bee.lua
@@ -29,7 +33,7 @@ GITDEPS+=		lovr-docs 8900d79360c48b1a5fc957ec85f8333c4437cb45 https://github.com
 GITDEPS+=		love-api 495ecc72d994f5d52fc21592dda9d16f4fd75ba1 https://github.com/love2d-community/love-api/ love-api
 GITDEPS+=		lpeglabel e25eb35666201b10dc2778d6147ea36a9f6e033d https://github.com/sqmedeiros/lpeglabel lpeglabel
 
-DISTFILES?=             	${DEFAULT_DISTFILES}
+DISTFILES?=			${DEFAULT_DISTFILES}
 .for name rev url path in ${GITDEPS}
 GITDEPS_DISTFILE:=		${name}-${rev}.tar.gz
 GITDEPS_DISTFILES:=		${GITDEPS_DISTFILES} ${GITDEPS_DISTFILE}
@@ -50,6 +54,15 @@ do-build:
 	ninja -C ${WRKSRC}/3rd/luamake -f compile/ninja/netbsd.ninja
 	cd ${WRKSRC} && ${MAKE_ENV} ./3rd/luamake/luamake -v
 
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/lua-language-server ${DESTDIR}${PREFIX}/bin/
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/main.lua ${DESTDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/debugger.lua ${DESTDIR}${PREFIX}/share/lua-language-server
+	${INSTALL_DATA} ${WRKSRC}/main.lua ${DESTDIR}${PREFIX}/share/lua-language-server/bin
+	cd ${WRKSRC} && ${PAX} -rw locale ${DESTDIR}${PREFIX}/share/lua-language-server
+	cd ${WRKSRC} && ${PAX} -rw meta ${DESTDIR}${PREFIX}/share/lua-language-server
+	cd ${WRKSRC} && ${PAX} -rw script ${DESTDIR}${PREFIX}/share/lua-language-server
+
 .include "../../devel/libinotify/buildlink3.mk"
 .include "../../lang/lua/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lua-language-server/TODO b/lua-language-server/TODO
new file mode 100644
index 0000000000..620f1d750e
--- /dev/null
+++ b/lua-language-server/TODO
@@ -0,0 +1 @@
+randomly fails between clean rebuilds. cause: patch?


Home | Main Index | Thread Index | Old Index