From: Jakub Bogusz Date: Sun, 6 Mar 2016 11:06:59 +0000 (+0100) Subject: - renamed gomp bcond to compiler-agnostic openmp X-Git-Tag: auto/th/flann-1.8.4-9~1 X-Git-Url: http://git.pld-linux.org/?p=packages%2Fflann.git;a=commitdiff_plain;h=8a4c0f2dd2be91e85ce32d2e0014cf48a0a1bfed;ds=sidebyside - renamed gomp bcond to compiler-agnostic openmp --- diff --git a/flann.spec b/flann.spec index c49f2a5..3a35c59 100644 --- a/flann.spec +++ b/flann.spec @@ -1,7 +1,7 @@ # TODO: CUDA support, MPI (on bconds) # # Conditional build: -%bcond_without gomp # OpenMP support +%bcond_without openmp # OpenMP support # Summary: FLANN - Fast Library for Approximate Nearest Neighbours Summary(pl.UTF-8): FLANN - szybka biblioteka do przybliżonego wyszukiwania najbliższych sąsiadów @@ -17,10 +17,10 @@ Patch0: %{name}-python.patch Patch1: %{name}-lib.patch URL: http://www.cs.ubc.ca/~mariusm/index.php/FLANN/FLANN BuildRequires: cmake >= 2.6 -%{?with_gomp:BuildRequires: gcc-c++ >= 6:4.2} +%{?with_openmp:BuildRequires: gcc-c++ >= 6:4.2} BuildRequires: gtest-devel BuildRequires: hdf5-devel -%{?with_gomp:BuildRequires: libgomp-devel} +%{?with_openmp:BuildRequires: libgomp-devel} BuildRequires: libstdc++-devel BuildRequires: octave-devel BuildRequires: python >= 1:2.5 @@ -114,7 +114,7 @@ install -d build cd build %cmake .. \ -DBUILD_CUDA_LIB=OFF \ - %{!?with_gomp:-DUSE_OPENMP=OFF} + %{!?with_openmp:-DUSE_OPENMP=OFF} %{__make}