From ebb77548b70bd113b89698b090b631275507a5b7 Mon Sep 17 00:00:00 2001 From: The MMGen Project Date: Sun, 21 May 2023 11:34:17 +0000 Subject: [PATCH] setup.py: add workaround for MSYS2 UCRT64 env path bug MMGen now uses UCRT64 as the default MSYS2 configuration (see doc/wiki/install-mswin/Install-MMGen-on-Microsoft-Windows.md). --- mmgen/data/version | 2 +- setup.py | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/mmgen/data/version b/mmgen/data/version index b718e2cf..c3781b36 100644 --- a/mmgen/data/version +++ b/mmgen/data/version @@ -1 +1 @@ -13.3.dev57 +13.3.dev58 diff --git a/setup.py b/setup.py index ddfb78e9..ddee758d 100755 --- a/setup.py +++ b/setup.py @@ -20,9 +20,14 @@ def build_libsecp256k1(): print(f'Fixing broken library filename: {old.name!r} -> {new.name!r}') shutil.copy2(old,new) + def fix_broken_aclocal_path(): + os.environ['ACLOCAL_PATH'] = '/ucrt64/share/aclocal:/usr/share/aclocal' + import platform if platform.system() == 'Windows': fix_broken_libpython_fn() + if os.getenv('MSYSTEM') == 'UCRT64': + fix_broken_aclocal_path() if not os.path.exists(cache_path): os.makedirs(cache_path)