Remove R-devel patches for openSUSE 15.3/15.4
Now fixed upstream in R-devel / R 4.3.0.
This commit is contained in:
parent
77f2ce4e01
commit
09e29e69fa
5 changed files with 10 additions and 30 deletions
|
|
@ -92,5 +92,4 @@ ENV CONFIGURE_OPTIONS="\
|
||||||
|
|
||||||
COPY package.opensuse-153 /package.sh
|
COPY package.opensuse-153 /package.sh
|
||||||
COPY build.sh .
|
COPY build.sh .
|
||||||
COPY patches /patches
|
|
||||||
ENTRYPOINT ./build.sh
|
ENTRYPOINT ./build.sh
|
||||||
|
|
|
||||||
|
|
@ -102,5 +102,4 @@ ENV JAVA_HOME=/usr/lib64/jvm/jre-11-openjdk
|
||||||
|
|
||||||
COPY package.opensuse-154 /package.sh
|
COPY package.opensuse-154 /package.sh
|
||||||
COPY build.sh .
|
COPY build.sh .
|
||||||
COPY patches /patches
|
|
||||||
ENTRYPOINT ./build.sh
|
ENTRYPOINT ./build.sh
|
||||||
|
|
|
||||||
|
|
@ -64,6 +64,7 @@ fetch_r_source() {
|
||||||
rm /tmp/R-${1}.tar.gz
|
rm /tmp/R-${1}.tar.gz
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# Apply a patch for this R version if present. Typically for R-devel.
|
||||||
patch_r() {
|
patch_r() {
|
||||||
cd /tmp/R-${1}
|
cd /tmp/R-${1}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,28 +0,0 @@
|
||||||
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
|
|
||||||
|
|
||||||
9
builder/patches/README.md
Normal file
9
builder/patches/README.md
Normal file
|
|
@ -0,0 +1,9 @@
|
||||||
|
# Patches
|
||||||
|
|
||||||
|
Patches can be applied for specific R versions and platforms. To add a patch, create a patch file
|
||||||
|
at `patches/R-${R_VERSION}.patch` (such as `patches/R-devel.patch`), and add the following line
|
||||||
|
to the platform Dockerfile:
|
||||||
|
|
||||||
|
```dockerfile
|
||||||
|
COPY patches /patches
|
||||||
|
```
|
||||||
Loading…
Reference in a new issue