Skip to content

Conversation

@Flamefire
Copy link

This is for easybuilders#20756

I basically merged develop into your branch and resolved the conflicts introduced by the changes merged to develop. While the PR might look scarily big the actual changes compared to develop are now:

--- a/easybuild/easyconfigs/b/Brunsli/Brunsli-0.1-GCCcore-13.2.0.eb
+++ b/easybuild/easyconfigs/b/Brunsli/Brunsli-0.1-GCCcore-13.2.0.eb
@@ -13,7 +13,12 @@ toolchain = {'name': 'GCCcore', 'version': '13.2.0'}
 
 source_urls = ['https://github.com/google/brunsli/archive/']
 sources = ['v%(version)s.tar.gz']
-checksums = ['62762dc740f9fcc9706449c078f12c2a366416486d2882be50a9f201f99ac0bc']
+patches = ['Brunsli-0.1-fix-Brotli-static-library-names.patch']
+checksums = [
+    {'v0.1.tar.gz': '62762dc740f9fcc9706449c078f12c2a366416486d2882be50a9f201f99ac0bc'},
+    {'Brunsli-0.1-fix-Brotli-static-library-names.patch':
+     '0b921fb4839f0b0223c1bf08499e84afd5d428f448664fd1337173f45a815704'},
+]
 
 builddependencies = [
     ('CMake', '3.27.6'),
@@ -27,7 +32,6 @@ dependencies = [
 
 # skip use of third_party directory, since we provide Brotli via a proper dependency
 preconfigopts = "sed -i 's/add_subdirectory(third_party)//g' ../brunsli-%(version)s/CMakeLists.txt && "
-preconfigopts += "sed -i 's/\\(brotli...\\)-static/\\1/g' ../brunsli-%(version)s/brunsli.cmake && "
 
 configopts = '-DCMAKE_CXX_FLAGS="$CXXFLAGS -lbrotlienc -lbrotlidec -lbrotlicommon" '
 
--- /dev/null
+++ b/easybuild/easyconfigs/b/Brunsli/Brunsli-0.1-fix-Brotli-static-library-names.patch
--- /dev/null
+++ b/easybuild/easyconfigs/i/ImageMagick/ImageMagick-7.1.1-33-GCCcore-13.2.0.eb
--- /dev/null
+++ b/easybuild/easyconfigs/r/R-bundle-CRAN/R-bundle-CRAN-2024.06-foss-2023b.eb

I.e. replace the sed in Brunsli by your patch and add the 2 ECs

andped and others added 28 commits March 7, 2025 08:18
…pr_bcl2fastq22200

add missing Doxygen build dependency for bcl2fastq2
Pandoc easyconfigs supporting multiple archs must have multiple checksums
…_pr_cnvpytor131

{lib}[foss/2024a] cnvpytor v1.3.1
Update GitHub actions workflows to use ubuntu-22.04 or ubuntu-24.04
fix LLVM easyconfigs as required by revamped custom easyblock for LLVM + add `lit` and `git` as build dependencies
…MakeMake, ConfigureMake and MakeCp templates
boegel and others added 27 commits March 19, 2025 12:19
…_pr_libavif111

libavif-1.1.1-GCCcore-13.2.0: Changing libyuv from builddependencies to dependencies
…new_pr_Boltz-1041

{bio}[foss/2023a] Boltz-1 v0.4.1
…new_pr_Boltz-1041

{bio}[foss/2023a] Boltz-1 v0.4.1 w/ CUDA 12.1.1
correctly bump version to 5.0.1dev
…iers

remove Python 2.7 and 3.5 from list of classifiers
…pr_FALL3D901

{geo}[foss/2023a] FALL3D v9.0.1
…_new_pr_VTK931

{vis}[foss/2024a] VTK v9.3.1, PyVista v0.44.2
…r_LLVM1406

{compiler,lang}[GCCcore/13.3.0,foss/2024a] LLVM v14.0.6, numba v0.60.0 w/ llvmlite
moravveji pushed a commit that referenced this pull request Jul 3, 2025
Fix wrong/hardcoded locations for tclsh
@moravveji moravveji closed this Jul 3, 2025
@Flamefire Flamefire deleted the R-CRAN branch July 3, 2025 11:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.