diff --git a/_bin/sys_config b/_bin/sys_config index ab765181..e725ec4b 100755 --- a/_bin/sys_config +++ b/_bin/sys_config @@ -215,7 +215,7 @@ cat <<"EOF" > ostringstream_view.cc #include std::string_view ossv = std::ostringstream().view() ; EOF -if $CXX -c -std=c++20 -o ostringstream_view.o -xc ostringstream_view.cc 2>/dev/null +if $CXX -c -std=c++20 -o ostringstream_view.o ostringstream_view.cc then HAS_OSTRINGSTREAM_VIEW=1 else HAS_OSTRINGSTREAM_VIEW=0 fi diff --git a/debian/changelog b/debian/changelog index 18766b83..abab1657 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,5 @@ -open-lmake (0.1-1) UNRELEASED; urgency=low +open-lmake (1.0-1) UNRELEASED; urgency=low * Initial release. - -- Cesar Douady Fri, 15 Dec 2023 10:28:21 +0100 + -- Cesar Douady Wed, 24 Apr 2024 14:22:52 +0200 diff --git a/debian/control b/debian/control index 9f7f0fe1..3591a448 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,8 @@ Build-Depends: texinfo, python3, libslurm-dev, - libseccomp-dev + libseccomp-dev, + libpcre2-dev Standards-Version: 4.6.2 Homepage: https://github.com/cesar-douady/open-lmake @@ -17,7 +18,8 @@ Architecture: amd64 arm64 Depends: ${misc:Depends}, ${shlibs:Depends}, - python3 + python3, + libpcre2-8-0 Recommends: libslurm37 | libslurm38 | libslurm39 | libslurm40 Description: pythonic workflow management system Build systems like GNU Make are frequently used to create complicated diff --git a/lmake_env/Lmakefile.py b/lmake_env/Lmakefile.py index 67ad68cc..9157b0de 100644 --- a/lmake_env/Lmakefile.py +++ b/lmake_env/Lmakefile.py @@ -227,13 +227,14 @@ def cmd() : ) n_tokens = config.backends.local.cc resources = pdict() - if True : resources.mem = '512M' + if True : resources.mem = '1G' if backend=='local' : resources.cc = 1 class LinkRule(PathRule) : combine = ('pre_opts','rev_post_opts') pre_opts = [] # options before inputs & outputs rev_post_opts = [] # options after inputs & outputs, combine appends at each level, but here we want to prepend + resources = {'mem': '1G'} def cmd() : run_gxx( TARGET , *pre_opts