Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (1f40aeecec9b1a15849be719fa0407aad25b5d28)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (1f40aeecec9b1a15849be719fa0407aad25b5d28)
  • Date: Tue, 23 Jan 2024 07:29:49 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

FUNCTIONS | 10 ++++++----
MESON_FUNCTIONS | 2 +-
NETSURF_FUNCTIONS | 2 +-
devel/cmake/BUILD | 2 +-
graphics-libs/mesa/HISTORY | 3 +++
graphics-libs/mesa/SUB_DEPENDS | 4 ++--
6 files changed, 14 insertions(+), 9 deletions(-)

New commits:
commit 1f40aeecec9b1a15849be719fa0407aad25b5d28
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

mesa: Fix GLES2 subdep

commit 19c7c070b82acd41f5e791a27a1026f2528640b4
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

Fix usage of MAKE_NJOBS

It needs to be combined with JOBS_PER_HOST * ${#DISTCC_HOSTS[@]}.

diff --git a/FUNCTIONS b/FUNCTIONS
index 3bfb6e0..91bf60d 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -671,12 +671,12 @@ function waf_build() {
# Slip in something here. Full control ist still in waf's hands and
# it probably will add flags as it wants:-/
./waf configure $waf_opts \
- -j $MAKE_NJOBS \
+ -j $((${#DISTCC_HOSTS[*]} * JOBS_PER_HOST + MAKE_NJOBS)) \
--cxxflags="$CXXFLAGS" \
$OPTS
else
./waf configure $waf_opts \
- -j $MAKE_NJOBS \
+ -j $((${#DISTCC_HOSTS[*]} * JOBS_PER_HOST + MAKE_NJOBS)) \
$OPTS
fi &&
./waf build
@@ -713,7 +713,8 @@ cmake_build() {
-DCMAKE_C_FLAGS_RELEASE="$CFLAGS" \
-DCMAKE_CXX_FLAGS_RELEASE="$CXXFLAGS" \
$OPTS ../ &&
- CMAKE_BUILD_PARALLEL_LEVEL="$MAKE_NJOBS" cmake --build .
+ CMAKE_BUILD_PARALLEL_LEVEL=$((${#DISTCC_HOSTS[*]} * JOBS_PER_HOST +
MAKE_NJOBS)) \
+ cmake --build .
}

function cmake_install() {
@@ -902,7 +903,8 @@ function default_build_configure() {
## Default make
#---
default_build_make() {
- make -j "$MAKE_NJOBS" CC="${CC:-cc}" HOSTCC="${HOSTCC:-${CC:-cc}}"
+ ${MAKE:-make} -j $((${#DISTCC_HOSTS[*]} * JOBS_PER_HOST + MAKE_NJOBS)) \
+ CC="${CC:-cc}" HOSTCC="${HOSTCC:-${CC:-cc}}"
}

#---
diff --git a/MESON_FUNCTIONS b/MESON_FUNCTIONS
index ad876bc..e9c0f35 100755
--- a/MESON_FUNCTIONS
+++ b/MESON_FUNCTIONS
@@ -7,7 +7,7 @@ meson_build () {
local MESON_BUILD &&
local MESON_OPTS &&
local BUILDER &&
- local BUILDER_OPTS="-j ${MAKE_NJOBS} -C builddir/" &&
+ 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" &&
diff --git a/NETSURF_FUNCTIONS b/NETSURF_FUNCTIONS
index a9580e4..eb4934c 100755
--- a/NETSURF_FUNCTIONS
+++ b/NETSURF_FUNCTIONS
@@ -5,7 +5,7 @@ default_build () {
(*\ COMPONENT_TYPE=*) ;;
(*) OPTS+=' COMPONENT_TYPE=lib-shared' ;;
esac &&
- make -j "$MAKE_NJOBS" \
+ make -j $((${#DISTCC_HOSTS[*]} * JOBS_PER_HOST + MAKE_NJOBS)) \
PREFIX="${INSTALL_ROOT}/usr" \
$OPTS
}
diff --git a/devel/cmake/BUILD b/devel/cmake/BUILD
index 226e57b..6c0f5e9 100755
--- a/devel/cmake/BUILD
+++ b/devel/cmake/BUILD
@@ -7,6 +7,6 @@ fi &&
--datadir=/share/${SPELL} \
--docdir=/share/doc/${SPELL} \
--mandir=/share/man \
- --parallel=${MAKE_NJOBS} \
+ --parallel=$((${#DISTCC_HOSTS[*]} * JOBS_PER_HOST + MAKE_NJOBS))
\
$OPTS &&
make
diff --git a/graphics-libs/mesa/HISTORY b/graphics-libs/mesa/HISTORY
index f21faac..6898c1f 100644
--- a/graphics-libs/mesa/HISTORY
+++ b/graphics-libs/mesa/HISTORY
@@ -1,3 +1,6 @@
+2024-01-23 Ismael Luceno <ismael AT sourcemage.org>
+ * SUB_DEPENDS: fixed GLES2 subdep
+
2024-01-11 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: actual version 23.3.3, quoting++

diff --git a/graphics-libs/mesa/SUB_DEPENDS b/graphics-libs/mesa/SUB_DEPENDS
index ba221c6..dfb0e93 100755
--- a/graphics-libs/mesa/SUB_DEPENDS
+++ b/graphics-libs/mesa/SUB_DEPENDS
@@ -5,8 +5,8 @@ case $THIS_SUB_DEPENDS in
fi
;;
GLES2)
- if [[ "$MESA_GLES2" == "gles2=false" ]];then
- MESA_GLES="gles2=true"
+ if [[ "$MESA_GLES2" != "gles2=enabled" ]]; then
+ MESA_GLES2="gles2=enabled"
fi
;;
*) echo "Unknown sub_depends $THIS_SUB_DEPENDS!"; return 1 ;;



  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (1f40aeecec9b1a15849be719fa0407aad25b5d28), Ismael Luceno, 01/23/2024

Archive powered by MHonArc 2.6.24.

Top of Page