From d359c54d65b24cc1d1b4790a0880e0638951866c Mon Sep 17 00:00:00 2001 From: Vladislav Nepogodin Date: Tue, 9 Aug 2022 04:34:13 +0400 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A8=20use=20cmake=20instead=20for=20Va?= =?UTF-8?q?grant?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Vagrantfile | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index 6dce9ca..a106a1e 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -89,17 +89,27 @@ Vagrant.configure("2") do |config| git clone https://github.com/cachyos/new-cli-installer.git cd new-cli-installer - meson --prefix /usr \ - --libexecdir lib \ - --sbindir bin \ - --buildtype release \ - -D b_pie=true \ - -D devenv=false \ - build - meson compile -C build --jobs $(nproc) + #meson --prefix /usr \ + # --libexecdir lib \ + # --sbindir bin \ + # --buildtype release \ + # -D b_pie=true \ + # -D devenv=false \ + # build + #meson compile -C build --jobs $(nproc) + cmake -S . -B build \ + -GNinja \ + -DCMAKE_EXE_LINKER_FLAGS="-fuse-ld=mold" \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DENABLE_DEVENV=ON + + cmake --build build --parallel $(nproc) cd build - meson install + #meson install + cmake --install build cd "$SAVED_DIR" SHELL