Skip to Content.
Sympa Menu

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

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, sm-commit AT lists.sourcemage.org
  • Subject: [[SM-Commit] ] GIT changes to master grimoire by Pavel Vinogradov (74fd9823f002596c2475f8097146eb99cdccbc36)
  • Date: Sun, 12 Jan 2025 05:38:44 +0000

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

smgl/elogind/BUILD | 52
+++++++++++++++++++++++++++++++++++++++++----------
smgl/elogind/DETAILS | 8 +++----
smgl/elogind/HISTORY | 5 ++++
3 files changed, 51 insertions(+), 14 deletions(-)

New commits:
commit 74fd9823f002596c2475f8097146eb99cdccbc36
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

smgl/elogind: version 255.5

diff --git a/smgl/elogind/BUILD b/smgl/elogind/BUILD
index ffdfa45..771e9fc 100755
--- a/smgl/elogind/BUILD
+++ b/smgl/elogind/BUILD
@@ -1,16 +1,48 @@
# Fails to build with -Ofast
CFLAGS="${CFLAGS//-Ofast/-O2}" &&

-OPTS+=' smack=false tests=unsafe split-usr=true' &&
-OPTS+=' split-bin=true' &&
-OPTS+=' rootlibdir=/lib' &&
-OPTS+=' default-hierarchy=hybrid' &&
-OPTS+=' nobody-group=nogroup' &&
+OPTS="smack=false tests=unsafe split-usr=true split-bin=true
+ default-hierarchy=hybrid nobody-group=nogroup ${OPTS}" &&

case $(get_spell_provider ${SPELL} INIT) in
- openrc) OPTS+=' cgroup-controller=openrc' ;;
- simpleinit-msb) OPTS+=' cgroup-controller=telinit' ;;
- systemd) OPTS+=' cgroup-controller=systemd' ;;
- *) OPTS+=' cgroup-controller=none' ;;
+ openrc) OPTS="cgroup-controller=openrc ${OPTS}" ;;
+ simpleinit-msb) OPTS="cgroup-controller=telinit ${OPTS}" ;;
+ systemd) OPTS="cgroup-controller=systemd ${OPTS}" ;;
+ *) OPTS="cgroup-controller=none ${OPTS}" ;;
esac &&
-default_build
+#
+# special functions for projects which use meson build system
+
+local PREFIX=${PREFIX:-/usr} &&
+local MESON_BUILD_TYPE="${MESON_BUILD_TYPE:-release}" &&
+
+local MESON_BUILD &&
+local MESON_OPTS &&
+local BUILDER &&
+local BUILDER_OPTS="-j $((${#DISTCC_HOSTS[*]} * JOBS_PER_HOST + MAKE_NJOBS))
-C builddir/" &&
+
+if [[ $(get_spell_provider ${SPELL} MESON-BUILD) == muon ]]; then
+ MESON_BUILD="muon setup" &&
+ OPTS="prefix=${INSTALL_ROOT}${PREFIX} buildtype=${MESON_BUILD_TYPE}
default_library=shared libdir=${INSTALL_ROOT}/lib ${OPTS}"
+else
+ MESON_BUILD="meson setup" &&
+ MESON_OPTS="--prefix ${INSTALL_ROOT}${PREFIX} --buildtype
${MESON_BUILD_TYPE} --default-library shared --libdir ${INSTALL_ROOT}/lib"
+fi &&
+
+if ! is_depends_enabled ${SPELL} $(get_spell_provider ${SPELL} NINJA-BUILD);
then
+ BUILDER="muon samu"
+elif [[ $(get_spell_provider ${SPELL} NINJA-BUILD) == samurai ]]; then
+ BUILDER="samu"
+else
+ BUILDER="ninja"
+fi &&
+
+for MO in $OPTS; do
+ MESON_OPTS="-D${MO} ${MESON_OPTS}"
+done &&
+
+cd "${SOURCE_DIRECTORY}" &&
+
+${MESON_BUILD} ${MESON_OPTS} builddir/ &&
+
+${BUILDER} ${BUILDER_OPTS}
diff --git a/smgl/elogind/DETAILS b/smgl/elogind/DETAILS
index 1dbb1a0..46e7ec1 100755
--- a/smgl/elogind/DETAILS
+++ b/smgl/elogind/DETAILS
@@ -1,10 +1,10 @@
-source $GRIMOIRE/MESON_FUNCTIONS
+source "${GRIMOIRE}/MESON_FUNCTIONS"
SPELL=elogind
- VERSION=252.9
-
SOURCE_HASH=sha512:eed620cbc2f03bfeae6a80c9a421c21d3293fa40adffb96c7e4d86508c06712041f6623fb2bac15ecbb85faca4b5674ea6423b3067840809fb27d023fd9e5ffd
+ VERSION=255.5
+
SOURCE_HASH=sha512:dd9494062ef18c3c4cddbaf70b394bf90f6da3ce49f85312e99eabde54b2fcdb5cfdde1bcbaa661031afc72853e9b138dae336e1caed72e927bfd61c8cb22895
SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE=https://github.com/elogind/elogind
SOURCE_URL[0]=$WEB_SITE/archive/v$VERSION.tar.gz
# Watch: https://github.com/elogind/elogind/tags tags/v([0-9.]+)[.]tar
diff --git a/smgl/elogind/HISTORY b/smgl/elogind/HISTORY
index 1f6203e..f17d3a0 100644
--- a/smgl/elogind/HISTORY
+++ b/smgl/elogind/HISTORY
@@ -1,3 +1,8 @@
+2025-01-12 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: version 255.5, quoting++
+ * BUILD: replaced rootlibdir with custom meson_build, reformatted,
+ removed bashisms
+
2023-08-01 Pavel Vinogradov <public AT sourcemage.org>
* DEPENDS: requires libxcrypt



  • [[SM-Commit] ] GIT changes to master grimoire by Pavel Vinogradov (74fd9823f002596c2475f8097146eb99cdccbc36), Pavel Vinogradov, 01/12/2025

Archive powered by MHonArc 2.6.24.

Top of Page