Fix R-devel build on OpenSUSE
More details: https://stat.ethz.ch/pipermail/r-devel/2023-February/082304.html https://stat.ethz.ch/pipermail/r-devel/2023-February/082315.html
This commit is contained in:
parent
dd1a91547f
commit
e57ed87fae
4 changed files with 39 additions and 0 deletions
|
|
@ -92,4 +92,5 @@ 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,4 +102,5 @@ 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,14 @@ fetch_r_source() {
|
||||||
rm /tmp/R-${1}.tar.gz
|
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() - $1 as r version
|
||||||
compile_r() {
|
compile_r() {
|
||||||
cd /tmp/R-${1}
|
cd /tmp/R-${1}
|
||||||
|
|
@ -207,6 +215,7 @@ _version_is_less_than() {
|
||||||
###### RUN R COMPILE PROCEDURE ######
|
###### RUN R COMPILE PROCEDURE ######
|
||||||
set_up_environment
|
set_up_environment
|
||||||
fetch_r_source $R_VERSION
|
fetch_r_source $R_VERSION
|
||||||
|
patch_r $R_VERSION
|
||||||
compile_r $R_VERSION
|
compile_r $R_VERSION
|
||||||
package_r $R_VERSION
|
package_r $R_VERSION
|
||||||
archive_r
|
archive_r
|
||||||
|
|
|
||||||
28
builder/patches/R-devel.patch
Normal file
28
builder/patches/R-devel.patch
Normal file
|
|
@ -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
|
||||||
|
|
||||||
Loading…
Reference in a new issue