From d699b4311be7c82a160a0fb457b325e4da8ffc76 Mon Sep 17 00:00:00 2001 From: Dmitry Vedenko Date: Mon, 2 Aug 2021 13:48:29 +0300 Subject: [PATCH] Set propper ABI on Linux This change only affects Debian and Ubuntu, on other systems libcxx ABI is detected correctly anyway --- linux/packages/build_package.sh | 1 + linux/packages/prepare_offline_dependencies.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/linux/packages/build_package.sh b/linux/packages/build_package.sh index 558119d16..d03ed5abd 100755 --- a/linux/packages/build_package.sh +++ b/linux/packages/build_package.sh @@ -15,6 +15,7 @@ if [[ -d "audacity-offline-dependencies" ]]; then conan config home conan config init conan config set storage.download_cache="$CONAN_USER_HOME/download_cache" + conan profile update settings.compiler.libcxx=libstdc++11 default fi cmake -S audacity -B build $@ diff --git a/linux/packages/prepare_offline_dependencies.sh b/linux/packages/prepare_offline_dependencies.sh index 40010fd40..b164c2b9f 100755 --- a/linux/packages/prepare_offline_dependencies.sh +++ b/linux/packages/prepare_offline_dependencies.sh @@ -44,6 +44,7 @@ pushd temp conan config home conan config init conan config set storage.download_cache="$CONAN_USER_HOME/download_cache" + conan profile update settings.compiler.libcxx=libstdc++11 default # Configure Audacity so we can collect the required # packages.