diff --git a/builder/Dockerfile.opensuse-153 b/builder/Dockerfile.opensuse-153 index fbea3b1..6bb332c 100644 --- a/builder/Dockerfile.opensuse-153 +++ b/builder/Dockerfile.opensuse-153 @@ -92,4 +92,5 @@ ENV CONFIGURE_OPTIONS="\ COPY package.opensuse-153 /package.sh COPY build.sh . +COPY patches /patches ENTRYPOINT ./build.sh diff --git a/builder/Dockerfile.opensuse-154 b/builder/Dockerfile.opensuse-154 index f3134fa..9b6af15 100644 --- a/builder/Dockerfile.opensuse-154 +++ b/builder/Dockerfile.opensuse-154 @@ -102,4 +102,5 @@ ENV JAVA_HOME=/usr/lib64/jvm/jre-11-openjdk COPY package.opensuse-154 /package.sh COPY build.sh . +COPY patches /patches ENTRYPOINT ./build.sh diff --git a/builder/build.sh b/builder/build.sh index eee64ab..7f49b3e 100755 --- a/builder/build.sh +++ b/builder/build.sh @@ -64,6 +64,14 @@ fetch_r_source() { rm /tmp/R-${1}.tar.gz } +patch_r() { + cd /tmp/R-${1} + + if [ -f "/patches/R-${1}.patch" ]; then + patch -p1 < "/patches/R-${1}.patch" + fi +} + # compile_r() - $1 as r version compile_r() { cd /tmp/R-${1} @@ -207,6 +215,7 @@ _version_is_less_than() { ###### RUN R COMPILE PROCEDURE ###### set_up_environment fetch_r_source $R_VERSION +patch_r $R_VERSION compile_r $R_VERSION package_r $R_VERSION archive_r diff --git a/builder/patches/R-devel.patch b/builder/patches/R-devel.patch new file mode 100644 index 0000000..4495917 --- /dev/null +++ b/builder/patches/R-devel.patch @@ -0,0 +1,28 @@ +diff --git a/src/extra/blas/Makefile.in b/src/extra/blas/Makefile.in +index 3661416..c9b53e2 100644 +--- a/src/extra/blas/Makefile.in ++++ b/src/extra/blas/Makefile.in +@@ -17,7 +17,7 @@ include $(top_builddir)/Makeconf + + ALL_CFLAGS = $(ALL_CFLAGS_LO) + ALL_FFLAGS = $(ALL_FFLAGS_LO) +-ALL_FCLAGS = $(ALL_FFLAGS_LO) ++ALL_FCFLAGS = $(ALL_FFLAGS_LO) + + SOURCES = blas00.c blas.f cmplxblas.f blas2.f90 cmplxblas2.f90 + +diff --git a/src/modules/lapack/Makefile.in b/src/modules/lapack/Makefile.in +index 8e593ea..e35c956 100644 +--- a/src/modules/lapack/Makefile.in ++++ b/src/modules/lapack/Makefile.in +@@ -15,6 +15,10 @@ include $(top_builddir)/Makeconf + .f90.o: + $(FC) $(ALL_FCFLAGS) -c @FCFLAGS_f90@ $< -o $@ + ++ALL_CFLAGS = $(ALL_CFLAGS_LO) ++ALL_FFLAGS = $(ALL_FFLAGS_LO) ++ALL_FCFLAGS = $(ALL_FFLAGS_LO) ++ + SOURCES_C = Lapack.c @USE_VECLIB_G95FIX_TRUE@ vecLibg95c.c + SOURCES_F = @USE_VECLIB_G95FIX_TRUE@ vecLibg95f.f +