From f37b41d6cc7f6066065ebc071811cd6355a582f6 Mon Sep 17 00:00:00 2001 From: Shaikh Ubaid Date: Sun, 26 May 2024 11:23:16 +0530 Subject: [PATCH 01/18] Build with target WASM --- recipe/build.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipe/build.sh b/recipe/build.sh index 871f9ad..0976cc4 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -33,6 +33,7 @@ if [[ "${CONDA_BUILD_CROSS_COMPILATION:-0}" == 1 ]]; then -DWITH_RUNTIME_LIBRARY=yes \ -DWITH_RUNTIME_STACKTRACE=yes \ -DCMAKE_INSTALL_LIBDIR=share/lfortran/lib \ + -DWITH_TARGET_WASM=yes \ $SRC_DIR make ) @@ -53,6 +54,7 @@ cmake ${CMAKE_ARGS} \ -DWITH_RUNTIME_LIBRARY=$WRT \ -DWITH_RUNTIME_STACKTRACE=yes \ -DCMAKE_INSTALL_LIBDIR=share/lfortran/lib \ + -DWITH_TARGET_WASM=yes \ $SRC_DIR make -j${CPU_COUNT} From 202c7369776258d873f94e403b2d3d0d84ac049d Mon Sep 17 00:00:00 2001 From: Shaikh Ubaid Date: Sun, 26 May 2024 11:23:27 +0530 Subject: [PATCH 02/18] Install WASI_SDK --- recipe/build.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/recipe/build.sh b/recipe/build.sh index 0976cc4..c86a0d8 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -2,6 +2,17 @@ set -ex + +CUR_DIR=`pwd` +cd $HOME +curl -o wasi-sdk.tar.gz -L https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-21/wasi-sdk-21.0-macos.tar.gz +tar -xvf wasi-sdk.tar.gz +export WASI_SDK_PATH=$HOME/wasi-sdk-21.0 +echo $WASI_SDK_PATH +$WASI_SDK_PATH/bin/clang --version + +cd $CUR_DIR + export CXXFLAGS="${CXXFLAGS} -D__STDC_FORMAT_MACROS -D_LIBCPP_DISABLE_AVAILABILITY" if [[ "${CONDA_BUILD_CROSS_COMPILATION:-0}" == 1 ]]; then From 8e8b48dd7ccaf218bc330f592576623f2a4b6ce1 Mon Sep 17 00:00:00 2001 From: Shaikh Ubaid Date: Mon, 27 May 2024 07:57:44 +0530 Subject: [PATCH 03/18] Add a patch for crtlib dir --- recipe/crtlib_dir.patch | 11 +++++++++++ recipe/meta.yaml | 2 ++ 2 files changed, 13 insertions(+) create mode 100644 recipe/crtlib_dir.patch diff --git a/recipe/crtlib_dir.patch b/recipe/crtlib_dir.patch new file mode 100644 index 0000000..ad48c6b --- /dev/null +++ b/recipe/crtlib_dir.patch @@ -0,0 +1,11 @@ +diff --git a/src/runtime/legacy/CMakeLists.txt b/src/runtime/legacy/CMakeLists.txt +index 3795d800c..ce1ebed86 100644 +--- a/src/runtime/legacy/CMakeLists.txt ++++ b/src/runtime/legacy/CMakeLists.txt +@@ -1,5 +1,5 @@ + set(SRC +- ../../../src/libasr/runtime/lfortran_intrinsics.c ++ ${CMAKE_CURRENT_SOURCE_DIR}/../../libasr/runtime/lfortran_intrinsics.c + ) + + if(WIN32) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 5d02e47..0af9edb 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -8,6 +8,8 @@ package: source: url: https://github.com/lfortran/lfortran/releases/download/v{{ version }}/{{ name }}-{{ version }}.tar.gz sha256: 5ecc1ae03067b985943c45f6ec05e9f6e72efd6ad004b052e7a98ba552ff79b0 + patches: + - crtlib_dir.patch build: number: 0 From 8bc8dd05c446e320f0e248582825be4d83e6548c Mon Sep 17 00:00:00 2001 From: Shaikh Ubaid Date: Mon, 27 May 2024 08:24:04 +0530 Subject: [PATCH 04/18] Support WASI_SDK for both linux and mac --- recipe/build.sh | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/recipe/build.sh b/recipe/build.sh index c86a0d8..fe891e4 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -5,7 +5,15 @@ set -ex CUR_DIR=`pwd` cd $HOME -curl -o wasi-sdk.tar.gz -L https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-21/wasi-sdk-21.0-macos.tar.gz + +WASI_SDK_DOWNLOAD_LINK="" +if [[ $(uname -m) == 'arm64' ]]; then + WASI_SDK_DOWNLOAD_LINK="https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-21/wasi-sdk-21.0-macos.tar.gz" +else + WASI_SDK_DOWNLOAD_LINK="https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-21/wasi-sdk-21.0-linux.tar.gz" +fi + +curl -o wasi-sdk.tar.gz -L $WASI_SDK_DOWNLOAD_LINK tar -xvf wasi-sdk.tar.gz export WASI_SDK_PATH=$HOME/wasi-sdk-21.0 echo $WASI_SDK_PATH From d6497fe50599a27b978fa3fa52f5de35e8ca497e Mon Sep 17 00:00:00 2001 From: Shaikh Ubaid Date: Mon, 27 May 2024 08:42:08 +0530 Subject: [PATCH 05/18] Update patch --- recipe/crtlib_dir.patch | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/recipe/crtlib_dir.patch b/recipe/crtlib_dir.patch index ad48c6b..cf8c0bc 100644 --- a/recipe/crtlib_dir.patch +++ b/recipe/crtlib_dir.patch @@ -1,11 +1,20 @@ diff --git a/src/runtime/legacy/CMakeLists.txt b/src/runtime/legacy/CMakeLists.txt -index 3795d800c..ce1ebed86 100644 +index 3795d800c..4f4f24c1c 100644 --- a/src/runtime/legacy/CMakeLists.txt +++ b/src/runtime/legacy/CMakeLists.txt @@ -1,5 +1,5 @@ set(SRC - ../../../src/libasr/runtime/lfortran_intrinsics.c -+ ${CMAKE_CURRENT_SOURCE_DIR}/../../libasr/runtime/lfortran_intrinsics.c ++ ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/libasr/runtime/lfortran_intrinsics.c ) if(WIN32) +@@ -32,7 +32,7 @@ if(WITH_TARGET_WASM) + endif() + + add_custom_command(OUTPUT lfortran_runtime_wasm.o +- COMMAND $ENV{WASI_SDK_PATH}/bin/clang -I${libasr_SOURCE_DIR}/.. -DCOMPILE_TO_WASM ++ COMMAND $ENV{WASI_SDK_PATH}/bin/clang -I${CMAKE_CURRENT_SOURCE_DIR}/../.. -DCOMPILE_TO_WASM + -D_WASI_EMULATED_PROCESS_CLOCKS -c --target=wasm32-wasi ${SRC} -o lfortran_runtime_wasm.o + COMMENT "Cross compiling lfortran_intrinscs.c to lfortran_runtime_wasm.o" + DEPENDS ${SRC}) From efe3b24b34141461bde31e991daa985eb267fed5 Mon Sep 17 00:00:00 2001 From: Shaikh Ubaid Date: Mon, 27 May 2024 09:33:18 +0530 Subject: [PATCH 06/18] Use 2.27 version for c_stdlib --- .ci_support/linux_64_.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index 665eab5..075f21e 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.27' cdt_name: - cos6 channel_sources: From 5351d93564bd87bedc90d7a25461b5962f308a86 Mon Sep 17 00:00:00 2001 From: Shaikh Ubaid Date: Mon, 27 May 2024 09:36:35 +0530 Subject: [PATCH 07/18] Improve/Fix WASI_SDK_DOWNLOAD steps --- recipe/build.sh | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/recipe/build.sh b/recipe/build.sh index fe891e4..e1a7007 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -7,12 +7,19 @@ CUR_DIR=`pwd` cd $HOME WASI_SDK_DOWNLOAD_LINK="" -if [[ $(uname -m) == 'arm64' ]]; then - WASI_SDK_DOWNLOAD_LINK="https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-21/wasi-sdk-21.0-macos.tar.gz" + +if [[ $(uname -s) == "Darwin" ]]; then + if [[ $(uname -m) == "arm64" ]]; then + WASI_SDK_DOWNLOAD_LINK="https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-21/wasi-sdk-21.0-macos.tar.gz" + else + WASI_SDK_DOWNLOAD_LINK="https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-21/wasi-sdk-21.0-macos.tar.gz" + fi else WASI_SDK_DOWNLOAD_LINK="https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-21/wasi-sdk-21.0-linux.tar.gz" fi +echo "WASI SDK download link: $WASI_SDK_DOWNLOAD_LINK" + curl -o wasi-sdk.tar.gz -L $WASI_SDK_DOWNLOAD_LINK tar -xvf wasi-sdk.tar.gz export WASI_SDK_PATH=$HOME/wasi-sdk-21.0 From 3ac8beab5b80ece107c574a4a86ae012a9fff546 Mon Sep 17 00:00:00 2001 From: Shaikh Ubaid Date: Mon, 27 May 2024 10:25:58 +0530 Subject: [PATCH 08/18] Update patch --- recipe/crtlib_dir.patch | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/recipe/crtlib_dir.patch b/recipe/crtlib_dir.patch index cf8c0bc..36f5c5b 100644 --- a/recipe/crtlib_dir.patch +++ b/recipe/crtlib_dir.patch @@ -1,5 +1,20 @@ +diff --git a/src/libasr/runtime/lfortran_intrinsics.c b/src/libasr/runtime/lfortran_intrinsics.c +index 954900615..cb9110c21 100644 +--- a/src/libasr/runtime/lfortran_intrinsics.c ++++ b/src/libasr/runtime/lfortran_intrinsics.c +@@ -19,8 +19,8 @@ + # include + #endif + +-#include +-#include ++#include "./lfortran_intrinsics.h" ++#include "./../config.h" + + #ifdef HAVE_RUNTIME_STACKTRACE + diff --git a/src/runtime/legacy/CMakeLists.txt b/src/runtime/legacy/CMakeLists.txt -index 3795d800c..4f4f24c1c 100644 +index 3795d800c..f7e66d297 100644 --- a/src/runtime/legacy/CMakeLists.txt +++ b/src/runtime/legacy/CMakeLists.txt @@ -1,5 +1,5 @@ @@ -7,14 +22,5 @@ index 3795d800c..4f4f24c1c 100644 - ../../../src/libasr/runtime/lfortran_intrinsics.c + ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/libasr/runtime/lfortran_intrinsics.c ) - + if(WIN32) -@@ -32,7 +32,7 @@ if(WITH_TARGET_WASM) - endif() - - add_custom_command(OUTPUT lfortran_runtime_wasm.o -- COMMAND $ENV{WASI_SDK_PATH}/bin/clang -I${libasr_SOURCE_DIR}/.. -DCOMPILE_TO_WASM -+ COMMAND $ENV{WASI_SDK_PATH}/bin/clang -I${CMAKE_CURRENT_SOURCE_DIR}/../.. -DCOMPILE_TO_WASM - -D_WASI_EMULATED_PROCESS_CLOCKS -c --target=wasm32-wasi ${SRC} -o lfortran_runtime_wasm.o - COMMENT "Cross compiling lfortran_intrinscs.c to lfortran_runtime_wasm.o" - DEPENDS ${SRC}) From b0c76d475f44a8194373bd09e2ee546cdc7d83b6 Mon Sep 17 00:00:00 2001 From: Shaikh Ubaid Date: Mon, 27 May 2024 20:43:36 +0530 Subject: [PATCH 09/18] Update patch --- recipe/crtlib_dir.patch | 40 +++++++++++++++++++++++----------------- 1 file changed, 23 insertions(+), 17 deletions(-) diff --git a/recipe/crtlib_dir.patch b/recipe/crtlib_dir.patch index 36f5c5b..a0371b1 100644 --- a/recipe/crtlib_dir.patch +++ b/recipe/crtlib_dir.patch @@ -1,20 +1,17 @@ -diff --git a/src/libasr/runtime/lfortran_intrinsics.c b/src/libasr/runtime/lfortran_intrinsics.c -index 954900615..cb9110c21 100644 ---- a/src/libasr/runtime/lfortran_intrinsics.c -+++ b/src/libasr/runtime/lfortran_intrinsics.c -@@ -19,8 +19,8 @@ - # include - #endif - --#include --#include -+#include "./lfortran_intrinsics.h" -+#include "./../config.h" - - #ifdef HAVE_RUNTIME_STACKTRACE - +diff --git a/src/libasr/CMakeLists.txt b/src/libasr/CMakeLists.txt +index aaf9db92c..f74a1d630 100644 +--- a/src/libasr/CMakeLists.txt ++++ b/src/libasr/CMakeLists.txt +@@ -13,6 +13,7 @@ if (NOT LFORTRAN_VERSION) + endif () + + configure_file(config.h.in config.h) ++add_custom_target(lfortran_intrinsics_config ALL DEPENDS config.h) + + set(SRC + codegen/asr_to_cpp.cpp diff --git a/src/runtime/legacy/CMakeLists.txt b/src/runtime/legacy/CMakeLists.txt -index 3795d800c..f7e66d297 100644 +index 3795d800c..2c58b88ac 100644 --- a/src/runtime/legacy/CMakeLists.txt +++ b/src/runtime/legacy/CMakeLists.txt @@ -1,5 +1,5 @@ @@ -22,5 +19,14 @@ index 3795d800c..f7e66d297 100644 - ../../../src/libasr/runtime/lfortran_intrinsics.c + ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/libasr/runtime/lfortran_intrinsics.c ) - + if(WIN32) +@@ -35,7 +35,7 @@ if(WITH_TARGET_WASM) + COMMAND $ENV{WASI_SDK_PATH}/bin/clang -I${libasr_SOURCE_DIR}/.. -DCOMPILE_TO_WASM + -D_WASI_EMULATED_PROCESS_CLOCKS -c --target=wasm32-wasi ${SRC} -o lfortran_runtime_wasm.o + COMMENT "Cross compiling lfortran_intrinscs.c to lfortran_runtime_wasm.o" +- DEPENDS ${SRC}) ++ DEPENDS ${SRC} lfortran_intrinsics_config) + add_custom_target(lfortran_runtime_wasm ALL DEPENDS lfortran_runtime_wasm.o) + install(FILES lfortran_runtime_wasm.o + DESTINATION ${CMAKE_INSTALL_LIBDIR}) From 837f3f15e8005489ee3881cfe5287acfe81cb9d0 Mon Sep 17 00:00:00 2001 From: Shaikh Ubaid Date: Mon, 27 May 2024 21:41:59 +0530 Subject: [PATCH 10/18] Update patch --- recipe/crtlib_dir.patch | 68 +++++++++++++++++++++++++++-------------- 1 file changed, 45 insertions(+), 23 deletions(-) diff --git a/recipe/crtlib_dir.patch b/recipe/crtlib_dir.patch index a0371b1..44f5dac 100644 --- a/recipe/crtlib_dir.patch +++ b/recipe/crtlib_dir.patch @@ -1,17 +1,48 @@ -diff --git a/src/libasr/CMakeLists.txt b/src/libasr/CMakeLists.txt -index aaf9db92c..f74a1d630 100644 ---- a/src/libasr/CMakeLists.txt -+++ b/src/libasr/CMakeLists.txt -@@ -13,6 +13,7 @@ if (NOT LFORTRAN_VERSION) - endif () - - configure_file(config.h.in config.h) -+add_custom_target(lfortran_intrinsics_config ALL DEPENDS config.h) - - set(SRC - codegen/asr_to_cpp.cpp +diff --git a/src/libasr/config.h b/src/libasr/config.h +new file mode 100644 +index 000000000..e45e05ea7 +--- /dev/null ++++ b/src/libasr/config.h +@@ -0,0 +1,37 @@ ++#ifndef LFORTRAN_CONFIG_H ++#define LFORTRAN_CONFIG_H ++ ++/* Define if you want to enable ASSERT testing in LFortran */ ++#define WITH_LFORTRAN_ASSERT ++ ++/* LFortran version */ ++#define LFORTRAN_VERSION "0.35.0-dirty" ++#define LFORTRAN_MAJOR 0 ++#define LFORTRAN_MINOR 35 ++#define LFORTRAN_PATCHLEVEL 0 ++ ++/* Define if LLVM is enabled */ ++#define HAVE_LFORTRAN_LLVM ++ ++/* Define if RAPIDJSON is found */ ++/* #undef HAVE_LFORTRAN_RAPIDJSON */ ++ ++/* Define if stacktrace is enabled */ ++#define HAVE_LFORTRAN_STACKTRACE ++#define HAVE_RUNTIME_STACKTRACE ++/* #undef HAVE_LFORTRAN_BFD */ ++#define HAVE_LFORTRAN_DWARFDUMP ++/* #undef HAVE_LFORTRAN_LINK */ ++#define HAVE_LFORTRAN_MACHO ++#define HAVE_LFORTRAN_UNWIND ++ ++/* Define if cxxabi.h is present */ ++#define HAVE_LFORTRAN_DEMANGLE ++ ++/* Define if XEUS is enabled */ ++/* #undef HAVE_LFORTRAN_XEUS */ ++ ++/* Define if we should use binary modfiles */ ++#define WITH_LFORTRAN_BINARY_MODFILES ++ ++#endif // LFORTRAN_CONFIG_H diff --git a/src/runtime/legacy/CMakeLists.txt b/src/runtime/legacy/CMakeLists.txt -index 3795d800c..2c58b88ac 100644 +index 3795d800c..f7e66d297 100644 --- a/src/runtime/legacy/CMakeLists.txt +++ b/src/runtime/legacy/CMakeLists.txt @@ -1,5 +1,5 @@ @@ -19,14 +50,5 @@ index 3795d800c..2c58b88ac 100644 - ../../../src/libasr/runtime/lfortran_intrinsics.c + ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/libasr/runtime/lfortran_intrinsics.c ) - + if(WIN32) -@@ -35,7 +35,7 @@ if(WITH_TARGET_WASM) - COMMAND $ENV{WASI_SDK_PATH}/bin/clang -I${libasr_SOURCE_DIR}/.. -DCOMPILE_TO_WASM - -D_WASI_EMULATED_PROCESS_CLOCKS -c --target=wasm32-wasi ${SRC} -o lfortran_runtime_wasm.o - COMMENT "Cross compiling lfortran_intrinscs.c to lfortran_runtime_wasm.o" -- DEPENDS ${SRC}) -+ DEPENDS ${SRC} lfortran_intrinsics_config) - add_custom_target(lfortran_runtime_wasm ALL DEPENDS lfortran_runtime_wasm.o) - install(FILES lfortran_runtime_wasm.o - DESTINATION ${CMAKE_INSTALL_LIBDIR}) From 9e70b23d87cb58bdf8bc1d5361e0c1fd261f40b2 Mon Sep 17 00:00:00 2001 From: Shaikh Ubaid Date: Mon, 27 May 2024 22:46:53 +0530 Subject: [PATCH 11/18] Update patch --- recipe/crtlib_dir.patch | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/recipe/crtlib_dir.patch b/recipe/crtlib_dir.patch index 44f5dac..90902a6 100644 --- a/recipe/crtlib_dir.patch +++ b/recipe/crtlib_dir.patch @@ -42,7 +42,7 @@ index 000000000..e45e05ea7 + +#endif // LFORTRAN_CONFIG_H diff --git a/src/runtime/legacy/CMakeLists.txt b/src/runtime/legacy/CMakeLists.txt -index 3795d800c..f7e66d297 100644 +index 3795d800c..bebd8460f 100644 --- a/src/runtime/legacy/CMakeLists.txt +++ b/src/runtime/legacy/CMakeLists.txt @@ -1,5 +1,5 @@ @@ -50,5 +50,25 @@ index 3795d800c..f7e66d297 100644 - ../../../src/libasr/runtime/lfortran_intrinsics.c + ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/libasr/runtime/lfortran_intrinsics.c ) - + if(WIN32) +@@ -31,15 +31,15 @@ if(WITH_TARGET_WASM) + message(FATAL_ERROR "'WASI_SDK_PATH' must be set when building with 'WITH_TARGET_WASM'") + endif() + +- add_custom_command(OUTPUT lfortran_runtime_wasm.o ++ add_custom_command(OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/lfortran_runtime_wasm.o + COMMAND $ENV{WASI_SDK_PATH}/bin/clang -I${libasr_SOURCE_DIR}/.. -DCOMPILE_TO_WASM +- -D_WASI_EMULATED_PROCESS_CLOCKS -c --target=wasm32-wasi ${SRC} -o lfortran_runtime_wasm.o ++ -D_WASI_EMULATED_PROCESS_CLOCKS -c --target=wasm32-wasi ${SRC} -o ${CMAKE_CURRENT_SOURCE_DIR}/lfortran_runtime_wasm.o + COMMENT "Cross compiling lfortran_intrinscs.c to lfortran_runtime_wasm.o" + DEPENDS ${SRC}) +- add_custom_target(lfortran_runtime_wasm ALL DEPENDS lfortran_runtime_wasm.o) +- install(FILES lfortran_runtime_wasm.o ++ add_custom_target(lfortran_runtime_wasm ALL DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/lfortran_runtime_wasm.o) ++ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/lfortran_runtime_wasm.o + DESTINATION ${CMAKE_INSTALL_LIBDIR}) +- install(FILES lfortran_runtime_wasm.o ++ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/lfortran_runtime_wasm.o + DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/..) + endif() From 3812de8881b332847b88ce95c97a7e0510bc4ba2 Mon Sep 17 00:00:00 2001 From: Shaikh Ubaid Date: Tue, 28 May 2024 07:32:28 +0530 Subject: [PATCH 12/18] Revert "Use 2.27 version for c_stdlib" This reverts commit efe3b24b34141461bde31e991daa985eb267fed5. --- .ci_support/linux_64_.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index 075f21e..665eab5 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.27' +- '2.12' cdt_name: - cos6 channel_sources: From 2035080900cb720b7bee33f703fb74f3a3ad3ab1 Mon Sep 17 00:00:00 2001 From: Shaikh Ubaid Date: Tue, 28 May 2024 07:34:09 +0530 Subject: [PATCH 13/18] Fix c_stdlib_version to 2.28 in conda_build_config.yaml --- recipe/conda_build_config.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index f8760c8..4c1a3d6 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -1,2 +1,4 @@ MACOSX_SDK_VERSION: # [osx and x86_64] - "10.12" # [osx and x86_64] +c_stdlib_version: +- '2.28' # [linux] From 7c01fd11b2be21962b5b91f193671d5df58f2043 Mon Sep 17 00:00:00 2001 From: h-vetinari Date: Tue, 28 May 2024 04:27:26 +0200 Subject: [PATCH 14/18] add stdlib --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 0af9edb..f1226b6 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -17,6 +17,7 @@ build: requirements: build: - {{ compiler('c') }} + - {{ stdlib('c') }} - {{ compiler('cxx') }} - cmake =3.21.1 - make # [unix] From 0c2c71575bcd09624c9a134f96ab08f46549c9a2 Mon Sep 17 00:00:00 2001 From: h-vetinari Date: Tue, 28 May 2024 04:27:58 +0200 Subject: [PATCH 15/18] remove obsolete SDK pin --- recipe/conda_build_config.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 4c1a3d6..696053a 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -1,4 +1,2 @@ -MACOSX_SDK_VERSION: # [osx and x86_64] - - "10.12" # [osx and x86_64] c_stdlib_version: - '2.28' # [linux] From 6efb15d9bceb72332243a594178c46afc6c24257 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Tue, 28 May 2024 02:29:30 +0000 Subject: [PATCH 16/18] MNT: Re-rendered with conda-build 24.5.0, conda-smithy 3.36.0, and conda-forge-pinning 2024.05.27.20.59.24 --- .azure-pipelines/azure-pipelines-osx.yml | 2 +- .ci_support/linux_64_.yaml | 2 +- .ci_support/osx_64_.yaml | 6 +++--- .ci_support/osx_arm64_.yaml | 2 ++ .gitattributes | 4 ++-- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 730a626..7708e23 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -5,7 +5,7 @@ jobs: - job: osx pool: - vmImage: macOS-11 + vmImage: macOS-12 strategy: matrix: osx_64_: diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index 665eab5..a828d68 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.28' cdt_name: - cos6 channel_sources: diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 02ab069..e9969f9 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -1,7 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' +- '10.13' MACOSX_SDK_VERSION: -- '10.12' +- '10.13' c_compiler: - clang c_compiler_version: @@ -9,7 +9,7 @@ c_compiler_version: c_stdlib: - macosx_deployment_target c_stdlib_version: -- '10.9' +- '10.13' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index ab83120..6f87852 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' c_compiler: - clang c_compiler_version: diff --git a/.gitattributes b/.gitattributes index 7f32763..18f114a 100644 --- a/.gitattributes +++ b/.gitattributes @@ -20,8 +20,8 @@ bld.bat text eol=crlf .travis.yml linguist-generated=true .scripts/* linguist-generated=true .woodpecker.yml linguist-generated=true -LICENSE.txt linguist-generated=true -README.md linguist-generated=true +/LICENSE.txt linguist-generated=true +/README.md linguist-generated=true azure-pipelines.yml linguist-generated=true build-locally.py linguist-generated=true shippable.yml linguist-generated=true From 4c43c7274858a0cc66670e5f5a09389fdafa2d17 Mon Sep 17 00:00:00 2001 From: h-vetinari Date: Tue, 28 May 2024 10:10:21 +0200 Subject: [PATCH 17/18] Use alma8 docker image for new enough glibc --- recipe/conda_build_config.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 696053a..b594724 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -1,2 +1,5 @@ +docker_image: # [linux and x86_64] +- quay.io/condaforge/linux-anvil-alma-x86_64:8 # [linux and x86_64] + c_stdlib_version: - '2.28' # [linux] From 0bf60a9cd3865279b2c8dff00c35f94b2bae5b6a Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Tue, 28 May 2024 08:12:13 +0000 Subject: [PATCH 18/18] MNT: Re-rendered with conda-build 24.5.0, conda-smithy 3.36.0, and conda-forge-pinning 2024.05.27.20.59.24 --- .azure-pipelines/azure-pipelines-linux.yml | 2 +- .ci_support/linux_64_.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 875d996..d1c5b92 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -11,7 +11,7 @@ jobs: linux_64_: CONFIG: linux_64_ UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-alma-x86_64:8 timeoutInMinutes: 360 variables: {} diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index a828d68..fecb282 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -17,7 +17,7 @@ cxx_compiler: cxx_compiler_version: - '12' docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-alma-x86_64:8 target_platform: - linux-64 zip_keys: