diff --git a/abi_used_libs b/abi_used_libs --- a/abi_used_libs +++ b/abi_used_libs @@ -1,7 +1,7 @@ -libboost_context.so.1.66.0 -libboost_iostreams.so.1.66.0 -libboost_python3.so.1.66.0 -libboost_regex.so.1.66.0 +libboost_context.so.1.72.0 +libboost_iostreams.so.1.72.0 +libboost_python37.so.1.72.0 +libboost_regex.so.1.72.0 libc.so.6 libcairomm-1.0.so.1 libexpat.so.1 diff --git a/package.yml b/package.yml --- a/package.yml +++ b/package.yml @@ -1,6 +1,6 @@ name : graph-tool version : 2.29 -release : 8 +release : 9 source : - https://downloads.skewed.de/graph-tool/graph-tool-2.29.tar.bz2 : 6c0c4336bed6e2f79c91ace6d6914145ee03d0bd5025473b5918aec2b0657f7a license : GPL-3.0-or-later @@ -23,10 +23,19 @@ - python3-cairo - scipy clang : yes +environment: | + # workaround for bug in boost 1.72 + export CPPFLAGS="$CPPFLAGS -DHAVE_BOOST_COROUTINE" + # Linking jobs routinely use 10+ GiB of RAM, so limit them to 1 at a time + export LLVM_PARALLEL_LINK_JOBS=1 setup : | %configure PREFIX=/usr PYTHON=python3 build : | - # build with -j1 to limit memory usage (this is a memory monster) - %make -j1 + # Maximum observed single compile job size is around 8 GiB Resident with sizes in the range 1.5-5 GiB the most common. + # Likely due to poor job parallelism in make, the build will fan out to $CPUs -> 4-6 CPUs -> 1-2 CPUs. + # For systems with 16 GiB RAM, make -j3 is barely suitable and make -j2 is recommended if the system will be in use during the build. + # For systems with 32 GiB RAM, make -j12 is probably the maximum. + # For systems with 64 GiB RAM, make -j24 is probably the maximum. (Should be used for the Buildserver) + %make -j24 install : | %make_install diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml --- a/pspec_x86_64.xml +++ b/pspec_x86_64.xml @@ -2,8 +2,8 @@ graph-tool - Bryan T. Meyers - bmeyers@datadrake.com + F. von Gellhorn + flinux@vongellhorn.ch GPL-3.0-or-later programming.python @@ -359,19 +359,19 @@ programming.devel - graph-tool + graph-tool /usr/lib64/pkgconfig/graph-tool-py3.7.pc - - 2020-02-06 + + 2020-03-22 2.29 Packaging update - Bryan T. Meyers - bmeyers@datadrake.com + F. von Gellhorn + flinux@vongellhorn.ch \ No newline at end of file