r-base v3.6.0

.azure-pipelines/run_docker_build.sh

@@ -5,7 +5,7 @@
 # changes to this script, consider a proposal to conda-smithy so that other feedstocks can also
 # benefit from the improvement.
 
-set -xeuo pipefail
+set -xeo pipefail
 
 THISDIR="$( cd "$( dirname "$0" )" >/dev/null && pwd )"
 PROVIDER_DIR="$(basename $THISDIR)"
@@ -28,12 +28,25 @@ fi
 ARTIFACTS="$FEEDSTOCK_ROOT/build_artifacts"
 
 if [ -z "$CONFIG" ]; then
-    echo "Need to set CONFIG env variable"
+    set +x
+    FILES=`ls .ci_support/linux_*`
+    CONFIGS=""
+    for file in $FILES; do
+        CONFIGS="${CONFIGS}'${file:12:-5}' or ";
+    done
+    echo "Need to set CONFIG env variable. Value can be one of ${CONFIGS:0:-4}"
     exit 1
 fi
 
-pip install shyaml
-DOCKER_IMAGE=$(cat "${FEEDSTOCK_ROOT}/.ci_support/${CONFIG}.yaml" | shyaml get-value docker_image.0 condaforge/linux-anvil-comp7 )
+if [ -z "${DOCKER_IMAGE}" ]; then
+    SHYAML_INSTALLED="$(shyaml --version || echo NO)"
+    if [ "${SHYAML_INSTALLED}" == "NO" ]; then
+        echo "WARNING: DOCKER_IMAGE variable not set and shyaml not installed. Falling back to condaforge/linux-anvil-comp7"
+        DOCKER_IMAGE="condaforge/linux-anvil-comp7"
+    else
+        DOCKER_IMAGE="$(cat "${FEEDSTOCK_ROOT}/.ci_support/${CONFIG}.yaml" | shyaml get-value docker_image.0 condaforge/linux-anvil-comp7 )"
+    fi
+fi
 
 mkdir -p "$ARTIFACTS"
 DONE_CANARY="$ARTIFACTS/conda-forge-build-done-${CONFIG}"

README.md

@@ -69,6 +69,7 @@ Current build status
       </details>
     </td>
   </tr>
+![ppc64le disabled](https://img.shields.io/badge/ppc64le-disabled-lightgrey.svg)
 </table>
 
 Current release info

recipe/meta.yaml

@@ -1,36 +1,36 @@
 {% set native = 'm2w64-' if win else '' %}
 {% set posix = 'm2-' if win else '' %}
-{% set version = '3.5.1' %}
+{% set version = "3.6.0" %}
 
 package:
   name: r-base
   version: {{ version }}
 
 source:
   url: https://cran.r-project.org/src/base/R-3/R-{{ version }}.tar.gz
-  sha256: 0463bff5eea0f3d93fa071f79c18d0993878fd4f2e18ae6cf22c1639d11457ed
+  sha256: 36fcac3e452666158e62459c6fc810adc247c7109ed71c5b6c3ad5fc2bf57509
   patches:
-    - 0001-Darwin-Remove-unicode-elipsis-character-from-grDevic.patch
-    - 0002-Fix-trio-config.h-include-depth-issue.patch
-    - 0003-Win32-Do-not-link-static-libgcc.patch
-    - 0004-Win32-Extend-sqrt-NA_real_-hack-to-all-GCC-versions.patch
-    - 0005-Win32-Prevent-conversion-of-R_ARCH-to-abs-Windows-pa.patch
-    - 0006-Darwin-Avoid-setting-DYLD_FALLBACK_LIBRARY_PATH.patch
-    - 0007-Use-AC_SEARCH_LIBS-to-search-for-ncursesw-then-ncurs.patch
-    - 0008-Linux-Do-not-modify-LD_LIBRARY_PATH.patch
-    - 0009-macOS-include-cairo.h-not-cairo-xlib.h.patch
-    - 0010-javareconf-Do-not-fail-on-compile-fail.patch
-    - 0011-Revert-part-of-9b818c6dc00143ff18775a4015a3f43b5196f.patch
-    - 0012-javareconf-macOS-Continue-to-allow-system-Java-lt-9-.patch
-    - 0013-Allow-rpath-in-tcltk-dylib-LC_LOAD_DYLIB-command.patch
-    - 0014-Add-luuid-to-X_PRE_LIBS.patch
-    - 0015-link-Xt-to-uuid.patch
-    - 0016-Mimic-OpenBLAS-when-making-reference-Rblas-and-Rlapa.patch
-    - 0017-Foribly-remove-then-forcibly-mv-in-javareconf.in.patch
+    - patches/0001-Darwin-Remove-unicode-elipsis-character-from-grDevic.patch
+    - patches/0002-Fix-trio-config.h-include-depth-issue.patch
+    - patches/0003-Win32-Do-not-link-static-libgcc.patch
+    - patches/0004-Win32-Extend-sqrt-NA_real_-hack-to-all-GCC-versions.patch
+    - patches/0005-Win32-Prevent-conversion-of-R_ARCH-to-abs-Windows-pa.patch
+    - patches/0006-Darwin-Avoid-setting-DYLD_FALLBACK_LIBRARY_PATH.patch
+    - patches/0007-Use-AC_SEARCH_LIBS-to-search-for-ncursesw-then-ncurs.patch
+    - patches/0008-Linux-Do-not-modify-LD_LIBRARY_PATH.patch
+    - patches/0009-macOS-include-cairo.h-not-cairo-xlib.h.patch
+    - patches/0010-javareconf-Do-not-fail-on-compile-fail.patch
+    - patches/0011-Revert-part-of-9b818c6dc00143ff18775a4015a3f43b5196f.patch
+    - patches/0012-javareconf-macOS-Continue-to-allow-system-Java-lt-9-.patch
+    - patches/0013-Allow-rpath-in-tcltk-dylib-LC_LOAD_DYLIB-command.patch
+    - patches/0014-Add-luuid-to-X_PRE_LIBS.patch
+    - patches/0015-link-Xt-to-uuid.patch
+    - patches/0016-Mimic-OpenBLAS-when-making-reference-Rblas-and-Rlapa.patch
+    - patches/0017-Foribly-remove-then-forcibly-mv-in-javareconf.in.patch
 
 build:
   merge_build_host: True  # [win]
-  number: 1006
+  number: 0
   rpaths:
     - lib/R/lib/
     - lib/

recipe/0009-macOS-include-cairo.h-not-cairo-xlib.h.patch → recipe/patches/0009-macOS-include-cairo.h-not-cairo-xlib.h.patch

@@ -1,29 +1,18 @@
-From 6bd5ce080291576337567fdcc6c2bc1407961ee0 Mon Sep 17 00:00:00 2001
-From: Ray Donnelly <mingw.android@gmail.com>
-Date: Tue, 2 Jan 2018 15:53:10 +0000
-Subject: [PATCH 09/17] macOS: include <cairo.h> not <cairo/xlib.h>
-
----
- configure   | 11 +++++------
- m4/cairo.m4 | 11 +++++------
- 2 files changed, 10 insertions(+), 12 deletions(-)
-
-diff --git a/configure b/configure
-index 0d441763bb..7ab3b9dafd 100755
---- a/configure
-+++ b/configure
-@@ -37870,8 +37870,8 @@ $as_echo "$r_cv_has_pangocairo" >&6; }
+diff -Naur R-3.6.0.orig/configure R-3.6.0/configure
+--- R-3.6.0.orig/configure	2019-04-18 19:16:03.000000000 -0300
++++ R-3.6.0/configure	2019-05-15 17:08:45.893564488 -0300
+@@ -40686,8 +40686,8 @@
         modlist="${modlist} cairo-svg"
         r_cairo_svg=yes
      fi
--      if "${PKGCONF}" --exists cairo-xlib; then
+-      if "${PKG_CONFIG}" --exists cairo-xlib; then
 -         xmodlist="${modlist} cairo-xlib"
-+      if "${PKGCONF}" --exists cairo; then
++      if "${PKG_CONFIG}" --exists cairo; then
 +         xmodlist="${modlist} cairo"
        else
           xmodlist="${modlist}"
        fi
-@@ -37893,7 +37893,7 @@ else
+@@ -40709,7 +40709,7 @@
 
  #include <pango/pango.h>
  #include <pango/pangocairo.h>
@@ -32,41 +21,40 @@ index 0d441763bb..7ab3b9dafd 100755
  #if CAIRO_VERSION  < 10200
  #error cairo version >= 1.2 required
  #endif
-@@ -37957,8 +37957,8 @@ $as_echo "$r_cv_has_cairo" >&6; }
+@@ -40773,8 +40773,8 @@
           modlist="${modlist} cairo-svg"
           r_cairo_svg=yes
        fi
--      if "${PKGCONF}" --exists cairo-xlib; then
+-      if "${PKG_CONFIG}" --exists cairo-xlib; then
 -         xmodlist="${modlist} cairo-xlib"
-+      if "${PKGCONF}" --exists cairo; then
++      if "${PKG_CONFIG}" --exists cairo; then
 +         xmodlist="${modlist} cairo"
        else
           xmodlist="${modlist}"
        fi
-@@ -37989,7 +37989,6 @@ else
+@@ -40805,7 +40805,6 @@
  /* end confdefs.h.  */
 
  #include <cairo.h>
 -#include <cairo-xlib.h>
  #if CAIRO_VERSION  < 10200
  #error cairo version >= 1.2 required
  #endif
-diff --git a/m4/cairo.m4 b/m4/cairo.m4
-index 4e7df87365..893321dd6c 100644
---- a/m4/cairo.m4
-+++ b/m4/cairo.m4
-@@ -52,8 +52,8 @@ else
+diff -Naur R-3.6.0.orig/m4/cairo.m4 R-3.6.0/m4/cairo.m4
+--- R-3.6.0.orig/m4/cairo.m4	2019-03-28 20:02:40.000000000 -0300
++++ R-3.6.0/m4/cairo.m4	2019-05-15 17:08:33.009310855 -0300
+@@ -52,8 +52,8 @@
         modlist="${modlist} cairo-svg"
         r_cairo_svg=yes
      fi
--      if "${PKGCONF}" --exists cairo-xlib; then
+-      if "${PKG_CONFIG}" --exists cairo-xlib; then
 -         xmodlist="${modlist} cairo-xlib"
-+      if "${PKGCONF}" --exists cairo; then
++      if "${PKG_CONFIG}" --exists cairo; then
 +         xmodlist="${modlist} cairo"
        else
           xmodlist="${modlist}"
        fi
-@@ -70,7 +70,7 @@ else
+@@ -70,7 +70,7 @@
                      [AC_LINK_IFELSE([AC_LANG_SOURCE([[
  #include <pango/pango.h>
  #include <pango/pangocairo.h>
@@ -75,25 +63,22 @@ index 4e7df87365..893321dd6c 100644
  #if CAIRO_VERSION  < 10200
  #error cairo version >= 1.2 required
  #endif
-@@ -116,8 +116,8 @@ int main(void) {
+@@ -116,8 +116,8 @@
           modlist="${modlist} cairo-svg"
           r_cairo_svg=yes
        fi
--      if "${PKGCONF}" --exists cairo-xlib; then
+-      if "${PKG_CONFIG}" --exists cairo-xlib; then
 -         xmodlist="${modlist} cairo-xlib"
-+      if "${PKGCONF}" --exists cairo; then
++      if "${PKG_CONFIG}" --exists cairo; then
 +         xmodlist="${modlist} cairo"
        else
           xmodlist="${modlist}"
        fi
-@@ -143,7 +143,6 @@ int main(void) {
+@@ -143,7 +143,6 @@
  		     [r_cv_cairo_works], 
                       [AC_LINK_IFELSE([AC_LANG_SOURCE([[
  #include <cairo.h>
 -#include <cairo-xlib.h>
  #if CAIRO_VERSION  < 10200
  #error cairo version >= 1.2 required
  #endif
--- 
-2.18.0
-