From 5ea884897dbb2e64dfda0d110db13486c2ac8e50 Mon Sep 17 00:00:00 2001 From: Emily Boudreaux Date: Fri, 12 Jun 2026 16:51:55 -0400 Subject: [PATCH] fix(dl): added dl as a dep older manylinux systems need dl brought in explicitly --- Doxyfile | 2 +- build-config/cppad/meson.build | 8 +++++++- meson.build | 2 +- utils/wheels/build-wheels-linux_aarch64.sh | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Doxyfile b/Doxyfile index 4548d47f..4163bce1 100644 --- a/Doxyfile +++ b/Doxyfile @@ -48,7 +48,7 @@ PROJECT_NAME = GridFire # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = v1.0.0 +PROJECT_NUMBER = v1.0.1 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewers a diff --git a/build-config/cppad/meson.build b/build-config/cppad/meson.build index 1d291b4e..8b2d23f4 100644 --- a/build-config/cppad/meson.build +++ b/build-config/cppad/meson.build @@ -29,8 +29,14 @@ libcppad_static = static_library( install: false ) +dl_dep = dependency('dl', required: false) +if not dl_dep.found() + dl_dep = cpp.find_library('dl', required: false) +endif + cppad_dep = declare_dependency( - include_directories: cppad_incs + include_directories: cppad_incs, + dependencies: dl_dep.found() ? [dl_dep] : [], ) message('Staging vendored CppAD headers for ' + gridfire_vendor_includedir) diff --git a/meson.build b/meson.build index 37ac543d..3bebf4c1 100644 --- a/meson.build +++ b/meson.build @@ -18,7 +18,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # *********************************************************************** # -project('GridFire', ['c', 'cpp'], version: 'v1.0.0', default_options: ['cpp_std=c++23'], meson_version: '>=1.5.0') +project('GridFire', ['c', 'cpp'], version: 'v1.0.1', default_options: ['cpp_std=c++23'], meson_version: '>=1.5.0') gridfire_args = [] diff --git a/utils/wheels/build-wheels-linux_aarch64.sh b/utils/wheels/build-wheels-linux_aarch64.sh index d2990ba7..98857c4a 100755 --- a/utils/wheels/build-wheels-linux_aarch64.sh +++ b/utils/wheels/build-wheels-linux_aarch64.sh @@ -45,7 +45,7 @@ do BUILD_WHEEL_DIR="$(mktemp -d)" CC=clang CXX=clang++ "$PY" -m pip wheel . \ - --no-deps --config-settings=setup-args=-Dunity=on \ + --no-deps \ -w "$BUILD_WHEEL_DIR" -vv CURRENT_WHEEL="$(find "$BUILD_WHEEL_DIR" -name "*.whl" | head -n1)"