diff --git a/recipes/recipes_emscripten/fricas0-data/build.sh b/recipes/recipes_emscripten/fricas0-data/build.sh index 4d2f820201..c3bb987c25 100644 --- a/recipes/recipes_emscripten/fricas0-data/build.sh +++ b/recipes/recipes_emscripten/fricas0-data/build.sh @@ -1,14 +1,6 @@ #!/usr/bin/env bash set -euxo pipefail -cd "${SRC_DIR}" - -ecl -eval '(progn (load "lisp/load-lisp.lisp") (load "lisp/compile-interp.lisp") (quit))' -echo ')lisp (progn (load "lisp/compile-algebra.lisp") (quit))' | ecl -load fricas - -find interp -maxdepth 1 -type f -name "*.lisp" -delete -find algebra -maxdepth 1 -type f -name "*.lsp" -delete - DATA_DIR="$PREFIX/share/fricas0-data" mkdir -p "$DATA_DIR" diff --git a/recipes/recipes_emscripten/fricas0-data/recipe.yaml b/recipes/recipes_emscripten/fricas0-data/recipe.yaml index 9f01f76fe7..7aab57c379 100644 --- a/recipes/recipes_emscripten/fricas0-data/recipe.yaml +++ b/recipes/recipes_emscripten/fricas0-data/recipe.yaml @@ -11,13 +11,11 @@ source: sha256: a26f48558c5b4fe346382cb0d7fa24b638e1a89f3396be8049dc4add9dbda57e build: - number: 0 + number: 1 noarch: generic requirements: build: - - ecl - - ${{ compiler('cxx') }} tests: - package_contents: diff --git a/recipes/recipes_emscripten/fricas0-ecl/build.sh b/recipes/recipes_emscripten/fricas0-ecl/build.sh index 6da4b6346d..0bf2f728f4 100644 --- a/recipes/recipes_emscripten/fricas0-ecl/build.sh +++ b/recipes/recipes_emscripten/fricas0-ecl/build.sh @@ -23,6 +23,15 @@ make install export ECL_TO_RUN="${HOST_ECL_PREFIX}/bin/ecl" +cd ./fricas0-data + +$ECL_TO_RUN -eval '(progn (load "lisp/load-lisp.lisp") (load "lisp/compile-interp.lisp") (quit))' +echo ')lisp (progn (load "lisp/compile-algebra.lisp") (quit))' | $ECL_TO_RUN -load fricas + +find interp -maxdepth 1 -type f -name "*.lisp" -delete +find algebra -maxdepth 1 -type f -name "*.lsp" -delete +cd .. + make distclean || true # strip the x32 ABI suffix that GMP's sub-configure can't handle. @@ -59,4 +68,4 @@ python3 "${EMSCRIPTEN_DIR}/tools/file_packager.py" \ --preload "${SRC_DIR}/fricas0-data@/fricas0-data" \ --js-output="${PREFIX}/bin/ecl.data.js" -cp -r "web"/* "${PREFIX}/bin/" \ No newline at end of file +cp -r "web"/* "${PREFIX}/bin/" diff --git a/recipes/recipes_emscripten/fricas0-ecl/recipe.yaml b/recipes/recipes_emscripten/fricas0-ecl/recipe.yaml index 02189d6045..c15bcf5c38 100644 --- a/recipes/recipes_emscripten/fricas0-ecl/recipe.yaml +++ b/recipes/recipes_emscripten/fricas0-ecl/recipe.yaml @@ -12,13 +12,15 @@ source: target_directory: web build: - number: 0 + number: 1 requirements: build: - ${{ compiler("c") }} - make - pkg-config + - gcc + - gxx host: - gmp - libffi @@ -43,4 +45,4 @@ about: extra: recipe-maintainers: - oldk1331 - - wangyenshu + - wangyenshu \ No newline at end of file