commit bc36f267061aca094c11e77ddc059bf1b76da4f0
Author: Jan Palus <[email protected]>
Date: Thu Jan 20 10:01:49 2022 +0100
force use of openjdk8 for build
gwt part does not seem to be compatible with jdk 11 and with explicit
jdk provider it's possible to require only openjdk8-jdk-base which does
not conflict in any way with openjdk11
rstudio.spec | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
---
diff --git a/rstudio.spec b/rstudio.spec
index 9a4a78f..874b0f6 100644
--- a/rstudio.spec
+++ b/rstudio.spec
@@ -1,4 +1,5 @@
%define rstudio_hash 0260f9dc68869536e20a5c26334a81c96ae19cee
+%define use_jdk openjdk8
Summary: IDE for R
Summary(pl.UTF-8): IDE dla R
@@ -54,7 +55,7 @@ BuildRequires: boost-devel >= 1.63.0
BuildRequires: clang-devel >= 3.5.0
BuildRequires: cmake >= 2.8.8
BuildRequires: java-junit
-BuildRequires: jdk
+%buildrequires_jdk
BuildRequires: libstdc++-devel
BuildRequires: libuuid-devel
BuildRequires: openssl-devel
@@ -127,6 +128,7 @@ ln -s /usr/lib64/clang/3.5.0/include
dependencies/common/libclang/builtin-header
%build
install -d build
cd build
+export JAVA_HOME="%{java_home}"
%cmake .. \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_C_FLAGS_RELEASE="${CFLAGS:-%{rpmcflags} -DNDEBUG
-DQT_NO_DEBUG}" \
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rstudio.git/commitdiff/bc36f267061aca094c11e77ddc059bf1b76da4f0
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
