diff --git a/bootstrap/coriolis2.spec.in b/bootstrap/coriolis2.spec.in index 6ce41e44..77340171 100644 --- a/bootstrap/coriolis2.spec.in +++ b/bootstrap/coriolis2.spec.in @@ -64,12 +64,30 @@ Development files for the Coriolis 2 package. VLSISAPD_TOP=%{coriolisTop}; export VLSISAPD_TOP CORIOLIS_TOP=%{coriolisTop}; export CORIOLIS_TOP -# Do build & install in one step. +# Do build & install in one step, except for documentation. tools="vlsisapd hurricane crlcore knik katabatic kite equinox solstice unicorn" for tool in $tools; do %__mkdir_p build/$tool pushd build/$tool; + cmake -D CMAKE_BUILD_TYPE:STRING=RELEASE \ + -D BUILD_SHARED_LIBS:STRING=ON \ + -D BUILD_DOC:STRING=OFF \ + -D CMAKE_INSTALL_PREFIX:STRING=%{coriolisTop} \ + -D DESTDIR:STRING=%{buildroot} \ +%ifarch x86_64 + -D LIB_SUFFIX:STRING=64 \ +%endif + ../../$tool + make DESTDIR=%{buildroot} %{_smp_mflags} install + popd + done + +# Build documentation, but in -j1. + tools="crlcore" + for tool in $tools; do + pushd build/$tool; + makeArgs="" cmakeArgs="" if [ "$tool" = "crlcore" ]; then @@ -87,7 +105,7 @@ Development files for the Coriolis 2 package. %endif ${cmakeArgs} \ ../../$tool - make DESTDIR=%{buildroot} %{_smp_mflags} ${makeArgs} install + make DESTDIR=%{buildroot} -j1 ${makeArgs} install popd done