Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (3a2b5ad0e7b4b6e6204c08fda311fcc39c029386)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pavel Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (3a2b5ad0e7b4b6e6204c08fda311fcc39c029386)
  • Date: Sat, 23 Jul 2022 21:22:12 +0000

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemaage.org>:

ChangeLog | 4 ++++
MESON_FUNCTIONS | 5 +++--
2 files changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 3a2b5ad0e7b4b6e6204c08fda311fcc39c029386
Author: Pavel Vinogradov <public AT sourcemaage.org>
Commit: Pavel Vinogradov <public AT sourcemaage.org>

MESON_FUNCTIONS: fixed meson_install BUILDER_OPTS, also made PREFIX truly
local

diff --git a/ChangeLog b/ChangeLog
index d68d518..40b8391 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2022-07-23 Pavel Vinogradov <public AT sourcemage.org>
+ * MESON_FUNCTIONS: modified default muon options to make it run at
least,
+ fixed meson_install by correcting variable scopes
+
2022-07-23 Vlad Glagolev <stealth AT sourcemage.org>
* devel/muon: new spell, meson implementation in C
* MESON_DEPENDS, MESON_FUNCTIONS: add muon support
diff --git a/MESON_FUNCTIONS b/MESON_FUNCTIONS
index 73a6adb..49ae192 100755
--- a/MESON_FUNCTIONS
+++ b/MESON_FUNCTIONS
@@ -1,8 +1,7 @@
# special functions for projects which use meson build system

-local PREFIX=${PREFIX:-/usr}
-
meson_build () {
+ local PREFIX=${PREFIX:-/usr}
local MESON_BUILD_TYPE="${MESON_BUILD_TYPE:-release}" &&

local MESON_BUILD &&
@@ -38,6 +37,8 @@ meson_build () {
}

meson_install () {
+ local BUILDER_OPTS="-j ${MAKE_NJOBS} -C builddir/" &&
+
if ! is_depends_enabled ${SPELL} $(get_spell_provider ${SPELL}
NINJA-BUILD); then
BUILDER="muon samu"
elif [[ $(get_spell_provider ${SPELL} NINJA-BUILD) == samurai ]]; then



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (3a2b5ad0e7b4b6e6204c08fda311fcc39c029386), Pavel Vinogradov, 07/23/2022

Archive powered by MHonArc 2.6.24.

Top of Page