diff --git a/recipe/build-dolfin.sh b/recipe/build-dolfin.sh index f07a72bd..18c905b1 100755 --- a/recipe/build-dolfin.sh +++ b/recipe/build-dolfin.sh @@ -1,8 +1,6 @@ #!/bin/bash set -eux -cd dolfin - # scrub problematic -fdebug-prefix-map from C[XX]FLAGS # these are loaded in the clang[++] activate scripts export CFLAGS=$(echo $CFLAGS | sed -E 's@\-fdebug\-prefix\-map[^ ]*@@g') diff --git a/recipe/build-libdolfin.sh b/recipe/build-libdolfin.sh index 69a07e3b..1055c73d 100755 --- a/recipe/build-libdolfin.sh +++ b/recipe/build-libdolfin.sh @@ -1,10 +1,6 @@ #!/bin/bash set -eux -unset CMAKE_PREFIX_PATH - -cd dolfin - # scrub problematic -fdebug-prefix-map from C[XX]FLAGS # these are loaded in the clang[++] activate scripts export CFLAGS=$(echo $CFLAGS | sed -E 's@\-fdebug\-prefix\-map[^ ]*@@g') diff --git a/recipe/meta.yaml b/recipe/meta.yaml index e674c3b6..2603689e 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -8,7 +8,6 @@ package: source: - url: https://bitbucket.org/fenics-project/dolfin/downloads/dolfin-{{ version }}.post0.tar.gz sha256: 61abdcdb13684ba2a3ba4afb7ea6c7907aa0896a46439d3af7e8848483d4392f - folder: dolfin patches: - boost.patch - linuxboost.patch # [linux] @@ -151,7 +150,7 @@ outputs: commands: - bash ${RECIPE_DIR}/parent/test-dolfin.sh source_files: - - dolfin/python/test + - python/test requires: - nose @@ -180,9 +179,10 @@ outputs: about: home: http://www.fenicsproject.org license: LGPL-3.0-or-later + license_family: LGPL license_file: - - dolfin/COPYING - - dolfin/COPYING.LESSER + - COPYING + - COPYING.LESSER summary: 'FEniCS is a collection of free software for automated, efficient solution of differential equations' description: | diff --git a/recipe/test-dolfin.sh b/recipe/test-dolfin.sh index 3e6bf0b7..0fd41e5f 100755 --- a/recipe/test-dolfin.sh +++ b/recipe/test-dolfin.sh @@ -31,7 +31,7 @@ EOF python -c 'from dolfin import *; info(parameters["form_compiler"], True)' -pushd "dolfin/python/test/unit" +pushd "python/test/unit" TESTS="jit fem/test_form.py::test_assemble_linear" RUN_TESTS="python -b -m pytest -vs $TESTS"