Merge pull request #144 from h-vetinari/meson

correctly set meson_release_flag
conda-forge · Oct 10, 2024 · 9986a8a · 9986a8a
2 parents 47960cc + a34a64d
commit 9986a8a
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 14 deletions.
diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml
diff --git a/README.md b/README.md
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
diff --git a/recipe/activate-clang.sh b/recipe/activate-clang.sh
@@ -138,7 +138,7 @@ if [ "${MACOSX_DEPLOYMENT_TARGET:-0}" != "0" ]; then
 fi
 _CMAKE_ARGS="${_CMAKE_ARGS} -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_SYSROOT=${CONDA_BUILD_SYSROOT_TEMP}"
 
-_MESON_ARGS="@MESON_RELEASE_FLAG@"
+_MESON_ARGS="-Dbuildtype=release"
 
 if [ "${CONDA_BUILD:-0}" = "1" ]; then
   _CMAKE_ARGS="${_CMAKE_ARGS} -DCMAKE_FIND_FRAMEWORK=LAST -DCMAKE_FIND_APPBUNDLE=LAST"

diff --git a/recipe/build.sh b/recipe/build.sh
@@ -48,7 +48,6 @@ find . -name "*activate*.sh" -exec sed -i.bak "s|@CONDA_BUILD_CROSS_COMPILATION@
 find . -name "*activate*.sh" -exec sed -i.bak "s|@_PYTHON_SYSCONFIGDATA_NAME@|${FINAL_PYTHON_SYSCONFIGDATA_NAME}|g"  "{}" \;
 find . -name "*activate*.sh" -exec sed -i.bak "s|@UNAME_MACHINE@|${uname_machine}|g"         "{}" \;
 find . -name "*activate*.sh" -exec sed -i.bak "s|@MESON_CPU_FAMILY@|${meson_cpu_family}|g"         "{}" \;
-find . -name "*activate*.sh" -exec sed -i.bak "s|@MESON_RELEASE_FLAG@|${meson_release_flag}|g"     "{}" \;
 find . -name "*activate*.sh" -exec sed -i.bak "s|@UNAME_KERNEL_RELEASE@|${uname_kernel_release}|g" "{}" \;
 find . -name "*activate*.sh" -exec sed -i.bak "s|@TARGET_PLATFORM@|${cross_target_platform}|g"     "{}" \;
 find . -name "*activate*.sh.bak" -exec rm "{}" \;
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -6,10 +6,7 @@
 # of the C++ stdlib; keep the variable in case this happens again
 {% set libcxx_major = major_ver %}
 
-{% set build_number = 20 %}
-
-# pretend this variable is used, so that smithy populates the variant configs
-# [meson_release_flag]
+{% set build_number = 21 %}
 
 package:
   name: clang-compiler-activation