From e84bb35b649550cf618d918ca84e408e684bb95a Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Thu, 11 Apr 2024 08:11:18 +1100 Subject: [PATCH 1/5] build with vs on windows --- recipe/bld.bat | 2 -- recipe/meta.yaml | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index e435aed..aaa48b0 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -8,8 +8,6 @@ set "PROCESSOR_ARCHITECTURE=AMD64" set "CXXFLAGS=%CXXFLAGS% -DAVOID_NATIVE_UINT128_T=1" cmake -G "Ninja" ^ - -DCMAKE_C_COMPILER=clang-cl ^ - -DCMAKE_CXX_COMPILER=clang-cl ^ -DCMAKE_BUILD_TYPE="Release" ^ -DCMAKE_CXX_STANDARD=17 ^ -DCMAKE_EXPORT_COMPILE_COMMANDS=ON ^ diff --git a/recipe/meta.yaml b/recipe/meta.yaml index a8fcc24..18451e4 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -9,7 +9,7 @@ source: sha256: 2929f62d69dec0379e529eb632c40e15191e36f3bd58c2cb2df0413a0dc48651 build: - number: 0 + number: 1 # intentionally only windows (main target) & linux (debuggability) skip: true # [osx] track_features: From ba3bc8755b374b0c2b459a60f20b40627457dd7d Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Thu, 11 Apr 2024 09:42:54 +1100 Subject: [PATCH 2/5] switch off build parallelism it blows through azures available memory, despite the swapfile... --- recipe/bld.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index aaa48b0..252b947 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -25,5 +25,5 @@ cmake -G "Ninja" ^ ..\flang if %ERRORLEVEL% neq 0 exit 1 -cmake --build . +cmake --build . -j1 if %ERRORLEVEL% neq 0 exit 1 From 2766da00dff24ca5c0aa14a8487e0cabfc36fee9 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Thu, 11 Apr 2024 17:15:37 +1100 Subject: [PATCH 3/5] remove unused variables in bld.bat --- recipe/bld.bat | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index 252b947..f5d6b84 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -5,7 +5,8 @@ cd build set "PROCESSOR_ARCHITECTURE=AMD64" -set "CXXFLAGS=%CXXFLAGS% -DAVOID_NATIVE_UINT128_T=1" +:: necessary when compiling with clang (which has a native uint128 type; msvc doesn't) +:: set "CXXFLAGS=%CXXFLAGS% -DAVOID_NATIVE_UINT128_T=1" cmake -G "Ninja" ^ -DCMAKE_BUILD_TYPE="Release" ^ @@ -14,14 +15,12 @@ cmake -G "Ninja" ^ -DCMAKE_INSTALL_PREFIX=%LIBRARY_PREFIX% ^ -DCMAKE_MODULE_PATH=../cmake/Modules ^ -DCMAKE_PREFIX_PATH=%LIBRARY_PREFIX%;%LIBRARY_LIB%/clang/%PKG_VERSION% ^ - -DLLVM_BUILD_MAIN_SRC_DIR=.. ^ -DLLVM_EXTERNAL_LIT=%LIBRARY_BIN%/lit ^ -DLLVM_LIT_ARGS=-v ^ -DLLVM_CMAKE_DIR=%LIBRARY_LIB%/cmake/llvm ^ -DCLANG_DIR=%LIBRARY_LIB%/cmake/clang ^ -DFLANG_INCLUDE_TESTS=OFF ^ -DMLIR_DIR=%LIBRARY_LIB%/cmake/mlir ^ - -DTARGET_ARCHITECTURE=AMD64 ^ ..\flang if %ERRORLEVEL% neq 0 exit 1 From 836ced06acd84cf86cd4ca23e19bd7a78e96a5d8 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Thu, 11 Apr 2024 17:22:11 +1100 Subject: [PATCH 4/5] do stdlib transformations --- recipe/conda_build_config.yaml | 2 ++ recipe/meta.yaml | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 recipe/conda_build_config.yaml diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml new file mode 100644 index 0000000..7450ec2 --- /dev/null +++ b/recipe/conda_build_config.yaml @@ -0,0 +1,2 @@ +c_stdlib_version: # [linux] + - "2.17" # [linux] diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 18451e4..e046c57 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -18,10 +18,10 @@ build: requirements: build: - {{ compiler('c') }} + - {{ stdlib('c') }} - {{ compiler('cxx') }} - cmake - ninja - - sysroot_linux-64 ==2.17 # [linux64] - mlir =={{ version }} # [build_platform != target_platform] host: - clangdev =={{ version }} @@ -44,6 +44,7 @@ outputs: build: # for strong run-exports - {{ compiler('c') }} + - {{ stdlib('c') }} - {{ compiler('cxx') }} host: - clangdev =={{ version }} @@ -91,6 +92,7 @@ outputs: - ninja # for strong run-exports - {{ compiler('c') }} + - {{ stdlib('c') }} - {{ compiler('cxx') }} host: - clangdev =={{ version }} @@ -106,7 +108,7 @@ outputs: - {{ pin_subpackage('libflang', exact=True) }} - {{ pin_subpackage('libfortran-main', exact=True) }} run: - - sysroot_{{ target_platform }} ==2.17 # [linux] + - sysroot_{{ target_platform }} >={{ c_stdlib_version }} # [linux] - clangdev =={{ version }} - llvm-openmp =={{ version }} - {{ pin_subpackage('libflang', exact=True) }} From 4c562ca17373a34231ce172737fc1aaaba85763f Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Thu, 11 Apr 2024 17:28:08 +1100 Subject: [PATCH 5/5] MNT: Re-rendered with conda-build 24.3.0, conda-smithy 3.34.1, and conda-forge-pinning 2024.04.11.05.55.23 --- .ci_support/linux_64_.yaml | 2 +- .ci_support/win_64_.yaml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index 665eab5..8ac82ec 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -5,7 +5,7 @@ c_compiler_version: c_stdlib: - sysroot c_stdlib_version: -- '2.12' +- '2.17' cdt_name: - cos6 channel_sources: diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml index 114bcc1..ed5eb7a 100644 --- a/.ci_support/win_64_.yaml +++ b/.ci_support/win_64_.yaml @@ -2,6 +2,8 @@ c_compiler: - vs2019 c_stdlib: - vs +c_stdlib_version: +- '2019' channel_sources: - conda-forge channel_targets: