sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[[SM-Commit] ] GIT changes to master grimoire by Justin Boffemmyer (f8f4c21b5b3071f045041da4bc9d9d57d3eddb86)
- From: Justin Boffemmyer <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 Justin Boffemmyer (f8f4c21b5b3071f045041da4bc9d9d57d3eddb86)
- Date: Sun, 19 Jan 2025 22:36:23 +0000
GIT changes to master grimoire by Justin Boffemmyer <flux AT sourcemage.org>:
ChangeLog | 3 +++
build_system_handler.function | 10 ++++++++--
graphics-libs/mesa/BUILD | 7 +++++--
graphics-libs/mesa/HISTORY | 3 +++
4 files changed, 19 insertions(+), 4 deletions(-)
New commits:
commit f8f4c21b5b3071f045041da4bc9d9d57d3eddb86
Author: Justin Boffemmyer <flux AT sourcemage.org>
Commit: Justin Boffemmyer <flux AT sourcemage.org>
build_system_handler.function: fix subdep handling
Correct the handling of the sub-depeendency option -sub by not breaking
the quoting of the argument to it. Add bashdoc documentation for the
-sub parameter.
commit 64d470c96c3c88b14d5e8a939af83216d497c01f
Author: Justin Boffemmyer <flux AT sourcemage.org>
Commit: Justin Boffemmyer <flux AT sourcemage.org>
graphics-libs/mesa: remove -DPIC from CXXFLAGS
Prevent build errors by forcibly removing -DPIC from CXXFLAGS. If -DPIC
is included in the flags then LLVM (in particular, libclc) will yield
errors because there are functions whose parameters are named PIC (such
as bool PIC), resulting in function parameter definitions like "bool 1"
after preprocessing, which is invalid C++.
diff --git a/ChangeLog b/ChangeLog
index 70485f1..81d3712 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2025-01-20 Justin Boffemmyer <flux AT sourcemage.org>
+ * build_system_handler.function: fix and document subdep handling
+
2025-01-19 Justin Boffemmyer <flux AT sourcemage.org>
* MESON_FUNCTIONS: new function, meson_opt(), for converting
config_query* values into meson option values in BUILD
diff --git a/build_system_handler.function b/build_system_handler.function
index 47bddb8..25bbdc0 100644
--- a/build_system_handler.function
+++ b/build_system_handler.function
@@ -132,6 +132,8 @@ buildsys_meson_default() {
## @param -g grimoire (optional, flag to specify the grimoire to use)
## @param -o global_optname (optional, flag to give the default option
## name to use across all build systems)
+## @param -sub sub_dependency (optional, flag to give the
+## sub-dependencies)
## @param spell_name (the name of the actual dependency as a spell)
## @param [-b] build_system (the build system to define options for,
## e.g. cmake, meson, autotools, etc.)
@@ -198,7 +200,7 @@ _buildsys_transform_depends() {
case "$1" in
-g) grimoire="$2" && shift 2 ;;
-o) global_optname="$2" && shift 2 ;;
- -sub) subdeps="$subdeps $1 $2" && shift 2 ;;
+ -sub) subdeps="$2" && shift 2 ;;
*) break ;;
esac
done &&
@@ -268,7 +270,11 @@ _buildsys_transform_depends() {
# provide a last-resort fallback value for enabled settings
: "${enabled:=$(buildsys_defaults "$targetsys" enabled
"$global_optname")}"
fi
- "$depends_func" $subdeps "$spell" "$enabled" ${disabled:+"$disabled"}
"$msg" "$grimoire"
+ "$depends_func" ${subdeps:+-sub "$subdeps"} "$spell" \
+ "$enabled" \
+ ${disabled:+"$disabled"} \
+ "$msg" \
+ "$grimoire"
}
#---------------------------------------------------------------------
diff --git a/graphics-libs/mesa/BUILD b/graphics-libs/mesa/BUILD
index 7aa93c1..8451385 100755
--- a/graphics-libs/mesa/BUILD
+++ b/graphics-libs/mesa/BUILD
@@ -21,6 +21,9 @@ case "$HOST" in
;;
esac &&
+# Remove -DPIC from compiler flags, produces build errors
+CXXFLAGS="${CXXFLAGS//-DPIC}" &&
+
local link_llvm_shared
case "$MESA_LINK_LLVM_SHARED" in
shared) link_llvm_shared="y" ;;
@@ -47,13 +50,13 @@ meson_opt feature "glvnd" "$MESA_GLVND"
&&
meson_opt choice "glx" "$MESA_GLX" &&
meson_opt boolean "glx-direct" "$MESA_GLX_DIRECT" &&
meson_opt boolean "glx-read-only-text" "$MESA_GLX_READONLY" &&
+meson_opt boolean "gpuvis" "$MESA_GPUVIS" &&
+meson_opt feature "intel-rt" "$MESA_INTEL_RAYTRACE" &&
meson_opt boolean "llvm-orcjit" "$MESA_LLVM_ORCJIT" &&
meson_opt boolean "opencl-spirv" "$MESA_OPENCL_SPIRV" &&
meson_opt boolean "opengl" "$MESA_OPENGL" &&
meson_opt boolean "osmesa" "$MESA_OSMESA" &&
meson_opt boolean "perfetto" "$MESA_PERFETTO" &&
-meson_opt boolean "gpuvis" "$MESA_GPUVIS" &&
-meson_opt feature "intel-rt" "$MESA_INTEL_RAYTRACE" &&
meson_opt feature "shader-cache" "$MESA_SHADER_CACHE" &&
meson_opt feature "shared-llvm" "$link_llvm_shared" &&
meson_opt boolean "spirv-to-dxil" "$MESA_SPIRV_DXIL" &&
diff --git a/graphics-libs/mesa/HISTORY b/graphics-libs/mesa/HISTORY
index 9dc0e02..ea20b5b 100644
--- a/graphics-libs/mesa/HISTORY
+++ b/graphics-libs/mesa/HISTORY
@@ -1,3 +1,6 @@
+2025-01-20 Justin Boffemmyer <flux AT sourcemage.org>
+ * BUILD: remove -DPIC from CXXFLAGS to prevent build errors
+
2025-01-19 Justin Boffemmyer <flux AT sourcemage.org>
* BUILD: update llvm target sub-dependency naming, use meson_opt to
* CONFIGURE: update and complete to match current upstream options
- [[SM-Commit] ] GIT changes to master grimoire by Justin Boffemmyer (f8f4c21b5b3071f045041da4bc9d9d57d3eddb86), Justin Boffemmyer, 01/19/2025
Archive powered by MHonArc 2.6.24.