r-base: Remove --disable-R-profiling and --enable-memory-profiling

Fixes: https://github.com/Anaconda-Platform/support/issues/54
conda-archive · Sep 6, 2016 · dfe2d55 · dfe2d55
1 parent e8b4bc1
commit dfe2d55
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/r-base/build.sh b/r-base/build.sh
@@ -41,9 +41,8 @@ Linux() {
                 --enable-shared                 \
                 --enable-R-shlib                \
                 --enable-BLAS-shlib             \
-                --disable-R-profiling           \
                 --disable-prebuilt-html         \
-                --disable-memory-profiling      \
+                --enable-memory-profiling       \
                 --with-tk-config=${TK_CONFIG}   \
                 --with-tcl-config=${TCL_CONFIG} \
                 --with-x                        \
@@ -88,9 +87,8 @@ Mingw_w64_autotools() {
                 --enable-shared                 \
                 --enable-R-shlib                \
                 --enable-BLAS-shlib             \
-                --disable-R-profiling           \
                 --disable-prebuilt-html         \
-                --disable-memory-profiling      \
+                --enable-memory-profiling       \
                 --with-tk-config=$TK_CONFIG     \
                 --with-tcl-config=$TCL_CONFIG   \
                 --with-x=no                     \
@@ -337,6 +335,7 @@ EOF
                 --with-blas="-framework Accelerate" \
                 --with-lapack                       \
                 --enable-R-shlib                    \
+                --enable-memory-profiling           \
                 --without-x                         \
                 --without-internal-tzcode           \
                 --enable-R-framework=no             \

diff --git a/r-base/meta.yaml b/r-base/meta.yaml
@@ -22,7 +22,7 @@ source:
     - 0010-configure-Fix-typo-CPPLAGS.patch
 
 build:
-  number: 1
+  number: 3
   rpaths:
     - lib/R/lib/
     - lib/
@@ -36,7 +36,7 @@ requirements:
     - m2-curl                  # [win]
     - m2-p7zip                 # [win]
     - readline                 # [not win]
-    - ncurses >=5.9-8          # [not win]
+    - ncurses >=5.9.*          # [not win]
     - pango                    # [linux]
     - gcc                      # [not win]
     - jpeg                     # [not win]
@@ -67,7 +67,7 @@ requirements:
 
   run:
     - readline                 # [not win]
-    - ncurses >=5.9-8          # [not win]
+    - ncurses >=5.9.*          # [not win]
     - cairo                    # [linux]
     - pango                    # [linux]
     - libgcc                   # [not win]