From 45ca4f1b5b6d62212473316626373668dacfad6d Mon Sep 17 00:00:00 2001 From: Leo Di Donato Date: Fri, 14 Jul 2023 23:04:04 +0000 Subject: [PATCH 1/2] fix(.devcontainer): workaround (temporarily) xmake bug Recent versions of xmake contain a bug in the xmake autoconf module. This commit https://github.com/xmake-io/xmake/commit/3df42d083c6622b00632331178d82524cae34554 fixes the bug. Here we install xmake from the `dev` branch containing commit 3df42d0. Signed-off-by: Leo Di Donato --- .devcontainer/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 7538e63..90a33b7 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -14,4 +14,5 @@ RUN echo '%vscode ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers USER vscode RUN git clone https://aur.archlinux.org/yay.git && cd yay && makepkg --noconfirm -si -RUN yay --noconfirm -S xmake +RUN curl -fsSL https://xmake.io/shget.text | bash -s dev +RUN source $HOME/.xmake/profile \ No newline at end of file From 098a94a0b363da12f371a178c2fe834d57cf775e Mon Sep 17 00:00:00 2001 From: Leo Di Donato Date: Fri, 14 Jul 2023 23:05:55 +0000 Subject: [PATCH 2/2] build: bump minimum xmake version to v2.8.2 Signed-off-by: Leo Di Donato --- xmake.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xmake.lua b/xmake.lua index af5127b..bd5bde4 100644 --- a/xmake.lua +++ b/xmake.lua @@ -1,4 +1,4 @@ -set_xmakever("2.6.1") -- Minimum version to compile BPF source correctly +set_xmakever("2.8.2") -- Minimum version to compile BPF source correctly -- includes includes("xmake/repos.lua")