From 5fdea702e0fcc3964536947f1361633877964a6d Mon Sep 17 00:00:00 2001 From: Thomas Applencourt Date: Mon, 1 Apr 2024 22:10:29 +0000 Subject: [PATCH 1/8] metababel v1.1.0 --- packages/ruby-metababel/package.py | 1 + packages/thapi/package.py | 1 + 2 files changed, 2 insertions(+) diff --git a/packages/ruby-metababel/package.py b/packages/ruby-metababel/package.py index 163f123..8a03936 100644 --- a/packages/ruby-metababel/package.py +++ b/packages/ruby-metababel/package.py @@ -12,6 +12,7 @@ class RubyMetababel(RubyPackage): list_url = "https://rubygems.org/gems/metababel/versions" list_depth = 1 + version('1.1.0', sha256='43a0fcfece2de92b589bdffb19e7346e7c6e7076aa703b5dcc97daf0fb1b06b7', expand=False) version('1.0.3', sha256='b92fd5a9828d5367a5097e212dfa3b0a4567ed209f48dbc8330df81e8269f625', expand=False) version('1.0.2', sha256='867c71708e74b400d53722b5477ec4d7e604aa850e0f45dc3b3a882e3e22d51a', expand=False) version('1.0.1', sha256='1b93282d32e81af2001b8a1079b144b6e95f11615cb4221d12da3545fbcf3fca', expand=False) diff --git a/packages/thapi/package.py b/packages/thapi/package.py index c2f0a72..2f67545 100644 --- a/packages/thapi/package.py +++ b/packages/thapi/package.py @@ -36,6 +36,7 @@ class Thapi(AutotoolsPackage): depends_on('ruby-cast-to-yaml', type=('build')) depends_on('ruby-metababel@0.1.0:0.9', type=('build'), when='@:0.0.10') depends_on('ruby-metababel@1.0.0:', type=('build'), when='@0.0.11:') + depends_on('ruby-metababel@1.1.0:', type=('build'), when='@master') depends_on('libiberty+pic') depends_on('libffi') From cf4d924770c69440898c6744d3d9b179c11027f3 Mon Sep 17 00:00:00 2001 From: Thomas Applencourt Date: Wed, 15 May 2024 20:24:20 +0000 Subject: [PATCH 2/8] Add MPI variant --- packages/thapi/package.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/thapi/package.py b/packages/thapi/package.py index 2f67545..2fbf12b 100644 --- a/packages/thapi/package.py +++ b/packages/thapi/package.py @@ -21,7 +21,7 @@ class Thapi(AutotoolsPackage): depends_on('autoconf', type=('build')) depends_on('libtool', type=('build')) depends_on('pkgconfig') - # 4.3+ for grouped target + # 4.3+ for grouped target depends_on('gmake@4.3:', type=('build')) depends_on('babeltrace2', type=('build', 'link', 'run')) depends_on('protobuf@3.12.4:', type=('build', 'link', 'run')) @@ -45,6 +45,9 @@ class Thapi(AutotoolsPackage): depends_on('python', type=('build')) variant('strict', default=False, description='Enable -Werror during the build') + variant('mpi', default=False, description='Check if MPI can be used to generated Sync Daemon') + when("+mpi"): + depends_on('mpi', type='build','run') def configure_args(self): args = [] args.extend(self.enable_or_disable('strict')) From fdef07f229a8f2e667fda6df5a81bc6e50e4c5e0 Mon Sep 17 00:00:00 2001 From: Thomas Applencourt Date: Wed, 15 May 2024 20:26:44 +0000 Subject: [PATCH 3/8] add metababel 1.1 --- packages/ruby-metababel/package.py | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/ruby-metababel/package.py b/packages/ruby-metababel/package.py index 8a03936..4130cb4 100644 --- a/packages/ruby-metababel/package.py +++ b/packages/ruby-metababel/package.py @@ -12,6 +12,7 @@ class RubyMetababel(RubyPackage): list_url = "https://rubygems.org/gems/metababel/versions" list_depth = 1 + version('1.1.1', sha256='9f6a20b0a11c884935e074a3949d8a66eb0a585ff19603120441fc6cad73a0ea', expand=False) version('1.1.0', sha256='43a0fcfece2de92b589bdffb19e7346e7c6e7076aa703b5dcc97daf0fb1b06b7', expand=False) version('1.0.3', sha256='b92fd5a9828d5367a5097e212dfa3b0a4567ed209f48dbc8330df81e8269f625', expand=False) version('1.0.2', sha256='867c71708e74b400d53722b5477ec4d7e604aa850e0f45dc3b3a882e3e22d51a', expand=False) From 36e7b62cf93f762020a41ac2b9d31a70c3ea9f2f Mon Sep 17 00:00:00 2001 From: Thomas Applencourt Date: Wed, 15 May 2024 20:29:07 +0000 Subject: [PATCH 4/8] fix syntax --- packages/thapi/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/thapi/package.py b/packages/thapi/package.py index 2fbf12b..c6e1a27 100644 --- a/packages/thapi/package.py +++ b/packages/thapi/package.py @@ -47,7 +47,7 @@ class Thapi(AutotoolsPackage): variant('strict', default=False, description='Enable -Werror during the build') variant('mpi', default=False, description='Check if MPI can be used to generated Sync Daemon') when("+mpi"): - depends_on('mpi', type='build','run') + depends_on('mpi', type=('build','run')) def configure_args(self): args = [] args.extend(self.enable_or_disable('strict')) From 4ef0c765565f2c117db56bc308cd63f4c7d79864 Mon Sep 17 00:00:00 2001 From: Thomas Applencourt Date: Wed, 15 May 2024 20:36:41 +0000 Subject: [PATCH 5/8] asdasd --- packages/thapi/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/thapi/package.py b/packages/thapi/package.py index e0197a2..f5490af 100644 --- a/packages/thapi/package.py +++ b/packages/thapi/package.py @@ -35,7 +35,7 @@ class Thapi(AutotoolsPackage): depends_on('ruby-nokogiri', type=('build')) depends_on('ruby-cast-to-yaml', type=('build')) depends_on('ruby-metababel@0.1.0:0.9', type=('build'), when='@:0.0.10') - depends_on('ruby-metababel@1.0.0:', type=('build'), when='@0.0.11:') + depends_on('ruby-metababel@1.0.0:', type=('build'), when='@0.0.11') depends_on('ruby-metababel@1.1.1:', type=('build'), when='@master') depends_on('libiberty+pic') From 450062dc0032e6978fa2fecdf5426c736d993916 Mon Sep 17 00:00:00 2001 From: Thomas Applencourt Date: Wed, 15 May 2024 20:37:32 +0000 Subject: [PATCH 6/8] fix typo --- packages/thapi/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/thapi/package.py b/packages/thapi/package.py index f5490af..03381d7 100644 --- a/packages/thapi/package.py +++ b/packages/thapi/package.py @@ -46,7 +46,7 @@ class Thapi(AutotoolsPackage): variant('strict', default=False, description='Enable -Werror during the build') variant('mpi', default=False, description='Check if MPI can be used to generated Sync Daemon') - when("+mpi"): + with when("+mpi"): depends_on('mpi', type=('build','run')) def configure_args(self): args = [] From ffd838bb06135429cfd4a164ebd028df76526ba0 Mon Sep 17 00:00:00 2001 From: Thomas Applencourt Date: Wed, 15 May 2024 15:41:51 -0500 Subject: [PATCH 7/8] Update packages/thapi/package.py --- packages/thapi/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/thapi/package.py b/packages/thapi/package.py index 03381d7..1a4335b 100644 --- a/packages/thapi/package.py +++ b/packages/thapi/package.py @@ -45,7 +45,7 @@ class Thapi(AutotoolsPackage): depends_on('python', type=('build')) variant('strict', default=False, description='Enable -Werror during the build') - variant('mpi', default=False, description='Check if MPI can be used to generated Sync Daemon') + variant('mpi', default=False, description='MPI will be used in the Sync Daemon') with when("+mpi"): depends_on('mpi', type=('build','run')) def configure_args(self): From e1aff52db72e9c34ec86fdf4aebe0b46e1ec2af5 Mon Sep 17 00:00:00 2001 From: Thomas Applencourt Date: Wed, 15 May 2024 15:42:24 -0500 Subject: [PATCH 8/8] Update packages/thapi/package.py --- packages/thapi/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/thapi/package.py b/packages/thapi/package.py index 1a4335b..7e3e28e 100644 --- a/packages/thapi/package.py +++ b/packages/thapi/package.py @@ -47,7 +47,7 @@ class Thapi(AutotoolsPackage): variant('strict', default=False, description='Enable -Werror during the build') variant('mpi', default=False, description='MPI will be used in the Sync Daemon') with when("+mpi"): - depends_on('mpi', type=('build','run')) + depends_on('mpi', type=('build', 'run')) def configure_args(self): args = [] args.extend(self.enable_or_disable('strict'))