From e483884c4218071a6cc20f68903888b2d9bba9f2 Mon Sep 17 00:00:00 2001 From: DerThorsten Date: Wed, 15 May 2024 12:32:31 +0200 Subject: [PATCH 01/29] fist attempt --- pixi.toml | 14 ++++++++ recipes/recipes/lfortran/activate-lfortran.sh | 12 +++++++ recipes/recipes/lfortran/build.sh | 32 +++++++++++++++++++ .../recipes/lfortran/deactivate-lfortran.sh | 0 recipes/recipes/lfortran/recipe.yaml | 29 +++++++++++++++++ 5 files changed, 87 insertions(+) create mode 100644 recipes/recipes/lfortran/activate-lfortran.sh create mode 100644 recipes/recipes/lfortran/build.sh create mode 100644 recipes/recipes/lfortran/deactivate-lfortran.sh create mode 100644 recipes/recipes/lfortran/recipe.yaml diff --git a/pixi.toml b/pixi.toml index 7b8b049d2..08d69ad35 100644 --- a/pixi.toml +++ b/pixi.toml @@ -94,6 +94,20 @@ cmd = [ "--recipe" ] +[feature.feature_rattler_build.tasks.build] +cmd = [ + "rattler-build","build", + # format + "--package-format", "tar-bz2", + # channels + "-c", "https://repo.mamba.pm/emscripten-forge", + "-c", "conda-forge", + "-c", "microsoft", + "--skip-existing", "local", + "-m", "conda_build_config.yaml", + "--recipe" +] + ############################################ # documentation feature / tasks diff --git a/recipes/recipes/lfortran/activate-lfortran.sh b/recipes/recipes/lfortran/activate-lfortran.sh new file mode 100644 index 000000000..d8f260146 --- /dev/null +++ b/recipes/recipes/lfortran/activate-lfortran.sh @@ -0,0 +1,12 @@ +#!/usr/bin/env + +CONDA_EMSDK_DIR_CONFIG_FILE=$HOME/.emsdkdir +if test -f "$CONDA_EMSDK_DIR_CONFIG_FILE"; then + echo "Found config file $CONDA_EMSDK_DIR_CONFIG_FILE" +else + # return an error + echo "Config file $CONDA_EMSDK_DIR_CONFIG_FILE not found" + return 1 +fi + +export EMSDK_DIR=$(<$CONDA_EMSDK_DIR_CONFIG_FILE) diff --git a/recipes/recipes/lfortran/build.sh b/recipes/recipes/lfortran/build.sh new file mode 100644 index 000000000..3796e42ca --- /dev/null +++ b/recipes/recipes/lfortran/build.sh @@ -0,0 +1,32 @@ +#!/usr/bin/env bash + +set -e +set -x + +cp "${RECIPE_DIR}"/activate-lfortran.sh ${PREFIX}/etc/conda/activate.d/activate_z-${PKG_NAME}.sh +cp "${RECIPE_DIR}"/deactivate-lfortran.sh ${PREFIX}/etc/conda/deactivate.d/deactivate_z-${PKG_NAME}.sh + + +CONDA_EMSDK_DIR_CONFIG_FILE=$HOME/.emsdkdir +if test -f "$CONDA_EMSDK_DIR_CONFIG_FILE"; then + echo "Found config file $CONDA_EMSDK_DIR_CONFIG_FILE" +else + # return an error + echo "Config file $CONDA_EMSDK_DIR_CONFIG_FILE not found" + return 1 +fi + +export EMSDK_DIR=$(<$CONDA_EMSDK_DIR_CONFIG_FILE) + +cmake \ + -DCMAKE_BUILD_TYPE=Debug \ + -DWITH_LLVM=yes \ + -DLFORTRAN_BUILD_ALL=yes \ + -DWITH_STACKTRACE=yes \ + -DWITH_RUNTIME_STACKTRACE=yes \ + -DCMAKE_PREFIX_PATH="$CMAKE_PREFIX_PATH_LFORTRAN;$PREFIX;$BUILD_PREFIX" \ + -DCMAKE_INSTALL_PREFIX=$PREFIX \ + -DWITH_TARGET_WASM=yes \ + -DCMAKE_INSTALL_LIBDIR=share/lfortran/lib \ + . +cmake --build . -j8 --target install \ No newline at end of file diff --git a/recipes/recipes/lfortran/deactivate-lfortran.sh b/recipes/recipes/lfortran/deactivate-lfortran.sh new file mode 100644 index 000000000..e69de29bb diff --git a/recipes/recipes/lfortran/recipe.yaml b/recipes/recipes/lfortran/recipe.yaml new file mode 100644 index 000000000..6c4bb955a --- /dev/null +++ b/recipes/recipes/lfortran/recipe.yaml @@ -0,0 +1,29 @@ +context: + name: lfortan + version: "0.35.0" + +package: + name: ${{ name|lower }} + version: ${{ version }} + +source: +# - url: https://github.com/lfortran/lfortran/archive/refs/tags/v${{ version }}.tar.gz +# sha256: 2e54c5cfe9a94fc572bfc39c51496203636f78fb04e8bc0809577c4e1713a2ac + - git: https://github.com/lfortran/lfortran.git + rev: 0ea994d2c6bf834ca73fd298bd5e4256db4769b4 + +build: + number: 0 + +requirements: + build: + - python + - re2c + - bison + +about: + summary: lfortan + +extra: + recipe-maintainers: + - DerThorsten From 9b7f96c1cbddedd91f349e75f39093f6e184dde6 Mon Sep 17 00:00:00 2001 From: DerThorsten Date: Wed, 15 May 2024 12:34:04 +0200 Subject: [PATCH 02/29] fist attempt --- recipes/recipes/lfortran/build.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/recipes/recipes/lfortran/build.sh b/recipes/recipes/lfortran/build.sh index 3796e42ca..a91997161 100644 --- a/recipes/recipes/lfortran/build.sh +++ b/recipes/recipes/lfortran/build.sh @@ -3,7 +3,10 @@ set -e set -x -cp "${RECIPE_DIR}"/activate-lfortran.sh ${PREFIX}/etc/conda/activate.d/activate_z-${PKG_NAME}.sh +mkdir -p ${PREFIX}/etc/conda/activate.d +mkdir -p ${PREFIX}/etc/conda/deactivate.d + +cp "${RECIPE_DIR}"/activate-lfortran.sh ${PREFIX}/etc/conda/activate.d/activate_z-${PKG_NAME}.sh cp "${RECIPE_DIR}"/deactivate-lfortran.sh ${PREFIX}/etc/conda/deactivate.d/deactivate_z-${PKG_NAME}.sh From 8aabb653b07e4608cc2e90121a8465288be73b5c Mon Sep 17 00:00:00 2001 From: DerThorsten Date: Wed, 15 May 2024 12:47:17 +0200 Subject: [PATCH 03/29] first *real* attempt --- recipes/recipes/lfortran/build.sh | 11 +++++++++-- recipes/recipes/lfortran/recipe.yaml | 10 +++++++--- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/recipes/recipes/lfortran/build.sh b/recipes/recipes/lfortran/build.sh index a91997161..b5ddb2dc7 100644 --- a/recipes/recipes/lfortran/build.sh +++ b/recipes/recipes/lfortran/build.sh @@ -21,6 +21,14 @@ fi export EMSDK_DIR=$(<$CONDA_EMSDK_DIR_CONFIG_FILE) +# run build0.sh +sh ./build0.sh + + + + +# run **what build1.sh does** + cmake \ -DCMAKE_BUILD_TYPE=Debug \ -DWITH_LLVM=yes \ @@ -29,7 +37,6 @@ cmake \ -DWITH_RUNTIME_STACKTRACE=yes \ -DCMAKE_PREFIX_PATH="$CMAKE_PREFIX_PATH_LFORTRAN;$PREFIX;$BUILD_PREFIX" \ -DCMAKE_INSTALL_PREFIX=$PREFIX \ - -DWITH_TARGET_WASM=yes \ -DCMAKE_INSTALL_LIBDIR=share/lfortran/lib \ . -cmake --build . -j8 --target install \ No newline at end of file +cmake --build . -j2 --target install \ No newline at end of file diff --git a/recipes/recipes/lfortran/recipe.yaml b/recipes/recipes/lfortran/recipe.yaml index 6c4bb955a..4c6a3de37 100644 --- a/recipes/recipes/lfortran/recipe.yaml +++ b/recipes/recipes/lfortran/recipe.yaml @@ -13,14 +13,18 @@ source: rev: 0ea994d2c6bf834ca73fd298bd5e4256db4769b4 build: - number: 0 + number: 1 requirements: build: - python - re2c - - bison - + - bison ==3.4 + - llvmdev ==11.0.1 bison=3.4 + - python + - cmake + - make + - toml about: summary: lfortan From fecc65babb298fcba0e61ab48384eda474732150 Mon Sep 17 00:00:00 2001 From: DerThorsten Date: Wed, 15 May 2024 12:47:45 +0200 Subject: [PATCH 04/29] first *real* attempt --- recipes/recipes/lfortran/recipe.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/recipes/lfortran/recipe.yaml b/recipes/recipes/lfortran/recipe.yaml index 4c6a3de37..007b82734 100644 --- a/recipes/recipes/lfortran/recipe.yaml +++ b/recipes/recipes/lfortran/recipe.yaml @@ -20,7 +20,7 @@ requirements: - python - re2c - bison ==3.4 - - llvmdev ==11.0.1 bison=3.4 + - llvmdev ==11.0.1 - python - cmake - make From 4bd39b4cc949e1049173b41e144e553fe1003625 Mon Sep 17 00:00:00 2001 From: DerThorsten Date: Wed, 15 May 2024 12:48:18 +0200 Subject: [PATCH 05/29] first *real* attempt --- recipes/recipes/lfortran/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/recipes/lfortran/build.sh b/recipes/recipes/lfortran/build.sh index b5ddb2dc7..eebd20d2a 100644 --- a/recipes/recipes/lfortran/build.sh +++ b/recipes/recipes/lfortran/build.sh @@ -37,6 +37,7 @@ cmake \ -DWITH_RUNTIME_STACKTRACE=yes \ -DCMAKE_PREFIX_PATH="$CMAKE_PREFIX_PATH_LFORTRAN;$PREFIX;$BUILD_PREFIX" \ -DCMAKE_INSTALL_PREFIX=$PREFIX \ + -DWITH_TARGET_WASM=yes \ -DCMAKE_INSTALL_LIBDIR=share/lfortran/lib \ . cmake --build . -j2 --target install \ No newline at end of file From 6e2d44447501cc5fecfdbef7dc536f0cbb00af5e Mon Sep 17 00:00:00 2001 From: DerThorsten Date: Wed, 15 May 2024 12:54:50 +0200 Subject: [PATCH 06/29] try with binutils --- recipes/recipes/lfortran/recipe.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/recipes/lfortran/recipe.yaml b/recipes/recipes/lfortran/recipe.yaml index 007b82734..ec6391bfd 100644 --- a/recipes/recipes/lfortran/recipe.yaml +++ b/recipes/recipes/lfortran/recipe.yaml @@ -25,6 +25,7 @@ requirements: - cmake - make - toml + - binutils about: summary: lfortan From 0e1c74461ed8621d60505e552500833a63ec4f35 Mon Sep 17 00:00:00 2001 From: DerThorsten Date: Wed, 15 May 2024 12:58:25 +0200 Subject: [PATCH 07/29] use PATH instead of DIR --- recipes/recipes/lfortran/activate-lfortran.sh | 2 +- recipes/recipes/lfortran/build.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/recipes/lfortran/activate-lfortran.sh b/recipes/recipes/lfortran/activate-lfortran.sh index d8f260146..e38315acf 100644 --- a/recipes/recipes/lfortran/activate-lfortran.sh +++ b/recipes/recipes/lfortran/activate-lfortran.sh @@ -9,4 +9,4 @@ else return 1 fi -export EMSDK_DIR=$(<$CONDA_EMSDK_DIR_CONFIG_FILE) +export EMSDK_PATH=$(<$CONDA_EMSDK_DIR_CONFIG_FILE) diff --git a/recipes/recipes/lfortran/build.sh b/recipes/recipes/lfortran/build.sh index eebd20d2a..1f2f2d89e 100644 --- a/recipes/recipes/lfortran/build.sh +++ b/recipes/recipes/lfortran/build.sh @@ -19,7 +19,7 @@ else return 1 fi -export EMSDK_DIR=$(<$CONDA_EMSDK_DIR_CONFIG_FILE) +export EMSDK_PATH=$(<$CONDA_EMSDK_DIR_CONFIG_FILE) # run build0.sh sh ./build0.sh From e3300f84e421a851ffdc6799a1c9a90d5874b17a Mon Sep 17 00:00:00 2001 From: Thorsten Beier Date: Wed, 15 May 2024 13:03:19 +0200 Subject: [PATCH 08/29] python in host --- recipes/recipes/lfortran/recipe.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipes/recipes/lfortran/recipe.yaml b/recipes/recipes/lfortran/recipe.yaml index ec6391bfd..b6c8199aa 100644 --- a/recipes/recipes/lfortran/recipe.yaml +++ b/recipes/recipes/lfortran/recipe.yaml @@ -26,6 +26,8 @@ requirements: - make - toml - binutils + host: + - python about: summary: lfortan From 2e82714b6546885c0cba8f688988c718aa29324b Mon Sep 17 00:00:00 2001 From: Thorsten Beier Date: Wed, 15 May 2024 13:08:05 +0200 Subject: [PATCH 09/29] Update recipe.yaml --- recipes/recipes/lfortran/recipe.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/recipes/lfortran/recipe.yaml b/recipes/recipes/lfortran/recipe.yaml index b6c8199aa..8335dff35 100644 --- a/recipes/recipes/lfortran/recipe.yaml +++ b/recipes/recipes/lfortran/recipe.yaml @@ -17,6 +17,7 @@ build: requirements: build: + - ${{ compiler('cxx') }} - python - re2c - bison ==3.4 From d2f58693701197cfa153a0347d84ccf47e8eba04 Mon Sep 17 00:00:00 2001 From: Thorsten Beier Date: Wed, 15 May 2024 13:13:41 +0200 Subject: [PATCH 10/29] zstd-static --- recipes/recipes/lfortran/recipe.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/recipes/lfortran/recipe.yaml b/recipes/recipes/lfortran/recipe.yaml index 8335dff35..8445bf4cf 100644 --- a/recipes/recipes/lfortran/recipe.yaml +++ b/recipes/recipes/lfortran/recipe.yaml @@ -29,6 +29,7 @@ requirements: - binutils host: - python + - zstd-static about: summary: lfortan From cb45308293d0b5148d85a4727fd4db7be54692eb Mon Sep 17 00:00:00 2001 From: Thorsten Beier Date: Wed, 15 May 2024 14:10:40 +0200 Subject: [PATCH 11/29] Update recipe.yaml --- recipes/recipes/lfortran/recipe.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/recipes/lfortran/recipe.yaml b/recipes/recipes/lfortran/recipe.yaml index 8445bf4cf..050ca867a 100644 --- a/recipes/recipes/lfortran/recipe.yaml +++ b/recipes/recipes/lfortran/recipe.yaml @@ -21,7 +21,7 @@ requirements: - python - re2c - bison ==3.4 - - llvmdev ==11.0.1 + - llvmdev ==15 - python - cmake - make From 78d197611faee01d85117ab3f9363ed86e9563a4 Mon Sep 17 00:00:00 2001 From: Thorsten Beier Date: Wed, 15 May 2024 14:18:02 +0200 Subject: [PATCH 12/29] non static zstd --- recipes/recipes/lfortran/recipe.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/recipes/lfortran/recipe.yaml b/recipes/recipes/lfortran/recipe.yaml index 050ca867a..21ed458a6 100644 --- a/recipes/recipes/lfortran/recipe.yaml +++ b/recipes/recipes/lfortran/recipe.yaml @@ -29,7 +29,7 @@ requirements: - binutils host: - python - - zstd-static + - zstd about: summary: lfortan From 7f4143a32550ce241e7595f0c7cc915428ca7594 Mon Sep 17 00:00:00 2001 From: Thorsten Beier Date: Wed, 15 May 2024 14:35:40 +0200 Subject: [PATCH 13/29] Update recipe.yaml --- recipes/recipes/lfortran/recipe.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/recipes/lfortran/recipe.yaml b/recipes/recipes/lfortran/recipe.yaml index 21ed458a6..050ca867a 100644 --- a/recipes/recipes/lfortran/recipe.yaml +++ b/recipes/recipes/lfortran/recipe.yaml @@ -29,7 +29,7 @@ requirements: - binutils host: - python - - zstd + - zstd-static about: summary: lfortan From f18bb35109a29becaa2457776de1f2e1eddaefa1 Mon Sep 17 00:00:00 2001 From: Thorsten Beier Date: Wed, 15 May 2024 14:47:20 +0200 Subject: [PATCH 14/29] use clang --- recipes/recipes/lfortran/recipe.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/recipes/lfortran/recipe.yaml b/recipes/recipes/lfortran/recipe.yaml index 050ca867a..58bdf408b 100644 --- a/recipes/recipes/lfortran/recipe.yaml +++ b/recipes/recipes/lfortran/recipe.yaml @@ -17,7 +17,7 @@ build: requirements: build: - - ${{ compiler('cxx') }} + - clang - python - re2c - bison ==3.4 @@ -29,7 +29,7 @@ requirements: - binutils host: - python - - zstd-static + - zstd about: summary: lfortan From ca38f8f0ba920caae16b537270177350438be7bc Mon Sep 17 00:00:00 2001 From: Thorsten Beier Date: Wed, 15 May 2024 14:52:54 +0200 Subject: [PATCH 15/29] no zstd --- recipes/recipes/lfortran/recipe.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/recipes/recipes/lfortran/recipe.yaml b/recipes/recipes/lfortran/recipe.yaml index 58bdf408b..ec52e2738 100644 --- a/recipes/recipes/lfortran/recipe.yaml +++ b/recipes/recipes/lfortran/recipe.yaml @@ -29,7 +29,6 @@ requirements: - binutils host: - python - - zstd about: summary: lfortan From 5d78e7fa983483e482ce271d26a54c483c6519ba Mon Sep 17 00:00:00 2001 From: Thorsten Beier Date: Wed, 15 May 2024 15:55:06 +0200 Subject: [PATCH 16/29] Update recipe.yaml --- recipes/recipes/lfortran/recipe.yaml | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/recipes/recipes/lfortran/recipe.yaml b/recipes/recipes/lfortran/recipe.yaml index ec52e2738..81f4adffa 100644 --- a/recipes/recipes/lfortran/recipe.yaml +++ b/recipes/recipes/lfortran/recipe.yaml @@ -17,18 +17,29 @@ build: requirements: build: - - clang + - ${{ compiler('c') }} + - ${{ compiler('cxx') }} - python - re2c - bison ==3.4 - - llvmdev ==15 + - llvmdev ==16.0.6 - python - - cmake + - cmake =3.21.1 - make - toml - binutils host: - - python + - python + - xeus =3.0.5 + - xeus-zmq =1.0.2 + - llvmdev =16.0.6 + - xtl + - nlohmann_json =3.11.2 + - cppzmq + - zlib + - zstd-static =1.5.5 + + about: summary: lfortan From e646e81c6f9dc6fc615b50f584dee84b27faa185 Mon Sep 17 00:00:00 2001 From: Thorsten Beier Date: Wed, 15 May 2024 17:28:43 +0200 Subject: [PATCH 17/29] Update recipe.yaml --- recipes/recipes/lfortran/recipe.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/recipes/lfortran/recipe.yaml b/recipes/recipes/lfortran/recipe.yaml index 81f4adffa..34ae5ad61 100644 --- a/recipes/recipes/lfortran/recipe.yaml +++ b/recipes/recipes/lfortran/recipe.yaml @@ -22,7 +22,7 @@ requirements: - python - re2c - bison ==3.4 - - llvmdev ==16.0.6 + - llvmdev =15 - python - cmake =3.21.1 - make @@ -32,7 +32,7 @@ requirements: - python - xeus =3.0.5 - xeus-zmq =1.0.2 - - llvmdev =16.0.6 + - llvmdev =15 - xtl - nlohmann_json =3.11.2 - cppzmq From 0cd79372f41f29fb6f87959a0e7ba9a5ca6e1b22 Mon Sep 17 00:00:00 2001 From: Thorsten Beier Date: Wed, 15 May 2024 17:43:56 +0200 Subject: [PATCH 18/29] trying random other commit --- recipes/recipes/lfortran/recipe.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/recipes/lfortran/recipe.yaml b/recipes/recipes/lfortran/recipe.yaml index 34ae5ad61..b2aadd245 100644 --- a/recipes/recipes/lfortran/recipe.yaml +++ b/recipes/recipes/lfortran/recipe.yaml @@ -10,7 +10,7 @@ source: # - url: https://github.com/lfortran/lfortran/archive/refs/tags/v${{ version }}.tar.gz # sha256: 2e54c5cfe9a94fc572bfc39c51496203636f78fb04e8bc0809577c4e1713a2ac - git: https://github.com/lfortran/lfortran.git - rev: 0ea994d2c6bf834ca73fd298bd5e4256db4769b4 + rev: 430c8a917624d34787bad1ec289a311e0fd8c4d6 build: number: 1 From 64e53a46281c25254fecac7a588b49ae62dd7a1f Mon Sep 17 00:00:00 2001 From: Thorsten Beier Date: Thu, 16 May 2024 07:13:29 +0200 Subject: [PATCH 19/29] Update recipe.yaml --- recipes/recipes/lfortran/recipe.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/recipes/lfortran/recipe.yaml b/recipes/recipes/lfortran/recipe.yaml index b2aadd245..0c4c9a39d 100644 --- a/recipes/recipes/lfortran/recipe.yaml +++ b/recipes/recipes/lfortran/recipe.yaml @@ -10,7 +10,7 @@ source: # - url: https://github.com/lfortran/lfortran/archive/refs/tags/v${{ version }}.tar.gz # sha256: 2e54c5cfe9a94fc572bfc39c51496203636f78fb04e8bc0809577c4e1713a2ac - git: https://github.com/lfortran/lfortran.git - rev: 430c8a917624d34787bad1ec289a311e0fd8c4d6 + rev: b5750d8 build: number: 1 From f60a1509d132ee99ae31c6fb04b9df90260b2b92 Mon Sep 17 00:00:00 2001 From: Thorsten Beier Date: Thu, 16 May 2024 07:20:05 +0200 Subject: [PATCH 20/29] Update recipe.yaml --- recipes/recipes/lfortran/recipe.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/recipes/lfortran/recipe.yaml b/recipes/recipes/lfortran/recipe.yaml index 0c4c9a39d..21d8ab655 100644 --- a/recipes/recipes/lfortran/recipe.yaml +++ b/recipes/recipes/lfortran/recipe.yaml @@ -10,7 +10,7 @@ source: # - url: https://github.com/lfortran/lfortran/archive/refs/tags/v${{ version }}.tar.gz # sha256: 2e54c5cfe9a94fc572bfc39c51496203636f78fb04e8bc0809577c4e1713a2ac - git: https://github.com/lfortran/lfortran.git - rev: b5750d8 + rev: 623c43b1a15018fd4ed7589d496cb3b5d79f766e build: number: 1 From c981c343f59d2a1ae14d0270b159a040073b2219 Mon Sep 17 00:00:00 2001 From: Thorsten Beier Date: Thu, 16 May 2024 07:36:12 +0200 Subject: [PATCH 21/29] Update build.sh --- recipes/recipes/lfortran/build.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipes/recipes/lfortran/build.sh b/recipes/recipes/lfortran/build.sh index 1f2f2d89e..541de6080 100644 --- a/recipes/recipes/lfortran/build.sh +++ b/recipes/recipes/lfortran/build.sh @@ -39,5 +39,6 @@ cmake \ -DCMAKE_INSTALL_PREFIX=$PREFIX \ -DWITH_TARGET_WASM=yes \ -DCMAKE_INSTALL_LIBDIR=share/lfortran/lib \ + -DCOMPILE_DEFINITIONS="__STDC_FORMAT_MACROS" \ . -cmake --build . -j2 --target install \ No newline at end of file +cmake --build . -j2 --target install From 3c72c1b87d8c040519b10cba3234168749eaea49 Mon Sep 17 00:00:00 2001 From: Thorsten Beier Date: Thu, 16 May 2024 08:25:55 +0200 Subject: [PATCH 22/29] Update recipe.yaml --- recipes/recipes/lfortran/recipe.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/recipes/lfortran/recipe.yaml b/recipes/recipes/lfortran/recipe.yaml index 21d8ab655..b3c9ed3a3 100644 --- a/recipes/recipes/lfortran/recipe.yaml +++ b/recipes/recipes/lfortran/recipe.yaml @@ -9,8 +9,8 @@ package: source: # - url: https://github.com/lfortran/lfortran/archive/refs/tags/v${{ version }}.tar.gz # sha256: 2e54c5cfe9a94fc572bfc39c51496203636f78fb04e8bc0809577c4e1713a2ac - - git: https://github.com/lfortran/lfortran.git - rev: 623c43b1a15018fd4ed7589d496cb3b5d79f766e + - git: https://github.com/DerThorsten/lfortran.git + rev: with_stdc_format_macros build: number: 1 From 7d38c79f378fc7003f280740b7011990a37867a7 Mon Sep 17 00:00:00 2001 From: DerThorsten Date: Thu, 16 May 2024 08:29:34 +0200 Subject: [PATCH 23/29] defines --- recipes/recipes_emscripten/lfortran/build.sh | 2 + .../recipes_emscripten/lfortran/recipe.yaml | 62 +++++++++---------- 2 files changed, 31 insertions(+), 33 deletions(-) diff --git a/recipes/recipes_emscripten/lfortran/build.sh b/recipes/recipes_emscripten/lfortran/build.sh index 4b28e7e48..71f1533bc 100644 --- a/recipes/recipes_emscripten/lfortran/build.sh +++ b/recipes/recipes_emscripten/lfortran/build.sh @@ -1,6 +1,8 @@ set -e set -x +export CXXFLAGS="${CXXFLAGS} -D__STDC_FORMAT_MACROS -D_LIBCPP_DISABLE_AVAILABILITY" + mkdir -p src/bin/asset_dir cp -v $BUILD_PREFIX/share/lfortran/lib/*.mod src/bin/asset_dir diff --git a/recipes/recipes_emscripten/lfortran/recipe.yaml b/recipes/recipes_emscripten/lfortran/recipe.yaml index 2fe7a169d..f4f48d732 100644 --- a/recipes/recipes_emscripten/lfortran/recipe.yaml +++ b/recipes/recipes_emscripten/lfortran/recipe.yaml @@ -1,52 +1,48 @@ context: - name: lfortran - version: 0.35.0 + name: lfortan + version: "0.35.0" package: - name: ${{ name }} + name: ${{ name|lower }} version: ${{ version }} source: - url: https://github.com/lfortran/lfortran/releases/download/v${{ version }}/${{ - name }}-${{ version }}.tar.gz - sha256: 5ecc1ae03067b985943c45f6ec05e9f6e72efd6ad004b052e7a98ba552ff79b0 +# - url: https://github.com/lfortran/lfortran/archive/refs/tags/v${{ version }}.tar.gz +# sha256: 2e54c5cfe9a94fc572bfc39c51496203636f78fb04e8bc0809577c4e1713a2ac + - git: https://github.com/lfortran/lfortran.git + rev: with_stdc_format_macros build: - number: 2 + number: 1 requirements: build: - ${{ compiler('c') }} - ${{ compiler('cxx') }} - - cmake - - make # [unix] - - zlib=1.2.13 - - lfortran=${{ version }} - # - xeus =3.0.5 # [build_platform != target_platform] - # - xeus-zmq =1.0.2 # [build_platform != target_platform] - # - llvmdev =16.0.6 # [build_platform != target_platform] - # - xtl # [build_platform != target_platform] - # - nlohmann_json =3.11.2 # [build_platform != target_platform] - # - cppzmq # [build_platform != target_platform] - # - zlib # [build_platform != target_platform] - # - zstd-static =1.5.5 # [build_platform != target_platform] + - python + - re2c + - bison ==3.4 + - llvmdev =15 + - python + - cmake =3.21.1 + - make + - toml + - binutils host: + - python + - xeus =3.0.5 + - xeus-zmq =1.0.2 + - llvmdev =15 + - xtl + - nlohmann_json =3.11.2 + - cppzmq - zlib + - zstd-static =1.5.5 + about: - license: BSD-3-Clause - license_family: BSD - license_file: LICENSE - summary: Modern interactive LLVM-based Fortran compiler - description: | - LFortran is a modern open-source (BSD licensed) interactive Fortran - compiler built on top of LLVM. It can execute user's code interactively to - allow exploratory work (much like Python, MATLAB or Julia) as well as - compile to binaries with the goal to run user’s code on modern - architectures such as multi-core CPUs and GPUs. - homepage: https://lfortran.org + summary: lfortan + extra: recipe-maintainers: - - certik - - anutosh491 - - Shaikh-Ubaid + - DerThorsten \ No newline at end of file From 845b73203d60a7c9def5a3b26ed11936bc7e737e Mon Sep 17 00:00:00 2001 From: DerThorsten Date: Thu, 16 May 2024 08:33:42 +0200 Subject: [PATCH 24/29] defines --- recipes/recipes_emscripten/lfortran/recipe.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/recipes_emscripten/lfortran/recipe.yaml b/recipes/recipes_emscripten/lfortran/recipe.yaml index f4f48d732..0e8b932c1 100644 --- a/recipes/recipes_emscripten/lfortran/recipe.yaml +++ b/recipes/recipes_emscripten/lfortran/recipe.yaml @@ -10,7 +10,7 @@ source: # - url: https://github.com/lfortran/lfortran/archive/refs/tags/v${{ version }}.tar.gz # sha256: 2e54c5cfe9a94fc572bfc39c51496203636f78fb04e8bc0809577c4e1713a2ac - git: https://github.com/lfortran/lfortran.git - rev: with_stdc_format_macros + rev: eff69eecb3834500d4e78f55de69ae550776077f build: number: 1 From 530c842966f4da8e346eb468b81f6c5dd74b79e4 Mon Sep 17 00:00:00 2001 From: DerThorsten Date: Thu, 16 May 2024 08:41:20 +0200 Subject: [PATCH 25/29] correct lfortran --- recipes/recipes/lfortran/build.sh | 3 ++- recipes/recipes/lfortran/recipe.yaml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/recipes/recipes/lfortran/build.sh b/recipes/recipes/lfortran/build.sh index 541de6080..7a7ed6969 100644 --- a/recipes/recipes/lfortran/build.sh +++ b/recipes/recipes/lfortran/build.sh @@ -9,6 +9,7 @@ mkdir -p ${PREFIX}/etc/conda/deactivate.d cp "${RECIPE_DIR}"/activate-lfortran.sh ${PREFIX}/etc/conda/activate.d/activate_z-${PKG_NAME}.sh cp "${RECIPE_DIR}"/deactivate-lfortran.sh ${PREFIX}/etc/conda/deactivate.d/deactivate_z-${PKG_NAME}.sh +export CXXFLAGS="${CXXFLAGS} -D__STDC_FORMAT_MACROS -D_LIBCPP_DISABLE_AVAILABILITY" CONDA_EMSDK_DIR_CONFIG_FILE=$HOME/.emsdkdir if test -f "$CONDA_EMSDK_DIR_CONFIG_FILE"; then @@ -30,7 +31,7 @@ sh ./build0.sh # run **what build1.sh does** cmake \ - -DCMAKE_BUILD_TYPE=Debug \ + -DCMAKE_BUILD_TYPE=Release \ -DWITH_LLVM=yes \ -DLFORTRAN_BUILD_ALL=yes \ -DWITH_STACKTRACE=yes \ diff --git a/recipes/recipes/lfortran/recipe.yaml b/recipes/recipes/lfortran/recipe.yaml index b3c9ed3a3..9e77b0daa 100644 --- a/recipes/recipes/lfortran/recipe.yaml +++ b/recipes/recipes/lfortran/recipe.yaml @@ -9,7 +9,7 @@ package: source: # - url: https://github.com/lfortran/lfortran/archive/refs/tags/v${{ version }}.tar.gz # sha256: 2e54c5cfe9a94fc572bfc39c51496203636f78fb04e8bc0809577c4e1713a2ac - - git: https://github.com/DerThorsten/lfortran.git + - git: https://github.com/lfortran/lfortran.git rev: with_stdc_format_macros build: From 9b42d8f321c5fe957c13493f4a99d6342dceed89 Mon Sep 17 00:00:00 2001 From: DerThorsten Date: Thu, 16 May 2024 08:44:22 +0200 Subject: [PATCH 26/29] reset --- recipes/recipes_emscripten/lfortran/build.sh | 2 - .../recipes_emscripten/lfortran/recipe.yaml | 62 ++++++++++--------- 2 files changed, 33 insertions(+), 31 deletions(-) diff --git a/recipes/recipes_emscripten/lfortran/build.sh b/recipes/recipes_emscripten/lfortran/build.sh index 71f1533bc..4b28e7e48 100644 --- a/recipes/recipes_emscripten/lfortran/build.sh +++ b/recipes/recipes_emscripten/lfortran/build.sh @@ -1,8 +1,6 @@ set -e set -x -export CXXFLAGS="${CXXFLAGS} -D__STDC_FORMAT_MACROS -D_LIBCPP_DISABLE_AVAILABILITY" - mkdir -p src/bin/asset_dir cp -v $BUILD_PREFIX/share/lfortran/lib/*.mod src/bin/asset_dir diff --git a/recipes/recipes_emscripten/lfortran/recipe.yaml b/recipes/recipes_emscripten/lfortran/recipe.yaml index 0e8b932c1..2fe7a169d 100644 --- a/recipes/recipes_emscripten/lfortran/recipe.yaml +++ b/recipes/recipes_emscripten/lfortran/recipe.yaml @@ -1,48 +1,52 @@ context: - name: lfortan - version: "0.35.0" + name: lfortran + version: 0.35.0 package: - name: ${{ name|lower }} + name: ${{ name }} version: ${{ version }} source: -# - url: https://github.com/lfortran/lfortran/archive/refs/tags/v${{ version }}.tar.gz -# sha256: 2e54c5cfe9a94fc572bfc39c51496203636f78fb04e8bc0809577c4e1713a2ac - - git: https://github.com/lfortran/lfortran.git - rev: eff69eecb3834500d4e78f55de69ae550776077f + url: https://github.com/lfortran/lfortran/releases/download/v${{ version }}/${{ + name }}-${{ version }}.tar.gz + sha256: 5ecc1ae03067b985943c45f6ec05e9f6e72efd6ad004b052e7a98ba552ff79b0 build: - number: 1 + number: 2 requirements: build: - ${{ compiler('c') }} - ${{ compiler('cxx') }} - - python - - re2c - - bison ==3.4 - - llvmdev =15 - - python - - cmake =3.21.1 - - make - - toml - - binutils + - cmake + - make # [unix] + - zlib=1.2.13 + - lfortran=${{ version }} + # - xeus =3.0.5 # [build_platform != target_platform] + # - xeus-zmq =1.0.2 # [build_platform != target_platform] + # - llvmdev =16.0.6 # [build_platform != target_platform] + # - xtl # [build_platform != target_platform] + # - nlohmann_json =3.11.2 # [build_platform != target_platform] + # - cppzmq # [build_platform != target_platform] + # - zlib # [build_platform != target_platform] + # - zstd-static =1.5.5 # [build_platform != target_platform] host: - - python - - xeus =3.0.5 - - xeus-zmq =1.0.2 - - llvmdev =15 - - xtl - - nlohmann_json =3.11.2 - - cppzmq - zlib - - zstd-static =1.5.5 - about: - summary: lfortan - + license: BSD-3-Clause + license_family: BSD + license_file: LICENSE + summary: Modern interactive LLVM-based Fortran compiler + description: | + LFortran is a modern open-source (BSD licensed) interactive Fortran + compiler built on top of LLVM. It can execute user's code interactively to + allow exploratory work (much like Python, MATLAB or Julia) as well as + compile to binaries with the goal to run user’s code on modern + architectures such as multi-core CPUs and GPUs. + homepage: https://lfortran.org extra: recipe-maintainers: - - DerThorsten \ No newline at end of file + - certik + - anutosh491 + - Shaikh-Ubaid From e3d6f96088a40e2efc2360e71e5d1f3b3429562f Mon Sep 17 00:00:00 2001 From: DerThorsten Date: Thu, 16 May 2024 08:49:05 +0200 Subject: [PATCH 27/29] reset II --- recipes/recipes/lfortran/recipe.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/recipes/lfortran/recipe.yaml b/recipes/recipes/lfortran/recipe.yaml index 9e77b0daa..57705e5a5 100644 --- a/recipes/recipes/lfortran/recipe.yaml +++ b/recipes/recipes/lfortran/recipe.yaml @@ -10,7 +10,7 @@ source: # - url: https://github.com/lfortran/lfortran/archive/refs/tags/v${{ version }}.tar.gz # sha256: 2e54c5cfe9a94fc572bfc39c51496203636f78fb04e8bc0809577c4e1713a2ac - git: https://github.com/lfortran/lfortran.git - rev: with_stdc_format_macros + rev: eff69eecb3834500d4e78f55de69ae550776077f build: number: 1 From f2962ded4b70b678e7adeb3ca1995a870853ef38 Mon Sep 17 00:00:00 2001 From: DerThorsten Date: Thu, 16 May 2024 09:02:16 +0200 Subject: [PATCH 28/29] use clang --- recipes/recipes/lfortran/recipe.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/recipes/recipes/lfortran/recipe.yaml b/recipes/recipes/lfortran/recipe.yaml index 57705e5a5..84851b162 100644 --- a/recipes/recipes/lfortran/recipe.yaml +++ b/recipes/recipes/lfortran/recipe.yaml @@ -17,8 +17,7 @@ build: requirements: build: - - ${{ compiler('c') }} - - ${{ compiler('cxx') }} + - clang - python - re2c - bison ==3.4 From 7d73abe6cb214e6b8f6ebff3d8481a9e133fe85a Mon Sep 17 00:00:00 2001 From: DerThorsten Date: Thu, 16 May 2024 09:04:37 +0200 Subject: [PATCH 29/29] removed clang from host --- recipes/recipes/lfortran/recipe.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/recipes/recipes/lfortran/recipe.yaml b/recipes/recipes/lfortran/recipe.yaml index 84851b162..ddbbb8f5d 100644 --- a/recipes/recipes/lfortran/recipe.yaml +++ b/recipes/recipes/lfortran/recipe.yaml @@ -21,7 +21,6 @@ requirements: - python - re2c - bison ==3.4 - - llvmdev =15 - python - cmake =3.21.1 - make