diff options
author | Alexander Phinikarides | 2016-10-30 23:37:46 +0200 |
---|---|---|
committer | Alexander Phinikarides | 2016-10-30 23:37:46 +0200 |
commit | c1180908d2f86250402981df0fb7b9c24a3a1c1f (patch) | |
tree | 5449b0ee76ac41c1db9cfd04474c6edb8365e62d | |
parent | e17787423454f91a04284b541310bb50638822ed (diff) | |
download | aur-c1180908d2f86250402981df0fb7b9c24a3a1c1f.tar.gz |
updated to 3.3.1 with bundled MKL libs
-rw-r--r-- | .SRCINFO | 73 | ||||
-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | PKGBUILD | 189 | ||||
-rw-r--r-- | R.conf | 2 | ||||
-rw-r--r-- | Rprofile_site.patch | 77 | ||||
-rw-r--r-- | mro.png | bin | 0 -> 70593 bytes |
6 files changed, 161 insertions, 181 deletions
@@ -1,62 +1,59 @@ # Generated by mksrcinfo v8 -# Thu May 26 10:07:40 UTC 2016 +# Sun Oct 30 21:07:53 UTC 2016 pkgbase = microsoft-r-open pkgdesc = Language and environment for statistical computing and graphics, modified version by Microsoft - pkgver = 3.2.5 + pkgver = 3.3.1 pkgrel = 1 url = https://mran.revolutionanalytics.com/open/ + install = microsoft-r-open.install arch = x86_64 license = GPL makedepends = java-environment makedepends = gcc-fortran makedepends = tk - options = !makeflags - options = !emptydirs - source = https://github.com/RevolutionAnalytics/RRO/archive/MRO-3.2.5.tar.gz - source = Rprofile_site.patch - source = mro.desktop - md5sums = 0572a3384f9bc724118cb9b7c363f885 - md5sums = 3e35bccbf4b9df66059400c4c42d21ef - md5sums = 70e8f9d0b1eebeb1f0b45f4568bc0701 - sha512sums = b309dba4820210728cc61520be1e48739b82350e5ae3897578e95a21742ed26ea83c4afd1c727c39417e419ef037a7d52ef554587723201b5ce349ec848d4f89 - sha512sums = f6d0dc696a1c8fd6f7714c77bf286663ca34d5b1ab0226fb26d9574ed3bf6a38a59743fb2165a9235f91d31cba3f97a7faaca6e5201e60dd9d554fddb0700168 - sha512sums = 2b0221bd1e0fdd399284333e6f2020bb9ad11395ad39dd2fca688b7ebc68fbbc60de59a757e1898be8bcd9e2926afccc121043f38445e7693f177c3076f92b61 - -pkgname = microsoft-r-open - install = microsoft-r-open.install - depends = microsoft-r-open-blas + makedepends = rpmextract + depends = bzip2 depends = curl - depends = libpng + depends = desktop-file-utils + depends = gcc-libs depends = libjpeg + depends = libpng + depends = libpng12 depends = libtiff - depends = pango depends = libxmu - depends = bzip2 + depends = libxt depends = ncurses + depends = pango depends = pcre - depends = readline - depends = zlib depends = perl - depends = gcc-libs - depends = libxt + depends = readline + depends = unzip depends = xz - depends = desktop-file-utils depends = zip - depends = unzip + depends = zlib optdepends = tk: tcl/tk interface optdepends = texlive-bin: latex sty files - optdepends = revomath: high performance BLAS/Lapack library - optdepends = microsoft-r-open-blas-systemblas: use system BLAS&Lapack libraries - provides = r=3.2.5 + provides = r=3.3.1 conflicts = r - backup = usr/lib/MRO-3.2.5/R-3.2.5/lib64/R/etc/Makeconf - backup = usr/lib/MRO-3.2.5/R-3.2.5/lib64/R/etc/Renviron - backup = usr/lib/MRO-3.2.5/R-3.2.5/lib64/R/etc/ldpaths - backup = usr/lib/MRO-3.2.5/R-3.2.5/lib64/R/etc/repositories - backup = usr/lib/MRO-3.2.5/R-3.2.5/lib64/R/etc/javaconf - backup = usr/lib/MRO-3.2.5/R-3.2.5/lib64/R/etc/Rprofile.site + options = !makeflags + options = !emptydirs + backup = etc/R/Makeconf + backup = etc/R/Renviron + backup = etc/R/ldpaths + backup = etc/R/repositories + backup = etc/R/javaconf + source = https://mran.revolutionanalytics.com/install/mro/3.3.1/microsoft-r-open-3.3.1.tar.gz + source = mro.desktop + source = mro.png + source = R.conf + md5sums = e0c50107acb08ec2aa7fee0d8076c4bd + md5sums = 70e8f9d0b1eebeb1f0b45f4568bc0701 + md5sums = 8e0c51650b8a63f110fa7b09e699e9c4 + md5sums = 6c381ed007c2bfc97ab42f05bf50b57d + sha512sums = ba163cc29fa7c828f696f25bdec5c18dc235e58b4da0804c449510e1e7534245ef51e2ed0e5d880efdbdf4660eff2ee37cd95badbd31a128a623f109b30deeb4 + sha512sums = 2b0221bd1e0fdd399284333e6f2020bb9ad11395ad39dd2fca688b7ebc68fbbc60de59a757e1898be8bcd9e2926afccc121043f38445e7693f177c3076f92b61 + sha512sums = 1491b01d3d14b86d26c383e00e2305858a52ddd498158c9f7f6b33026ee01f246408b1676cffea73f7783c8c4cf546285705c43c0286adbd75ad77706918b5fe + sha512sums = 41e6779500748eee0fa785a20bcaf7323d4aa67000386243fdfe1681152023fb4a5dd4e1f078eeae24db18c223f86fa57afbbad391da226988b0a14eec75c986 -pkgname = microsoft-r-open-blas - pkgdesc = Unoptimized math library for Revolution R Open - depends = microsoft-r-open +pkgname = microsoft-r-open diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000000..335ec9573de5 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +*.tar.gz @@ -1,85 +1,142 @@ -# Maintainer: jdarch <jda -dot- cloud -plus- archlinux -at- gmail -dot- com> +# Maintainer: Alexander Phinikarides (alexisph -at- gmail -dot- com) -pkgbase=microsoft-r-open -pkgname=('microsoft-r-open' 'microsoft-r-open-blas') -pkgver=3.2.5 -_mrandate=2016-05-01 +pkgname=microsoft-r-open +pkgver=3.3.1 pkgrel=1 +_majorver=3.3 +_mrandate=2016-07-01 pkgdesc="Language and environment for statistical computing and graphics, modified version by Microsoft" arch=('x86_64') license=('GPL') url='https://mran.revolutionanalytics.com/open/' -makedepends=('java-environment' 'gcc-fortran' 'tk') +provides=("r=${pkgver}") +conflicts=('r') +depends=('bzip2' + 'curl' + 'desktop-file-utils' + 'gcc-libs' + 'libjpeg' + 'libpng' + 'libpng12' + 'libtiff' + 'libxmu' + 'libxt' + 'ncurses' + 'pango' + 'pcre' + 'perl' + 'readline' + 'unzip' + 'xz' + 'zip' + 'zlib') +makedepends=('java-environment' + 'gcc-fortran' + 'tk' + 'rpmextract') +optdepends=('tk: tcl/tk interface' + 'texlive-bin: latex sty files') +backup=('etc/R/Makeconf' + 'etc/R/Renviron' + 'etc/R/ldpaths' + 'etc/R/repositories' + 'etc/R/javaconf') options=('!makeflags' '!emptydirs') -source=("https://github.com/RevolutionAnalytics/RRO/archive/MRO-${pkgver}.tar.gz" - "Rprofile_site.patch" - "mro.desktop") -md5sums=('0572a3384f9bc724118cb9b7c363f885' - '3e35bccbf4b9df66059400c4c42d21ef' - '70e8f9d0b1eebeb1f0b45f4568bc0701') -sha512sums=('b309dba4820210728cc61520be1e48739b82350e5ae3897578e95a21742ed26ea83c4afd1c727c39417e419ef037a7d52ef554587723201b5ce349ec848d4f89' - 'f6d0dc696a1c8fd6f7714c77bf286663ca34d5b1ab0226fb26d9574ed3bf6a38a59743fb2165a9235f91d31cba3f97a7faaca6e5201e60dd9d554fddb0700168' - '2b0221bd1e0fdd399284333e6f2020bb9ad11395ad39dd2fca688b7ebc68fbbc60de59a757e1898be8bcd9e2926afccc121043f38445e7693f177c3076f92b61') +install=microsoft-r-open.install +source=("https://mran.revolutionanalytics.com/install/mro/${pkgver}/microsoft-r-open-${pkgver}.tar.gz" + 'mro.desktop' + 'mro.png' + 'R.conf') +md5sums=('e0c50107acb08ec2aa7fee0d8076c4bd' + '70e8f9d0b1eebeb1f0b45f4568bc0701' + '8e0c51650b8a63f110fa7b09e699e9c4' + '6c381ed007c2bfc97ab42f05bf50b57d') +sha512sums=('ba163cc29fa7c828f696f25bdec5c18dc235e58b4da0804c449510e1e7534245ef51e2ed0e5d880efdbdf4660eff2ee37cd95badbd31a128a623f109b30deeb4' + '2b0221bd1e0fdd399284333e6f2020bb9ad11395ad39dd2fca688b7ebc68fbbc60de59a757e1898be8bcd9e2926afccc121043f38445e7693f177c3076f92b61' + '1491b01d3d14b86d26c383e00e2305858a52ddd498158c9f7f6b33026ee01f246408b1676cffea73f7783c8c4cf546285705c43c0286adbd75ad77706918b5fe' + '41e6779500748eee0fa785a20bcaf7323d4aa67000386243fdfe1681152023fb4a5dd4e1f078eeae24db18c223f86fa57afbbad391da226988b0a14eec75c986') prepare() { -# Patch Rprofile.site for Arch Linux - patch "RRO-MRO-${pkgver}/RRO-src/files/common/Rprofile.site" "Rprofile_site.patch" + cd ${pkgname} + # extract rpms + rpmextract.sh "rpm/${pkgname}-mro-${_majorver}.rpm" + rpmextract.sh "rpm/${pkgname}-mkl-${_majorver}.rpm" + rpmextract.sh "rpm/${pkgname}-foreachiterators-${_majorver}.rpm" + mv usr/lib64 usr/lib } -build() { -# Build R - cd "RRO-MRO-${pkgver}/R-src" - ./configure --prefix="/usr/lib/MRO-${pkgver}/R-${pkgver}" \ - --enable-R-shlib \ - --with-tcltk \ - --with-cairo \ - --with-libpng \ - --with-libtiff \ - --with-x=yes \ - --with-lapack \ - --enable-BLAS-shlib \ - LIBR="-lpthread" \ - --enable-memory-profiling - make +package() { + cd ${pkgname} + cp -r usr "${pkgdir}" -# Add default Revolution R Open packages - echo "install.packages(\"checkpoint\", \"${srcdir}/RRO-MRO-${pkgver}/R-src/library\", repos=\"http://mran.revolutionanalytics.com/snapshot/${_mrandate}\")" | bin/R -q --vanilla -} + # Install MKL libs + install -d "${pkgdir}/usr/lib/microsoft-r/${_majorver}/lib64/R/backup/lib" + mv ${pkgdir}/usr/lib/microsoft-r/${_majorver}/lib64/R/lib/*.so "${pkgdir}/usr/lib/microsoft-r/${_majorver}/lib64/R/backup/lib" + install -Dm644 "${pkgdir}/usr/lib/microsoft-r/${_majorver}/lib64/R/backup/lib/libR.so" "${pkgdir}/usr/lib/microsoft-r/${_majorver}/lib64/R/lib/libR.so" + install -Dm644 ${pkgdir}/usr/lib/microsoft-r/${_majorver}/stage/mkl_install_stage/*.so "${pkgdir}/usr/lib/microsoft-r/${_majorver}/lib64/R/lib" + rm -rf ${pkgdir}/usr/lib/microsoft-r/${_majorver}/stage -package_microsoft-r-open() { - install=microsoft-r-open.install - provides=("r=${pkgver}") - conflicts=('r') - backup=("usr/lib/MRO-${pkgver}/R-${pkgver}/lib64/R/etc/Makeconf" "usr/lib/MRO-${pkgver}/R-${pkgver}/lib64/R/etc/Renviron" "usr/lib/MRO-${pkgver}/R-${pkgver}/lib64/R/etc/ldpaths" "usr/lib/MRO-${pkgver}/R-${pkgver}/lib64/R/etc/repositories" "usr/lib/MRO-${pkgver}/R-${pkgver}/lib64/R/etc/javaconf" "usr/lib/MRO-${pkgver}/R-${pkgver}/lib64/R/etc/Rprofile.site") - depends=('microsoft-r-open-blas' 'curl' 'libpng' 'libjpeg' 'libtiff' 'pango' 'libxmu' 'bzip2' 'ncurses' 'pcre' 'readline' 'zlib' 'perl' 'gcc-libs' 'libxt' 'xz' 'desktop-file-utils' 'zip' 'unzip') - optdepends=('tk: tcl/tk interface' 'texlive-bin: latex sty files' 'revomath: high performance BLAS/Lapack library' 'microsoft-r-open-blas-systemblas: use system BLAS&Lapack libraries') + # Link R binaries to system path + install -d "${pkgdir}/usr/bin" + cd "${pkgdir}/usr/bin" + ln -s ../lib/microsoft-r/${_majorver}/lib64/R/bin/R + ln -s ../lib/microsoft-r/${_majorver}/lib64/R/bin/Rscript + # Install freedesktop.org compatibility + install -Dm644 "${srcdir}/mro.desktop" "${pkgdir}/usr/share/applications/mro.desktop" + install -Dm644 "${srcdir}/mro.png" "${pkgdir}/usr/share/pixmaps/mro.png" - cd "RRO-MRO-${pkgver}/R-src" - make DESTDIR="${pkgdir}" install - cp ../RRO-src/files/common/Rprofile.site "${pkgdir}/usr/lib/MRO-${pkgver}/R-${pkgver}/lib64/R/etc" - cp ../RRO-src/files/common/ThirdPartyNotices.pdf "${pkgdir}/usr/lib/MRO-${pkgver}" - cp ../README.txt "${pkgdir}/usr/lib/MRO-${pkgver}" - cp ../COPYING "${pkgdir}/usr/lib/MRO-${pkgver}" - rm "${pkgdir}/usr/lib/MRO-${pkgver}/R-${pkgver}/bin/R" - rm "${pkgdir}/usr/lib/MRO-${pkgver}/R-${pkgver}/bin/Rscript" - rm "${pkgdir}/usr/lib/MRO-${pkgver}/R-${pkgver}/lib64/R/lib/libRblas.so" - rm "${pkgdir}/usr/lib/MRO-${pkgver}/R-${pkgver}/lib64/R/lib/libRlapack.so" + # Create etc config directory + install -d "${pkgdir}/etc/R" + cd "${pkgdir}/usr/lib/microsoft-r/${_majorver}/lib64/R/etc" + for i in *; do + mv -f ${i} "${pkgdir}/etc/R" + ln -s /etc/R/${i} ${i} + done + # fix a typo + sed -i "s|IMPLEMENTATIN|IMPLEMENTATION|g" "${pkgdir}/etc/R/Makeconf" - mkdir -p "${pkgdir}/usr/bin" - ln -s "/usr/lib/MRO-${pkgver}/R-${pkgver}/lib64/R/bin/R" "${pkgdir}/usr/lib/MRO-${pkgver}/R-${pkgver}/bin/R" - ln -s "/usr/lib/MRO-${pkgver}/R-${pkgver}/lib64/R/bin/R" "${pkgdir}/usr/bin/R" - ln -s "/usr/lib/MRO-${pkgver}/R-${pkgver}/lib64/R/bin/Rscript" "${pkgdir}/usr/lib/MRO-${pkgver}/R-${pkgver}/bin/Rscript" - ln -s "/usr/lib/MRO-${pkgver}/R-${pkgver}/lib64/R/bin/Rscript" "${pkgdir}/usr/bin/Rscript" + # Ensure other applications can access the shared libs + install -Dm644 "${srcdir}/R.conf" "${pkgdir}/etc/ld.so.conf.d/R.conf" + sed -i "s/VERSION/${_majorver}/" "${pkgdir}/etc/ld.so.conf.d/R.conf" - install -Dm644 "${srcdir}/mro.desktop" "${pkgdir}/usr/share/applications/mro.desktop" - install -Dm644 "${srcdir}/RRO-MRO-${pkgver}/RRO-src/OSX/project/clarkbg.png" "${pkgdir}/usr/share/pixmaps/mro.png" -} + # Install pkgconfig file + cd "${pkgdir}/usr/lib/microsoft-r/${_majorver}/lib64" + sed -i "s|rhome=.*$|rhome=/usr/lib/microsoft-r/${_majorver}/lib64/R|" pkgconfig/libR.pc + sed -i "s|rincludedir=.*$|rincludedir=/usr/include/R|" pkgconfig/libR.pc + sed -i "s|-L/builddir/vendor/build/lib||" pkgconfig/libR.pc + install -Dm644 pkgconfig/libR.pc "${pkgdir}/usr/lib/pkgconfig/libR.pc" + + # Install header files + install -d "${pkgdir}/usr/include/R" + cp -r ${pkgdir}/usr/lib/microsoft-r/${_majorver}/lib64/R/include/* "${pkgdir}/usr/include/R/" -package_microsoft-r-open-blas() { - depends=('microsoft-r-open') - pkgdesc="Unoptimized math library for Revolution R Open" - mkdir -p "${pkgdir}/usr/lib/MRO-${pkgver}/R-${pkgver}/lib64/R/lib" - cp "${srcdir}/RRO-MRO-${pkgver}/R-src/lib/libRblas.so" "${pkgdir}/usr/lib/MRO-${pkgver}/R-${pkgver}/lib64/R/lib/libRblas.so" - cp "${srcdir}/RRO-MRO-${pkgver}/R-src/lib/libRlapack.so" "${pkgdir}/usr/lib/MRO-${pkgver}/R-${pkgver}/lib64/R/lib/libRlapack.so" + # Install man pages + cd "${pkgdir}/usr/lib/microsoft-r/${_majorver}/share/man/man1" + gzip -9 * + install -Dm644 R.1.gz "${pkgdir}/usr/share/man/man1/R.1.gz" + install -Dm644 Rscript.1.gz "${pkgdir}/usr/share/man/man1/Rscript.1.gz" + gzip -d * + + # Install shared files + install -d "${pkgdir}/usr/share/R" + cp -r "${pkgdir}/usr/lib/microsoft-r/${_majorver}/lib64/R/share/dictionaries" "${pkgdir}/usr/share/R/" + cp -r "${pkgdir}/usr/lib/microsoft-r/${_majorver}/lib64/R/share/encodings" "${pkgdir}/usr/share/R/" + cp -r "${pkgdir}/usr/lib/microsoft-r/${_majorver}/lib64/R/share/java" "${pkgdir}/usr/share/R/" + cp -r "${pkgdir}/usr/lib/microsoft-r/${_majorver}/lib64/R/share/licenses" "${pkgdir}/usr/share/R/" + cp -r "${pkgdir}/usr/lib/microsoft-r/${_majorver}/lib64/R/share/make" "${pkgdir}/usr/share/R/" + cp -r "${pkgdir}/usr/lib/microsoft-r/${_majorver}/lib64/R/share/R" "${pkgdir}/usr/share/R/" + cp -r "${pkgdir}/usr/lib/microsoft-r/${_majorver}/lib64/R/share/Rd" "${pkgdir}/usr/share/R/" + cp -r "${pkgdir}/usr/lib/microsoft-r/${_majorver}/lib64/R/share/sh" "${pkgdir}/usr/share/R/" + # LaTeX templates + cp -r "${pkgdir}/usr/lib/microsoft-r/${_majorver}/lib64/R/share/texmf" "${pkgdir}/usr/share/" + + # Install docs + install -d "${pkgdir}/usr/share/doc/R" + cp -r ${pkgdir}/usr/lib/microsoft-r/${_majorver}/lib64/R/doc/* "${pkgdir}/usr/share/doc/R/" + + # Copy EULAs + install -d "${pkgdir}/opt/${pkgname}/doc" + install -m644 ${srcdir}/${pkgname}/*.txt "${pkgdir}/opt/${pkgname}/doc" } + diff --git a/R.conf b/R.conf new file mode 100644 index 000000000000..63145a2ac4c6 --- /dev/null +++ b/R.conf @@ -0,0 +1,2 @@ +/usr/lib/microsoft-r/VERSION/lib64/R/lib + diff --git a/Rprofile_site.patch b/Rprofile_site.patch deleted file mode 100644 index f40a5310db33..000000000000 --- a/Rprofile_site.patch +++ /dev/null @@ -1,77 +0,0 @@ ---- Rprofile.site 2016-05-10 23:05:06.000000000 +0200 -+++ Rprofile.site.new 2016-05-26 11:47:54.542644822 +0200 -@@ -1,25 +1,15 @@ --Revo.version <- structure(list(major = "3", minor = "2.5", "BuildID" = :::BUILDID:::), class = "simple.list") -+Revo.version <- structure(list(major = "3", minor = "2.5", "BuildID" = 'Arch Linux'), class = "simple.list") - repos.date <- "2016-05-01" - --if (identical(.Platform$OS.type, "windows")) { -- options(download.file.method = "wininet") -+if (capabilities("libcurl")) { -+ options(download.file.method = "libcurl") - } else { -- if (capabilities("libcurl")) { -- options(download.file.method = "libcurl") -- } else { -- dmethAvail <- Sys.which(c("curl", "wget")) -- if (any(dmethAvail != "")) { -- options(download.file.method = names(dmethAvail[which(dmethAvail != "")[1]])) -- } -- } -+ options(download.file.method = "curl") - } - - options(repos = c(CRAN = paste("https://mran.microsoft.com/snapshot/",repos.date,sep=""))) - - --if (.Platform$OS.type == "windows" ) { -- options(help_type="html") --} - quiet <- any(match(c("-q", "--silent", "--quiet", "--slave"), commandArgs()), na.rm=TRUE) - if (!quiet){ - cat( paste("Microsoft R Open ",Revo.version$major,".",Revo.version$minor,"\n",sep="")) -@@ -27,11 +17,8 @@ - cat("The enhanced R distribution from Microsoft\n",sep="") - cat("Visit https://mran.microsoft.com/ for information\n",sep="") - cat("about additional features.\n\n",sep="") -- - } - -- -- - load_if_installed <- function(package) { - if (!identical(system.file(package="RevoUtilsMath"), "")) { - do.call('library', list(package)) -@@ -41,20 +28,6 @@ - } - } - --if(Sys.info()["sysname"] == "Darwin"){ -- local({ -- options(download.file.method = "libcurl") -- hw.ncpu <- try(system('sysctl hw.physicalcpu', intern = TRUE)) -- if (!inherits(hw.ncpu, "try-error")){ -- ncores <- sub("hw.physicalcpu: ", "", hw.ncpu) -- msg <- "Multithreaded BLAS/LAPACK libraries detected. Using %s cores for math algorithms." -- if (!quiet){ -- message(sprintf(msg, ncores)) -- } -- } -- invisible(NULL) -- }) --} else { - if(load_if_installed("RevoUtilsMath")){ - local({ - ncores <- RevoUtilsMath::getMKLthreads() -@@ -66,10 +39,9 @@ - }) - } else { - MROversion <- paste(Revo.version$major, Revo.version$minor, sep=".") -- msg <- "No performance acceleration libraries were detected. To take advantage of \nthe available processing power, also install MKL for R Open %s. Visit \nhttp://go.microsoft.com/fwlink/?LinkID=698301 for more details." -+ msg <- "No performance acceleration libraries were detected. To take advantage of \nthe available processing power, also install MKL for R Open %s. Visit \nhttp://go.microsoft.com/fwlink/?LinkID=698301 and/or https://aur.archlinux.org/packages/revomath/ for more details." - if (!quiet){ - message(sprintf(msg, MROversion)) - } - invisible(NULL) - } --} diff --git a/mro.png b/mro.png Binary files differnew file mode 100644 index 000000000000..fba5412f1e9a --- /dev/null +++ b/mro.png |