summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristoph Fink2023-04-25 11:30:44 +0300
committerChristoph Fink2023-04-25 11:30:44 +0300
commit3f9119dd1d857b39f6a2b0f35176dc3d763bf39c (patch)
treee57f05bedbf485fb344ea625ad7a7e069fa2f027
parent2c93401ecea7c6a536b07f54c95a01efedeffc4a (diff)
downloadaur-3f9119dd1d857b39f6a2b0f35176dc3d763bf39c.tar.gz
upgpkg: r-rjava 1.0.6-3
-rw-r--r--.SRCINFO9
-rw-r--r--PKGBUILD23
-rwxr-xr-xcapture-javareconf-variables.sh16
-rw-r--r--r-rjava.install3
4 files changed, 43 insertions, 8 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e55a5198db1e..630170960df3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,17 @@
pkgbase = r-rjava
pkgdesc = Low-Level R to Java Interface
pkgver = 1.0.6
- pkgrel = 2
+ pkgrel = 3
url = https://cran.r-project.org/package=rJava
+ install = r-rjava.install
arch = i686
arch = x86_64
license = LGPL
depends = r
- depends = java-environment
+ depends = java-environment<20
source = https://cran.r-project.org/src/contrib/rJava_1.0-6.tar.gz
- md5sums = effeeb4517301a2024fab8e10d07d824
+ source = capture-javareconf-variables.sh
+ b2sums = 4c825fabf9f6ec28a135448ae415dbf1249cf24941d048b61f36498adbda0ba7c4618ff4f91d14160a770a657a39416e29b0b38c93db63a69a00fa606f94e3cf
+ b2sums = ff9a162de319674b6d00e22b5244f06e58b395b955b697f78368c7b4f777dc9c073a4f46c74a071ca0943089fd93cd03f4aa9679f654b47259f485d166053196
pkgname = r-rjava
diff --git a/PKGBUILD b/PKGBUILD
index c3e2a8068ac3..67d744f28931 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,19 +7,32 @@ pkgdesc="Low-Level R to Java Interface"
url="https://cran.r-project.org/package=rJava"
license=("LGPL")
pkgver=${_cranver//[:-]/.}
-pkgrel=2
+pkgrel=3
arch=("i686" "x86_64")
-depends=("r" "java-environment")
+depends=("r" "java-environment<20")
optdepends=()
makedepends=()
-source=("https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz")
-md5sums=("effeeb4517301a2024fab8e10d07d824")
+source=(
+ "https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz"
+ "capture-javareconf-variables.sh"
+)
+b2sums=(
+ "4c825fabf9f6ec28a135448ae415dbf1249cf24941d048b61f36498adbda0ba7c4618ff4f91d14160a770a657a39416e29b0b38c93db63a69a00fa606f94e3cf"
+ "ff9a162de319674b6d00e22b5244f06e58b395b955b697f78368c7b4f777dc9c073a4f46c74a071ca0943089fd93cd03f4aa9679f654b47259f485d166053196"
+)
+install="${pkgname}.install"
+
+prepare() {
+ export JAVA_HOME=/usr/lib/jvm/default
+ R CMD javareconf -e "/bin/bash ./capture-javareconf-variables.sh"
+}
build() {
+ source r-javaconf.env
mkdir -p "${srcdir}/build/"
- R CMD INSTALL ${_cranname}_${_cranver}.tar.gz -l "${srcdir}/build/"
+ R CMD INSTALL ${_cranname}_${_cranver}.tar.gz -l "${srcdir}/build/" --no-test-load
}
package() {
diff --git a/capture-javareconf-variables.sh b/capture-javareconf-variables.sh
new file mode 100755
index 000000000000..f2e340b71c84
--- /dev/null
+++ b/capture-javareconf-variables.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+(
+ for VARIABLE in \
+ JAVA_HOME \
+ JAVA \
+ JAVAC \
+ JAVAH \
+ JAR \
+ JAVA_LIBS \
+ JAVA_CPPFLAGS \
+ JAVA_LD_LIBRARY_PATH
+ do
+ echo export ${VARIABLE}=\"${!VARIABLE}\"
+ done
+) >r-javaconf.env
diff --git a/r-rjava.install b/r-rjava.install
new file mode 100644
index 000000000000..20ec1343e0a9
--- /dev/null
+++ b/r-rjava.install
@@ -0,0 +1,3 @@
+post_install() {
+ R CMD javareconf
+}