aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
authorCharlie Sharpsteen2013-03-02 12:43:42 -0800
committerCharlie Sharpsteen2013-03-02 12:47:41 -0800
commitfd4a7b32c2b8fce52082a7736995a903461aedec (patch)
tree898b90e8faadf781f3df8f59ea2db6fc3c8b53db /Library
parentebf6ba6ef5fef1139b034dd1f79ef1ec1c13d55e (diff)
downloadhomebrew-fd4a7b32c2b8fce52082a7736995a903461aedec.tar.bz2
r: Update to 2.15.3
Remove patch required for Objective-C++ support on Mountain Lion as this has been fixed upstream. Fixes #18190.
Diffstat (limited to 'Library')
-rw-r--r--Library/Formula/r.rb60
1 files changed, 3 insertions, 57 deletions
diff --git a/Library/Formula/r.rb b/Library/Formula/r.rb
index 6696a3760..e14c7ed55 100644
--- a/Library/Formula/r.rb
+++ b/Library/Formula/r.rb
@@ -9,8 +9,8 @@ end
class R < Formula
homepage 'http://www.r-project.org'
- url 'http://cran.r-project.org/src/base/R-2/R-2.15.2.tar.gz'
- sha1 'c80da687d66ee88d1e34fc1ae5c1bd525f9513dd'
+ url 'http://cran.r-project.org/src/base/R-2/R-2.15.3.tar.gz'
+ sha1 ''
head 'https://svn.r-project.org/R/trunk'
@@ -23,12 +23,6 @@ class R < Formula
depends_on 'valgrind' if build.include? 'with-valgrind'
- def patches
- # Fix detection of Objective-C++ in configure. Reported upstream:
- # https://bugs.r-project.org/bugzilla3/show_bug.cgi?id=15107
- DATA
- end if MacOS.version >= :mountain_lion
-
def install
ENV.Og if build.include? 'with-valgrind'
ENV.fortran
@@ -47,6 +41,7 @@ class R < Formula
system "./configure", *args
system "make"
ENV.j1 # Serialized installs, please
+ system "make check"
system "make install"
# Link binaries and manpages from the Framework
@@ -77,52 +72,3 @@ class R < Formula
EOS
end
end
-
-__END__
-
-Patch configure so that Objective-C++ tests pass on OS X 10.8.x. The problem is
-that every test uses the header file `objc/Object.h` to define Objective-C
-objects and this header is a no-op include on 10.8 unless the `__OBJC2__`
-preprocessor variable is undefined.
-
-Upstream bug:
-
- https://bugs.r-project.org/bugzilla3/show_bug.cgi?id=15107
-
-diff --git a/configure b/configure
-index 5bae281..baf4f47 100755
---- a/configure
-+++ b/configure
-@@ -8328,6 +8328,7 @@ $as_echo_n "checking whether ${OBJCXX} can compile ObjC++... " >&6; }
- ## we don't use AC_LANG_xx because ObjC++ is not defined as a language (yet)
- ## (the test program is from the gcc test suite)
- cat << \EOF > conftest.mm
-+#undef __OBJC2__
- #include <objc/Object.h>
- #include <iostream>
-
-@@ -8368,6 +8369,7 @@ $as_echo_n "checking whether ${CXX} can compile ObjC++... " >&6; }
- ## we don't use AC_LANG_xx because ObjC++ is not defined as a language (yet)
- ## (the test program is from the gcc test suite)
- cat << \EOF > conftest.mm
-+#undef __OBJC2__
- #include <objc/Object.h>
- #include <iostream>
-
-@@ -8403,6 +8405,7 @@ $as_echo_n "checking whether ${OBJC} can compile ObjC++... " >&6; }
- ## we don't use AC_LANG_xx because ObjC++ is not defined as a language (yet)
- ## (the test program is from the gcc test suite)
- cat << \EOF > conftest.mm
-+#undef __OBJC2__
- #include <objc/Object.h>
- #include <iostream>
-
-@@ -24389,7 +24392,7 @@ else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
--
-+#undef __OBJC2__
- #include <objc/Object.h>
-
- #ifdef F77_DUMMY_MAIN