aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJakub Jirutka <jakub@jirutka.cz>2016-08-17 21:09:23 +0200
committerJakub Jirutka <jakub@jirutka.cz>2016-08-17 21:11:06 +0200
commit6896ed31feda6db35c99fc916f6ce9835694c98e (patch)
treeb129ac516d3bd562d4a156f172ffe69302fd959b
parent9757f8ec4e09fa8a04e78b1f53a7ccb1a61c0f48 (diff)
downloadaports-6896ed31feda6db35c99fc916f6ce9835694c98e.tar.bz2
aports-6896ed31feda6db35c99fc916f6ce9835694c98e.tar.xz
testing/R: fix -mathlib and remove -mathlib-dev
-rw-r--r--testing/R/APKBUILD24
1 files changed, 4 insertions, 20 deletions
diff --git a/testing/R/APKBUILD b/testing/R/APKBUILD
index a96de063f3..e61f9fe356 100644
--- a/testing/R/APKBUILD
+++ b/testing/R/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
pkgname=R
pkgver=3.3.1
-pkgrel=0
+pkgrel=1
pkgdesc="Language and environment for statistical computing"
url="https://www.r-project.org"
arch="x86_64 x86"
@@ -16,12 +16,7 @@ makedepends="$depends_dev bzip2-dev cairo-dev curl-dev>=7.28 libxmu-dev
openjdk8-jre-base pango-dev perl tiff-dev tk-dev
"
install="$pkgname.post-install"
-subpackages="
- $pkgname-mathlib
- $pkgname-mathlib-dev:mathlib_dev
- $pkgname-dev
- $pkgname-doc
- "
+subpackages="$pkgname-mathlib $pkgname-dev $pkgname-doc"
source="https://cran.r-project.org/src/base/R-${pkgver%%.*}/$pkgname-$pkgver.tar.gz"
builddir="$srcdir/$pkgname-$pkgver"
@@ -97,19 +92,8 @@ package() {
mathlib() {
pkgdesc="$pkgdesc (libRmath)"
- install -D "$pkgdir"/usr/lib/libRmath.so \
- "$subpkgdir"/usr/lib/libRmath.so
-}
-
-mathlib_dev() {
- pkgdesc="$pkgdesc (libRmath, development files)"
- depends="$pkgname-mathlib"
-
- local path
- for path in usr/lib/libRmath.so usr/lib/pkgconfig/libRmath.pc; do
- mkdir -p "$subpkgdir"/$(dirname $path)
- mv "$pkgdir"/$path "$subpkgdir"/$path || return 1
- done
+ mkdir -p "$subpkgdir"/usr/lib
+ mv "$pkgdir"/usr/lib/libRmath.so* "$subpkgdir"/usr/lib
}
md5sums="f50a659738b73036e2f5635adbd229c5 R-3.3.1.tar.gz"