From f8289ae49a59491d3eb0303c76e758797948d272 Mon Sep 17 00:00:00 2001 From: ilovezfs Date: Sat, 1 Apr 2017 23:44:39 -0700 Subject: [PATCH] libphonenumber 8.4.0 use googletest 1.8.0 Closes #11951. Signed-off-by: ilovezfs --- Formula/libphonenumber.rb | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/Formula/libphonenumber.rb b/Formula/libphonenumber.rb index aa8ed5ce3a..989b7c07a6 100644 --- a/Formula/libphonenumber.rb +++ b/Formula/libphonenumber.rb @@ -1,8 +1,8 @@ class Libphonenumber < Formula desc "C++ Phone Number library by Google" homepage "https://github.com/googlei18n/libphonenumber" - url "https://github.com/googlei18n/libphonenumber/archive/v8.3.3.tar.gz" - sha256 "2e8529c04a298b831dc80923662a3961fb299d4a7949838d1be9a1fa29881cdd" + url "https://github.com/googlei18n/libphonenumber/archive/v8.4.0.tar.gz" + sha256 "cc3ce0b096782b6a3e0e96795cbab1137d0192c0b60a585dd2d62819f65c659e" bottle do cellar :any @@ -19,25 +19,15 @@ class Libphonenumber < Formula depends_on "re2" resource "gtest" do - url "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/googletest/gtest-1.7.0.zip" - sha256 "247ca18dd83f53deb1328be17e4b1be31514cedfc1e3424f672bf11fd7e0d60d" + url "https://github.com/google/googletest/archive/release-1.8.0.tar.gz" + sha256 "58a6f4277ca2bc8565222b3bbd58a177609e9c488e8a72649359ba51450db7d8" end def install (buildpath/"gtest").install resource("gtest") - - cd "gtest" do - system "cmake", ".", *std_cmake_args - system "make" - end - - args = std_cmake_args + %W[ - -DGTEST_INCLUDE_DIR:PATH=#{buildpath}/gtest/include - -DGTEST_LIB:PATH=#{buildpath}/gtest/libgtest.a - -DGTEST_SOURCE_DIR:PATH=#{buildpath}/gtest/src - ] - - system "cmake", "cpp", *args + system "cmake", "cpp", "-DGTEST_SOURCE_DIR=gtest/googletest", + "-DGTEST_INCLUDE_DIR=gtest/googletest/include", + *std_cmake_args system "make", "install" end