From 538653cd8dde710c31b07bbff3002b1b27632cf1 Mon Sep 17 00:00:00 2001 From: Simon Branford Date: Tue, 21 Nov 2023 20:57:01 +0000 Subject: [PATCH] use existing patch in pybind11 2.6.2 and 2.7.1 to fix failing test due to extra whitespace --- .../p/pybind11/pybind11-2.6.2-GCCcore-10.3.0.eb | 7 ++++++- .../pybind11-2.7.1-GCCcore-11.2.0-Python-2.7.18.eb | 7 ++++++- .../p/pybind11/pybind11-2.7.1-GCCcore-11.2.0.eb | 7 ++++++- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/easybuild/easyconfigs/p/pybind11/pybind11-2.6.2-GCCcore-10.3.0.eb b/easybuild/easyconfigs/p/pybind11/pybind11-2.6.2-GCCcore-10.3.0.eb index ad21aadc19b..2c22e302221 100644 --- a/easybuild/easyconfigs/p/pybind11/pybind11-2.6.2-GCCcore-10.3.0.eb +++ b/easybuild/easyconfigs/p/pybind11/pybind11-2.6.2-GCCcore-10.3.0.eb @@ -9,7 +9,12 @@ toolchain = {'name': 'GCCcore', 'version': '10.3.0'} source_urls = ['https://github.com/pybind/pybind11/archive/'] sources = ['v%(version)s.tar.gz'] -checksums = ['8ff2fff22df038f5cd02cea8af56622bc67f5b64534f1b83b9f133b8366acff2'] +patches = ['pybind11-2.6.0_fix-test-extra-whitespace.patch'] +checksums = [ + {'v2.6.2.tar.gz': '8ff2fff22df038f5cd02cea8af56622bc67f5b64534f1b83b9f133b8366acff2'}, + {'pybind11-2.6.0_fix-test-extra-whitespace.patch': + 'f0ff7416d14f9589b5d100ad021e18690cb08cb662df9d0ac21327d04bdb96fc'}, +] builddependencies = [ ('binutils', '2.36.1'), diff --git a/easybuild/easyconfigs/p/pybind11/pybind11-2.7.1-GCCcore-11.2.0-Python-2.7.18.eb b/easybuild/easyconfigs/p/pybind11/pybind11-2.7.1-GCCcore-11.2.0-Python-2.7.18.eb index f393fb93837..e08f29369de 100644 --- a/easybuild/easyconfigs/p/pybind11/pybind11-2.7.1-GCCcore-11.2.0-Python-2.7.18.eb +++ b/easybuild/easyconfigs/p/pybind11/pybind11-2.7.1-GCCcore-11.2.0-Python-2.7.18.eb @@ -10,7 +10,12 @@ toolchain = {'name': 'GCCcore', 'version': '11.2.0'} source_urls = ['https://github.com/pybind/pybind11/archive/'] sources = ['v%(version)s.tar.gz'] -checksums = ['616d1c42e4cf14fa27b2a4ff759d7d7b33006fdc5ad8fd603bb2c22622f27020'] +patches = ['pybind11-2.6.0_fix-test-extra-whitespace.patch'] +checksums = [ + {'v2.7.1.tar.gz': '616d1c42e4cf14fa27b2a4ff759d7d7b33006fdc5ad8fd603bb2c22622f27020'}, + {'pybind11-2.6.0_fix-test-extra-whitespace.patch': + 'f0ff7416d14f9589b5d100ad021e18690cb08cb662df9d0ac21327d04bdb96fc'}, +] builddependencies = [ ('binutils', '2.37'), diff --git a/easybuild/easyconfigs/p/pybind11/pybind11-2.7.1-GCCcore-11.2.0.eb b/easybuild/easyconfigs/p/pybind11/pybind11-2.7.1-GCCcore-11.2.0.eb index b04d5c7b9b4..29ae717308d 100644 --- a/easybuild/easyconfigs/p/pybind11/pybind11-2.7.1-GCCcore-11.2.0.eb +++ b/easybuild/easyconfigs/p/pybind11/pybind11-2.7.1-GCCcore-11.2.0.eb @@ -9,7 +9,12 @@ toolchain = {'name': 'GCCcore', 'version': '11.2.0'} source_urls = ['https://github.com/pybind/pybind11/archive/'] sources = ['v%(version)s.tar.gz'] -checksums = ['616d1c42e4cf14fa27b2a4ff759d7d7b33006fdc5ad8fd603bb2c22622f27020'] +patches = ['pybind11-2.6.0_fix-test-extra-whitespace.patch'] +checksums = [ + {'v2.7.1.tar.gz': '616d1c42e4cf14fa27b2a4ff759d7d7b33006fdc5ad8fd603bb2c22622f27020'}, + {'pybind11-2.6.0_fix-test-extra-whitespace.patch': + 'f0ff7416d14f9589b5d100ad021e18690cb08cb662df9d0ac21327d04bdb96fc'}, +] builddependencies = [ ('binutils', '2.37'),