diff --git a/easybuild/easyconfigs/r/Rust/Rust-1.70.0-GCCcore-12.3.0.eb b/easybuild/easyconfigs/r/Rust/Rust-1.70.0-GCCcore-12.3.0.eb index 6b3271c7a20f..606c703b439b 100644 --- a/easybuild/easyconfigs/r/Rust/Rust-1.70.0-GCCcore-12.3.0.eb +++ b/easybuild/easyconfigs/r/Rust/Rust-1.70.0-GCCcore-12.3.0.eb @@ -12,7 +12,7 @@ sources = ['rustc-%(version)s-src.tar.gz'] patches = ['Rust-1.70_sysroot-fix-interpreter.patch'] checksums = [ {'rustc-1.70.0-src.tar.gz': 'b2bfae000b7a5040e4ec4bbc50a09f21548190cb7570b0ed77358368413bd27c'}, - {'Rust-1.70_sysroot-fix-interpreter.patch': '220129db55e022a98d25028da5dcc9f26b252dd995c3ac92f6312dbb1e362cb1'}, + {'Rust-1.70_sysroot-fix-interpreter.patch': 'aa7a7fe784e463b297c640edfe88b8d96acbee0c173251575cef0426baccc57e'}, ] builddependencies = [ diff --git a/easybuild/easyconfigs/r/Rust/Rust-1.70_sysroot-fix-interpreter.patch b/easybuild/easyconfigs/r/Rust/Rust-1.70_sysroot-fix-interpreter.patch index a5e3d50eb2bd..509b1c8d4172 100644 --- a/easybuild/easyconfigs/r/Rust/Rust-1.70_sysroot-fix-interpreter.patch +++ b/easybuild/easyconfigs/r/Rust/Rust-1.70_sysroot-fix-interpreter.patch @@ -27,7 +27,7 @@ updated by: micketeer@gmail.com + easybuild_sysroot = os.getenv("EASYBUILD_SYSROOT") + if easybuild_sysroot: -+ if not fname.endswith(".so"): ++ if ".so" not in fname: + # determine patch to interpreter in host via output produced by 'readelf -l /bin/bash' + readelf_out = subprocess.check_output(['readelf', '-l', '/bin/bash']).decode('ascii', 'ignore').strip() + regex = re.compile('.*program interpreter: ([^\]]+)', re.M) diff --git a/easybuild/easyconfigs/r/Rust/Rust-1.73.0-GCCcore-13.2.0.eb b/easybuild/easyconfigs/r/Rust/Rust-1.73.0-GCCcore-13.2.0.eb index 156414a7c555..19f93c441af2 100644 --- a/easybuild/easyconfigs/r/Rust/Rust-1.73.0-GCCcore-13.2.0.eb +++ b/easybuild/easyconfigs/r/Rust/Rust-1.73.0-GCCcore-13.2.0.eb @@ -12,7 +12,7 @@ sources = ['rustc-%(version)s-src.tar.gz'] patches = ['Rust-1.70_sysroot-fix-interpreter.patch'] checksums = [ {'rustc-1.73.0-src.tar.gz': '96d62e6d1f2d21df7ac8acb3b9882411f9e7c7036173f7f2ede9e1f1f6b1bb3a'}, - {'Rust-1.70_sysroot-fix-interpreter.patch': '220129db55e022a98d25028da5dcc9f26b252dd995c3ac92f6312dbb1e362cb1'}, + {'Rust-1.70_sysroot-fix-interpreter.patch': 'aa7a7fe784e463b297c640edfe88b8d96acbee0c173251575cef0426baccc57e'}, ] builddependencies = [ diff --git a/easybuild/easyconfigs/r/Rust/Rust-1.75.0-GCCcore-12.2.0.eb b/easybuild/easyconfigs/r/Rust/Rust-1.75.0-GCCcore-12.2.0.eb index d9b3ab115e62..4127b027b4c3 100644 --- a/easybuild/easyconfigs/r/Rust/Rust-1.75.0-GCCcore-12.2.0.eb +++ b/easybuild/easyconfigs/r/Rust/Rust-1.75.0-GCCcore-12.2.0.eb @@ -12,7 +12,7 @@ sources = ['rustc-%(version)s-src.tar.gz'] patches = ['Rust-1.70_sysroot-fix-interpreter.patch'] checksums = [ {'rustc-1.75.0-src.tar.gz': '5b739f45bc9d341e2d1c570d65d2375591e22c2d23ef5b8a37711a0386abc088'}, - {'Rust-1.70_sysroot-fix-interpreter.patch': '220129db55e022a98d25028da5dcc9f26b252dd995c3ac92f6312dbb1e362cb1'}, + {'Rust-1.70_sysroot-fix-interpreter.patch': 'aa7a7fe784e463b297c640edfe88b8d96acbee0c173251575cef0426baccc57e'}, ] builddependencies = [ diff --git a/easybuild/easyconfigs/r/Rust/Rust-1.75.0-GCCcore-12.3.0-nightly.eb b/easybuild/easyconfigs/r/Rust/Rust-1.75.0-GCCcore-12.3.0-nightly.eb index 083801b3c7b8..ad805758c416 100644 --- a/easybuild/easyconfigs/r/Rust/Rust-1.75.0-GCCcore-12.3.0-nightly.eb +++ b/easybuild/easyconfigs/r/Rust/Rust-1.75.0-GCCcore-12.3.0-nightly.eb @@ -13,7 +13,7 @@ sources = ['rustc-%(version)s-src.tar.gz'] patches = ['Rust-1.70_sysroot-fix-interpreter.patch'] checksums = [ {'rustc-1.75.0-src.tar.gz': '5b739f45bc9d341e2d1c570d65d2375591e22c2d23ef5b8a37711a0386abc088'}, - {'Rust-1.70_sysroot-fix-interpreter.patch': '220129db55e022a98d25028da5dcc9f26b252dd995c3ac92f6312dbb1e362cb1'}, + {'Rust-1.70_sysroot-fix-interpreter.patch': 'aa7a7fe784e463b297c640edfe88b8d96acbee0c173251575cef0426baccc57e'}, ] builddependencies = [ diff --git a/easybuild/easyconfigs/r/Rust/Rust-1.75.0-GCCcore-12.3.0.eb b/easybuild/easyconfigs/r/Rust/Rust-1.75.0-GCCcore-12.3.0.eb index 2d2e5e8c3879..2b2b784d1fc1 100644 --- a/easybuild/easyconfigs/r/Rust/Rust-1.75.0-GCCcore-12.3.0.eb +++ b/easybuild/easyconfigs/r/Rust/Rust-1.75.0-GCCcore-12.3.0.eb @@ -12,7 +12,7 @@ sources = ['rustc-%(version)s-src.tar.gz'] patches = ['Rust-1.70_sysroot-fix-interpreter.patch'] checksums = [ {'rustc-1.75.0-src.tar.gz': '5b739f45bc9d341e2d1c570d65d2375591e22c2d23ef5b8a37711a0386abc088'}, - {'Rust-1.70_sysroot-fix-interpreter.patch': '220129db55e022a98d25028da5dcc9f26b252dd995c3ac92f6312dbb1e362cb1'}, + {'Rust-1.70_sysroot-fix-interpreter.patch': 'aa7a7fe784e463b297c640edfe88b8d96acbee0c173251575cef0426baccc57e'}, ] builddependencies = [ diff --git a/easybuild/easyconfigs/r/Rust/Rust-1.76.0-GCCcore-13.2.0.eb b/easybuild/easyconfigs/r/Rust/Rust-1.76.0-GCCcore-13.2.0.eb index af0fca6bc4f7..70a9d9ac9d1b 100644 --- a/easybuild/easyconfigs/r/Rust/Rust-1.76.0-GCCcore-13.2.0.eb +++ b/easybuild/easyconfigs/r/Rust/Rust-1.76.0-GCCcore-13.2.0.eb @@ -12,7 +12,7 @@ sources = ['rustc-%(version)s-src.tar.gz'] patches = ['Rust-1.70_sysroot-fix-interpreter.patch'] checksums = [ {'rustc-1.76.0-src.tar.gz': '9e5cff033a7f0d2266818982ad90e4d3e4ef8f8ee1715776c6e25073a136c021'}, - {'Rust-1.70_sysroot-fix-interpreter.patch': '220129db55e022a98d25028da5dcc9f26b252dd995c3ac92f6312dbb1e362cb1'}, + {'Rust-1.70_sysroot-fix-interpreter.patch': 'aa7a7fe784e463b297c640edfe88b8d96acbee0c173251575cef0426baccc57e'}, ] builddependencies = [ diff --git a/easybuild/easyconfigs/r/Rust/Rust-1.78.0-GCCcore-13.3.0.eb b/easybuild/easyconfigs/r/Rust/Rust-1.78.0-GCCcore-13.3.0.eb index ed5d13cb4a4d..9b745295162b 100644 --- a/easybuild/easyconfigs/r/Rust/Rust-1.78.0-GCCcore-13.3.0.eb +++ b/easybuild/easyconfigs/r/Rust/Rust-1.78.0-GCCcore-13.3.0.eb @@ -12,7 +12,7 @@ sources = ['rustc-%(version)s-src.tar.gz'] patches = ['Rust-1.70_sysroot-fix-interpreter.patch'] checksums = [ {'rustc-1.78.0-src.tar.gz': 'ff544823a5cb27f2738128577f1e7e00ee8f4c83f2a348781ae4fc355e91d5a9'}, - {'Rust-1.70_sysroot-fix-interpreter.patch': '220129db55e022a98d25028da5dcc9f26b252dd995c3ac92f6312dbb1e362cb1'}, + {'Rust-1.70_sysroot-fix-interpreter.patch': 'aa7a7fe784e463b297c640edfe88b8d96acbee0c173251575cef0426baccc57e'}, ] builddependencies = [ diff --git a/easybuild/easyconfigs/r/Rust/Rust-1.79.0-GCCcore-13.3.0.eb b/easybuild/easyconfigs/r/Rust/Rust-1.79.0-GCCcore-13.3.0.eb index 88962930f30e..efaa7c9a7a8d 100644 --- a/easybuild/easyconfigs/r/Rust/Rust-1.79.0-GCCcore-13.3.0.eb +++ b/easybuild/easyconfigs/r/Rust/Rust-1.79.0-GCCcore-13.3.0.eb @@ -12,7 +12,7 @@ sources = ['rustc-%(version)s-src.tar.gz'] patches = ['Rust-1.70_sysroot-fix-interpreter.patch'] checksums = [ {'rustc-1.79.0-src.tar.gz': '172ecf3c7d1f9d9fb16cd2a628869782670416ded0129e524a86751f961448c0'}, - {'Rust-1.70_sysroot-fix-interpreter.patch': '220129db55e022a98d25028da5dcc9f26b252dd995c3ac92f6312dbb1e362cb1'}, + {'Rust-1.70_sysroot-fix-interpreter.patch': 'aa7a7fe784e463b297c640edfe88b8d96acbee0c173251575cef0426baccc57e'}, ] builddependencies = [ diff --git a/easybuild/easyconfigs/r/Rust/Rust-1.81.0-GCCcore-12.3.0.eb b/easybuild/easyconfigs/r/Rust/Rust-1.81.0-GCCcore-12.3.0.eb index 750d10778ab3..ffb2de8af83e 100644 --- a/easybuild/easyconfigs/r/Rust/Rust-1.81.0-GCCcore-12.3.0.eb +++ b/easybuild/easyconfigs/r/Rust/Rust-1.81.0-GCCcore-12.3.0.eb @@ -12,7 +12,7 @@ sources = ['rustc-%(version)s-src.tar.gz'] patches = ['Rust-1.70_sysroot-fix-interpreter.patch'] checksums = [ {'rustc-1.81.0-src.tar.gz': '872448febdff32e50c3c90a7e15f9bb2db131d13c588fe9071b0ed88837ccfa7'}, - {'Rust-1.70_sysroot-fix-interpreter.patch': '220129db55e022a98d25028da5dcc9f26b252dd995c3ac92f6312dbb1e362cb1'}, + {'Rust-1.70_sysroot-fix-interpreter.patch': 'aa7a7fe784e463b297c640edfe88b8d96acbee0c173251575cef0426baccc57e'}, ] builddependencies = [ diff --git a/easybuild/easyconfigs/r/Rust/Rust-1.81.0-GCCcore-13.3.0.eb b/easybuild/easyconfigs/r/Rust/Rust-1.81.0-GCCcore-13.3.0.eb index ca97c690c021..e4425a7f9e12 100644 --- a/easybuild/easyconfigs/r/Rust/Rust-1.81.0-GCCcore-13.3.0.eb +++ b/easybuild/easyconfigs/r/Rust/Rust-1.81.0-GCCcore-13.3.0.eb @@ -12,7 +12,7 @@ sources = ['rustc-%(version)s-src.tar.gz'] patches = ['Rust-1.70_sysroot-fix-interpreter.patch'] checksums = [ {'rustc-1.81.0-src.tar.gz': '872448febdff32e50c3c90a7e15f9bb2db131d13c588fe9071b0ed88837ccfa7'}, - {'Rust-1.70_sysroot-fix-interpreter.patch': '220129db55e022a98d25028da5dcc9f26b252dd995c3ac92f6312dbb1e362cb1'}, + {'Rust-1.70_sysroot-fix-interpreter.patch': 'aa7a7fe784e463b297c640edfe88b8d96acbee0c173251575cef0426baccc57e'}, ] builddependencies = [ diff --git a/easybuild/easyconfigs/r/Rust/Rust-1.83.0-GCCcore-13.3.0.eb b/easybuild/easyconfigs/r/Rust/Rust-1.83.0-GCCcore-13.3.0.eb index f614946f5486..a41e8fc70dc9 100644 --- a/easybuild/easyconfigs/r/Rust/Rust-1.83.0-GCCcore-13.3.0.eb +++ b/easybuild/easyconfigs/r/Rust/Rust-1.83.0-GCCcore-13.3.0.eb @@ -12,7 +12,7 @@ sources = ['rustc-%(version)s-src.tar.gz'] patches = ['Rust-1.70_sysroot-fix-interpreter.patch'] checksums = [ {'rustc-1.83.0-src.tar.gz': '722d773bd4eab2d828d7dd35b59f0b017ddf9a97ee2b46c1b7f7fac5c8841c6e'}, - {'Rust-1.70_sysroot-fix-interpreter.patch': '220129db55e022a98d25028da5dcc9f26b252dd995c3ac92f6312dbb1e362cb1'}, + {'Rust-1.70_sysroot-fix-interpreter.patch': 'aa7a7fe784e463b297c640edfe88b8d96acbee0c173251575cef0426baccc57e'}, ] builddependencies = [ diff --git a/easybuild/easyconfigs/r/Rust/Rust-1.85.1-GCCcore-14.2.0.eb b/easybuild/easyconfigs/r/Rust/Rust-1.85.1-GCCcore-14.2.0.eb index 20bf02afd902..307eca7e1c54 100644 --- a/easybuild/easyconfigs/r/Rust/Rust-1.85.1-GCCcore-14.2.0.eb +++ b/easybuild/easyconfigs/r/Rust/Rust-1.85.1-GCCcore-14.2.0.eb @@ -12,7 +12,7 @@ sources = ['rustc-%(version)s-src.tar.gz'] patches = ['Rust-1.70_sysroot-fix-interpreter.patch'] checksums = [ {'rustc-1.85.1-src.tar.gz': '0f2995ca083598757a8d9a293939e569b035799e070f419a686b0996fb94238a'}, - {'Rust-1.70_sysroot-fix-interpreter.patch': '220129db55e022a98d25028da5dcc9f26b252dd995c3ac92f6312dbb1e362cb1'}, + {'Rust-1.70_sysroot-fix-interpreter.patch': 'aa7a7fe784e463b297c640edfe88b8d96acbee0c173251575cef0426baccc57e'}, ] builddependencies = [ diff --git a/easybuild/easyconfigs/r/Rust/Rust-1.86.0-GCCcore-13.2.0-nightly.eb b/easybuild/easyconfigs/r/Rust/Rust-1.86.0-GCCcore-13.2.0-nightly.eb index 9606ceabc0c0..593fb235b170 100644 --- a/easybuild/easyconfigs/r/Rust/Rust-1.86.0-GCCcore-13.2.0-nightly.eb +++ b/easybuild/easyconfigs/r/Rust/Rust-1.86.0-GCCcore-13.2.0-nightly.eb @@ -13,7 +13,7 @@ sources = ['rustc-%(version)s-src.tar.gz'] patches = ['Rust-1.70_sysroot-fix-interpreter.patch'] checksums = [ {'rustc-1.86.0-src.tar.gz': '022a27286df67900a044d227d9db69d4732ec3d833e4ffc259c4425ed71eed80'}, - {'Rust-1.70_sysroot-fix-interpreter.patch': '220129db55e022a98d25028da5dcc9f26b252dd995c3ac92f6312dbb1e362cb1'}, + {'Rust-1.70_sysroot-fix-interpreter.patch': 'aa7a7fe784e463b297c640edfe88b8d96acbee0c173251575cef0426baccc57e'}, ] builddependencies = [ diff --git a/easybuild/easyconfigs/r/Rust/Rust-1.86.0-GCCcore-13.3.0.eb b/easybuild/easyconfigs/r/Rust/Rust-1.86.0-GCCcore-13.3.0.eb index de639f209930..f91e015eee02 100644 --- a/easybuild/easyconfigs/r/Rust/Rust-1.86.0-GCCcore-13.3.0.eb +++ b/easybuild/easyconfigs/r/Rust/Rust-1.86.0-GCCcore-13.3.0.eb @@ -12,7 +12,7 @@ sources = ['rustc-%(version)s-src.tar.gz'] patches = ['Rust-1.70_sysroot-fix-interpreter.patch'] checksums = [ {'rustc-1.86.0-src.tar.gz': '022a27286df67900a044d227d9db69d4732ec3d833e4ffc259c4425ed71eed80'}, - {'Rust-1.70_sysroot-fix-interpreter.patch': '220129db55e022a98d25028da5dcc9f26b252dd995c3ac92f6312dbb1e362cb1'}, + {'Rust-1.70_sysroot-fix-interpreter.patch': 'aa7a7fe784e463b297c640edfe88b8d96acbee0c173251575cef0426baccc57e'}, ] builddependencies = [ diff --git a/easybuild/easyconfigs/r/Rust/Rust-1.88.0-GCCcore-14.3.0.eb b/easybuild/easyconfigs/r/Rust/Rust-1.88.0-GCCcore-14.3.0.eb index 2905aee28762..45ff61d17198 100644 --- a/easybuild/easyconfigs/r/Rust/Rust-1.88.0-GCCcore-14.3.0.eb +++ b/easybuild/easyconfigs/r/Rust/Rust-1.88.0-GCCcore-14.3.0.eb @@ -12,7 +12,7 @@ sources = ['rustc-%(version)s-src.tar.gz'] patches = ['Rust-1.70_sysroot-fix-interpreter.patch'] checksums = [ {'rustc-1.88.0-src.tar.gz': '3a97544434848ae3d193d1d6bc83d6f24cb85c261ad95f955fde47ec64cfcfbe'}, - {'Rust-1.70_sysroot-fix-interpreter.patch': '220129db55e022a98d25028da5dcc9f26b252dd995c3ac92f6312dbb1e362cb1'}, + {'Rust-1.70_sysroot-fix-interpreter.patch': 'aa7a7fe784e463b297c640edfe88b8d96acbee0c173251575cef0426baccc57e'}, ] builddependencies = [