From 80a6d9c786eb47fc792896f41df1a4766ac01d95 Mon Sep 17 00:00:00 2001 From: Ray Speth Date: Fri, 18 Nov 2022 09:30:55 -0500 Subject: [PATCH] TEMP: figuring out libintl crap --- .github/workflows/main.yml | 4 ++++ site_scons/buildutils.py | 3 +++ 2 files changed, 7 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9a8d4814569..af3d8d31dc4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -122,6 +122,10 @@ jobs: run: | brew install boost libomp hdf5 brew unlink gettext + echo "=== find libintl ===" + find /Users/runner -name libintl.dylib + echo "=== python config_vars ===" + python3 -c 'import sysconfig; import pprint; pprint.pprint(sysconfig.get_config_vars())' - name: Upgrade pip run: python3 -m pip install -U pip 'setuptools>=47.0.0,<48' wheel - name: Install Python dependencies diff --git a/site_scons/buildutils.py b/site_scons/buildutils.py index bfc234293e3..953890bcb46 100644 --- a/site_scons/buildutils.py +++ b/site_scons/buildutils.py @@ -1321,6 +1321,9 @@ def setup_python_env(env): if env['OS'] == 'Darwin': env.Append(LINKFLAGS='-undefined dynamic_lookup') + # Workaround for incorrect config info in some places (including GitHub Actions) + if 'intl' in env['py_libs']: + env['py_libs'].remove('intl') elif env['OS'] == 'Windows': env.Append(LIBPATH=prefix + '/libs') if env['toolchain'] == 'mingw':