From c533612ab6e4d4b4c46d3b827fae3687302cd22a Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Fri, 24 Jun 2022 01:22:56 -0700 Subject: sfcgal: fix boost build issues (#31254) --- var/spack/repos/builtin/packages/sfcgal/package.py | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/sfcgal/package.py b/var/spack/repos/builtin/packages/sfcgal/package.py index e134c83c9f..c8ba27267f 100644 --- a/var/spack/repos/builtin/packages/sfcgal/package.py +++ b/var/spack/repos/builtin/packages/sfcgal/package.py @@ -4,7 +4,6 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) from spack.package import * -from spack.pkg.builtin.boost import Boost class Sfcgal(CMakePackage): @@ -24,12 +23,7 @@ class Sfcgal(CMakePackage): depends_on('cmake@2.8.6:', type='build') # Ref: https://oslandia.github.io/SFCGAL/installation.html, but starts to work @4.7: depends_on('cgal@4.7: +core') - depends_on('boost@1.54.0:') - - # TODO: replace this with an explicit list of components of Boost, - # for instance depends_on('boost +filesystem') - # See https://github.com/spack/spack/pull/22303 for reference - depends_on(Boost.with_default_variants) + depends_on('boost@1.54.0:+chrono+filesystem+program_options+serialization+system+test+thread+timer') depends_on('mpfr@2.2.1:') depends_on('gmp@4.2:') @@ -37,4 +31,7 @@ class Sfcgal(CMakePackage): # It seems viewer is discontinued as of v1.3.0 # https://github.com/Oslandia/SFCGAL/releases/tag/v1.3.0 # Also, see https://github.com/Oslandia/SFCGAL-viewer - return ['-DSFCGAL_BUILD_VIEWER=OFF'] + return [ + self.define('BUILD_SHARED_LIBS', True), + self.define('SFCGAL_BUILD_VIEWER', False), + ] -- cgit v1.2.3-70-g09d2