From d34b23f8c8b60a85dfd53f2992281b71142ac2d7 Mon Sep 17 00:00:00 2001
From: JJ Allaire <jj@rstudio.org>
Date: Sat, 10 May 2014 19:15:18 -0400
Subject: [PATCH] revert blas exclusion code

---
 CMakeGlobals.txt             |  7 -------
 cmake/modules/FindLibR.cmake | 26 ++++++++++++--------------
 package/linux/make-package   |  6 ------
 3 files changed, 12 insertions(+), 27 deletions(-)

diff --git a/CMakeGlobals.txt b/CMakeGlobals.txt
index b1fb069ee65..cc101917c3f 100644
--- a/CMakeGlobals.txt
+++ b/CMakeGlobals.txt
@@ -32,13 +32,6 @@ else()
 endif()
 set(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
 
-# blas/lapack behavior
-if ("$ENV{RSTUDIO_NO_LINK_BLAS}" STREQUAL "1")
-  set(RSTUDIO_LINK_BLAS FALSE)
-else()
-  set(RSTUDIO_LINK_BLAS TRUE)
-endif()
-
 # default to debug builds
 if(NOT CMAKE_BUILD_TYPE)
    set(CMAKE_BUILD_TYPE "Debug")
diff --git a/cmake/modules/FindLibR.cmake b/cmake/modules/FindLibR.cmake
index 3bccada7be3..5255f565c8e 100644
--- a/cmake/modules/FindLibR.cmake
+++ b/cmake/modules/FindLibR.cmake
@@ -129,22 +129,20 @@ else()
    endif()
 
    # look for lapack
-   if(RSTUDIO_LINK_BLAS)
-      find_library(LIBR_LAPACK_LIBRARY NAMES Rlapack
-                   HINTS ${LIBR_LIB_DIR} ${LIBRARY_ARCH_HINT_PATH} ${LIBR_HOME}/bin)
-      if(LIBR_LAPACK_LIBRARY)
-         set(LIBR_LIBRARIES ${LIBR_LIBRARIES} ${LIBR_LAPACK_LIBRARY})
-         if(UNIX)
-            set(LIBR_LIBRARIES ${LIBR_LIBRARIES} gfortran)
-         endif()
+   find_library(LIBR_LAPACK_LIBRARY NAMES Rlapack
+                HINTS ${LIBR_LIB_DIR} ${LIBRARY_ARCH_HINT_PATH} ${LIBR_HOME}/bin)
+   if(LIBR_LAPACK_LIBRARY)
+      set(LIBR_LIBRARIES ${LIBR_LIBRARIES} ${LIBR_LAPACK_LIBRARY})
+      if(UNIX)
+         set(LIBR_LIBRARIES ${LIBR_LIBRARIES} gfortran)
       endif()
+   endif()
 
-      # look for blas
-      find_library(LIBR_BLAS_LIBRARY NAMES Rblas
-                   HINTS ${LIBR_LIB_DIR} ${LIBRARY_ARCH_HINT_PATH} ${LIBR_HOME}/bin)
-      if(LIBR_BLAS_LIBRARY)
-         set(LIBR_LIBRARIES ${LIBR_LIBRARIES} ${LIBR_BLAS_LIBRARY})
-      endif()
+   # look for blas
+   find_library(LIBR_BLAS_LIBRARY NAMES Rblas
+                HINTS ${LIBR_LIB_DIR} ${LIBRARY_ARCH_HINT_PATH} ${LIBR_HOME}/bin)
+   if(LIBR_BLAS_LIBRARY)
+      set(LIBR_LIBRARIES ${LIBR_LIBRARIES} ${LIBR_BLAS_LIBRARY})
    endif()
 
    # look for rgraphapp on win32
diff --git a/package/linux/make-package b/package/linux/make-package
index 1082ceaa082..1e94e879274 100755
--- a/package/linux/make-package
+++ b/package/linux/make-package
@@ -16,12 +16,6 @@ then
    exit 1
 fi
 
-# don't link to the R blas on redhat/fedora
-if [ "$1" == "RPM" ]
-then
-  export RSTUDIO_NO_LINK_BLAS="1"
-fi
-
 # set build type( if necessary) and build dir
 if test -z "$CMAKE_BUILD_TYPE"
 then