New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

glog 0.7.0 #163094

Closed

Porkepix wants to merge 13 commits into Homebrew:master from Porkepix:bump-glog-0.7.0

Formula/c/ceres-solver.rb

-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,7 @@ class CeresSolver < Formula @@
       url "http://ceres-solver.org/ceres-solver-2.2.0.tar.gz"
       sha256 "48b2302a7986ece172898477c3bcd6deb8fb5cf19b3327bc49969aad4cede82d"
       license "BSD-3-Clause"
-      revision 1
+      revision 2
       head "https://ceres-solver.googlesource.com/ceres-solver.git", branch: "master"
       livecheck do
@@ Expand Down @@

Formula/e/edencommon.rb

-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,7 @@ @@
       url "https://github.com/facebookexperimental/edencommon/archive/refs/tags/v2024.05.02.00.tar.gz"
       sha256 "ef5c9d0e92a22172df6b09d25c2203e41d67b78ed8a57368c9e8d20f582876d4"
       license "MIT"
+      revision 1
       head "https://github.com/facebookexperimental/edencommon.git", branch: "main"
       bottle do
@@ Expand All / @@ -28,7 +29,7 @@ @@
       depends_on "openssl@3"
       depends_on "wangle"
       def install
         # Fix "Process terminated due to timeout" by allowing a longer timeout.
         inreplace buildpath.glob("eden/common/{os,utils}/test/CMakeLists.txt"),
                   /gtest_discover_tests\((.*)\)/,
@@ Expand Down @@

Formula/f/fb303.rb

-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,7 @@ @@
       url "https://github.com/facebook/fb303/archive/refs/tags/v2024.05.02.00.tar.gz"
       sha256 "82a5d9a6af95bc708e9adfc7559fe2cb5f605103516f9b183d1a7e1e1a83ef89"
       license "Apache-2.0"
+      revision 1
       head "https://github.com/facebook/fb303.git", branch: "main"
       bottle do
@@ Expand All / @@ -30,7 +31,7 @@ @@
       fails_with gcc: "5" # C++17
       def install
         system "cmake", "-S", ".", "-B", "build",
                         "-DPYTHON_EXTENSIONS=OFF",
                         "-DBUILD_SHARED_LIBS=ON",
@@ Expand Down @@

Formula/f/fizz.rb

-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,7 @@ @@
       url "https://github.com/facebookincubator/fizz/releases/download/v2024.05.02.00/fizz-v2024.05.02.00.tar.gz"
       sha256 "3e7823ef99472cc232b2e0c99e8096756d3fe45cc5fcb9abda4aaf5b3b747cd3"
       license "BSD-3-Clause"
+      revision 1
       head "https://github.com/facebookincubator/fizz.git", branch: "main"
       bottle do
@@ Expand Down Expand Up / @@ -39,7 +40,7 @@ @@
         sha256 "a18cf51af20b45e6a1149cd54f64f2cc3a7cb6ca703e5ed6a564c90c77ad9e96"
       end
       def install
         system "cmake", "-S", "fizz", "-B", "build",
                         "-DBUILD_TESTS=OFF",
                         "-DBUILD_SHARED_LIBS=ON",
@@ Expand All / @@ -49,7 +50,7 @@ @@
         system "cmake", "--install", "build"
       end
       test do
         (testpath/"test.cpp").write <<~EOS
           #include <fizz/client/AsyncFizzClient.h>
           #include <iostream>
@@ Expand Down @@

Formula/f/folly.rb

-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,7 @@ @@
       url "https://github.com/facebook/folly/archive/refs/tags/v2024.05.02.00.tar.gz"
       sha256 "c220c556b69ddd91fd83aa2682c7c60470d23d9157e27c803e27f795aac0da9c"
       license "Apache-2.0"
+      revision 1
       head "https://github.com/facebook/folly.git", branch: "main"
       bottle do
@@ Expand Down Expand Up / @@ -46,7 +47,12 @@ @@
       fails_with gcc: "5"
+      # Workaround to support `glog` 0.7+. Similar to AUR patch.
+      # Ref: https://github.com/facebook/folly/issues/2149
+      # Ref: https://aur.archlinux.org/cgit/aur.git/tree/fix-cmake-find-glog.patch?h=folly
+      patch :DATA
       def install
         ENV.llvm_clang if OS.mac? && (DevelopmentTools.clang_build_version <= 1100)
         args = %W[
@@ Expand Down Expand Up / @@ -89,3 +95,35 @@ @@
         system "./test"
       end
     end
+    __END__
+    diff --git a/CMake/folly-config.cmake.in b/CMake/folly-config.cmake.in
+    index 0b96f0a10..f1fdca527 100644
+    --- a/CMake/folly-config.cmake.in
+    +++ b/CMake/folly-config.cmake.in
+    @@ -30,6 +30,7 @@ set(FOLLY_LIBRARIES Folly::folly)
+     # Find folly's dependencies
+     find_dependency(fmt)
+    +find_dependency(glog CONFIG)
+     set(Boost_USE_STATIC_LIBS "@FOLLY_BOOST_LINK_STATIC@")
+     find_dependency(Boost 1.51.0 MODULE
+    diff --git a/CMake/folly-deps.cmake b/CMake/folly-deps.cmake
+    index c72273a73..67dd74109 100644
+    --- a/CMake/folly-deps.cmake
+    +++ b/CMake/folly-deps.cmake
+    @@ -61,10 +61,9 @@ if(LIBGFLAGS_FOUND)
+       set(FOLLY_LIBGFLAGS_INCLUDE ${LIBGFLAGS_INCLUDE_DIR})
+     endif()
+    -find_package(Glog MODULE)
+    -set(FOLLY_HAVE_LIBGLOG ${GLOG_FOUND})
+    -list(APPEND FOLLY_LINK_LIBRARIES ${GLOG_LIBRARY})
+    -list(APPEND FOLLY_INCLUDE_DIRECTORIES ${GLOG_INCLUDE_DIR})
+    +find_package(glog CONFIG REQUIRED)
+    +set(FOLLY_HAVE_LIBGLOG TRUE)
+    +list(APPEND FOLLY_LINK_LIBRARIES glog::glog)
+     find_package(LibEvent MODULE REQUIRED)
+     list(APPEND FOLLY_LINK_LIBRARIES ${LIBEVENT_LIB})

Formula/g/glog.rb

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,8 +1,8 @@
  
    class Glog < Formula

      desc "Application-level logging library"

      homepage "https://github.com/google/glog"

      url "https://github.com/google/glog/archive/refs/tags/v0.6.0.tar.gz"

      sha256 "8a83bf982f37bb70825df71a9709fa90ea9f4447fb3c099e1d720a439d88bad6"

      url "https://github.com/google/glog/archive/refs/tags/v0.7.0.tar.gz"

      sha256 "375106b5976231b92e66879c1a92ce062923b9ae573c42b56ba28b112ee4cc11"

      license "BSD-3-Clause"

      head "https://github.com/google/glog.git", branch: "master"

    @@ -19,7 +19,7 @@ class Glog < Formula
  
        sha256 cellar: :any_skip_relocation, x86_64_linux:   "04695a6df86ea26cadda86975bc9ad9c1ec112e8325e2bbc5f25939b42698463"

      end

      depends_on "cmake" => :build

      depends_on "cmake" => [:build, :test]

      depends_on "gflags"

      def install

    @@ -29,7 +29,21 @@ def install
  
      end

      test do

        (testpath/"test.cpp").write <<~EOS

        (testpath/"CMakeLists.txt").write <<~EOS

          cmake_minimum_required(VERSION 3.16)

          project(glog_test)

          set(CMAKE_CXX_STANDARD 11)

          set(CMAKE_CXX_STANDARD_REQUIRED True)

          find_package(glog REQUIRED)

          add_executable(glog_test main.cpp)

          target_link_libraries(glog_test glog::glog)

        EOS

        (testpath/"main.cpp").write <<~EOS

          #include <glog/logging.h>

          #include <iostream>

          #include <memory>

    @@ -39,10 +53,9 @@ def install
  
            LOG(INFO) << "test";

          }

        EOS

        system ENV.cxx, "-std=c++11", "test.cpp", "-I#{include}", "-L#{lib}",

                        "-lglog", "-I#{Formula["gflags"].opt_lib}",

                        "-L#{Formula["gflags"].opt_lib}", "-lgflags",

                        "-o", "test"

        system "./test"

        system "cmake", "-S", ".", "-B", "build", *std_cmake_args

        system "cmake", "--build", "build", "--target", "glog_test"

        system "./build/glog_test"

      end

    end

Formula/lib/libgrape-lite.rb

-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,7 @@ @@
       url "https://github.com/alibaba/libgrape-lite/archive/refs/tags/v0.3.4.tar.gz"
       sha256 "4d7c08560d56fde4a407566fea5ea348cf8ea7df5dbcc3285dcbfe6d9e5d6ff7"
       license "Apache-2.0"
+      revision 1
       bottle do
         sha256 cellar: :any,                 arm64_sonoma:   "169a84d962028247357fb70d3fd9a00eef09d04043bfc599c547b29545204dc6"
@@ Expand All / @@ -22,7 +23,7 @@ @@
       depends_on "glog"
       depends_on "open-mpi"
       def install
         ENV.cxx11
         system "cmake", "-S", ".", "-B", "build",
@@ Expand Down @@

Formula/o/opencv.rb

-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,7 @@ class Opencv < Formula @@
       url "https://github.com/opencv/opencv/archive/refs/tags/4.9.0.tar.gz"
       sha256 "ddf76f9dffd322c7c3cb1f721d0887f62d747b82059342213138dc190f28bc6c"
       license "Apache-2.0"
-      revision 8
+      revision 9
       livecheck do
         url :stable
@@ Expand Down @@

Formula/p/proxygen.rb

-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,7 @@ @@
       url "https://github.com/facebook/proxygen/releases/download/v2024.05.02.00/proxygen-v2024.05.02.00.tar.gz"
       sha256 "0a82ee8fdc06de3df40473a6e973984e1677fd2736866cc728e9da3a8711ca0c"
       license "BSD-3-Clause"
+      revision 1
       head "https://github.com/facebook/proxygen.git", branch: "main"
       bottle do
@@ Expand Down Expand Up / @@ -31,7 +32,7 @@ @@
       uses_from_macos "python" => :build
       uses_from_macos "zlib"
       def install
         system "cmake", "-S", ".", "-B", "build",
                         "-DBUILD_SHARED_LIBS=ON",
                         "-DCMAKE_INSTALL_RPATH=#{rpath}",
@@ Expand Down @@

Formula/s/s2geometry.rb

-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,7 @@ class S2geometry < Formula @@
       url "https://github.com/google/s2geometry/archive/refs/tags/v0.11.1.tar.gz"
       sha256 "bdbeb8ebdb88fa934257caf81bb44b55711617a3ab4fdec2c3cfd6cc31b61734"
       license "Apache-2.0"
+      revision 1
       livecheck do
         url :homepage
@@ Expand Down @@

Formula/t/treefrog.rb

-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,7 @@ @@
       url "https://github.com/treefrogframework/treefrog-framework/archive/refs/tags/v2.8.0.tar.gz"
       sha256 "6b47b6c0d522118b5b765c596dff14c9ea09141da3a1992e7dae44717d579c8d"
       license "BSD-3-Clause"
+      revision 1
       head "https://github.com/treefrogframework/treefrog-framework.git", branch: "master"
       livecheck do
@@ Expand Down Expand Up / @@ -31,7 +32,7 @@ @@
       fails_with gcc: "5"
       def install
         # src/corelib.pro hardcodes different paths for mongo-c-driver headers on macOS and Linux.
         if OS.mac?
           inreplace "src/corelib.pro", "/usr/local", HOMEBREW_PREFIX
@@ Expand Down @@

Formula/w/wangle.rb

-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,7 @@ @@
       url "https://github.com/facebook/wangle/archive/refs/tags/v2024.05.02.00.tar.gz"
       sha256 "258768db99ced458f3bf7927d3f52bd906609f4746b64319ee5c93b79a8647bf"
       license "Apache-2.0"
+      revision 1
       head "https://github.com/facebook/wangle.git", branch: "main"
       bottle do
@@ Expand Down Expand Up / @@ -36,7 +37,7 @@ @@
       fails_with gcc: "5"
       def install
         args = ["-DBUILD_TESTS=OFF"]
         system "cmake", "-S", "wangle", "-B", "build/shared", "-DBUILD_SHARED_LIBS=ON", *args, *std_cmake_args
@@ Expand All / @@ -50,7 +51,7 @@ @@
         pkgshare.install Dir["wangle/example/echo/*.cpp"]
       end
       test do
         cxx_flags = %W[
           -std=c++17
           -I#{include}
@@ Expand Down @@

Formula/w/watchman.rb

-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,7 @@ @@
       url "https://github.com/facebook/watchman/archive/refs/tags/v2024.05.02.00.tar.gz"
       sha256 "32743a7b142a79da8fafcb034f19212b3541c57faaf38c31407f9fad3fc9d646"
       license "MIT"
+      revision 1
       head "https://github.com/facebook/watchman.git", branch: "main"
       bottle do
@@ Expand Down Expand Up / @@ -46,7 +47,7 @@ @@
       fails_with gcc: "5"
       def install
         # Fix "Process terminated due to timeout" by allowing a longer timeout.
         inreplace "CMakeLists.txt",
                   /gtest_discover_tests\((.*)\)/,
@@ Expand Down @@

glog 0.7.0 #163094

glog 0.7.0 #163094

Diff view

Diff view

There are no files selected for viewing

GitHub Actions / macOS 12-arm64

GitHub Actions / macOS 12-arm64

GitHub Actions / macOS 13-arm64

GitHub Actions / macOS 13-arm64

GitHub Actions / macOS 14-arm64

GitHub Actions / macOS 12-arm64

GitHub Actions / macOS 12-arm64

GitHub Actions / Linux

GitHub Actions / Linux

GitHub Actions / macOS 13-arm64

GitHub Actions / macOS 13-arm64

GitHub Actions / macOS 14-arm64

GitHub Actions / macOS 14-arm64

GitHub Actions / macOS 12-x86_64

GitHub Actions / Linux

GitHub Actions / Linux

GitHub Actions / Linux

GitHub Actions / Linux

GitHub Actions / macOS 12-arm64

GitHub Actions / macOS 13-arm64

GitHub Actions / macOS 14-arm64

GitHub Actions / macOS 13-x86_64

GitHub Actions / macOS 12-x86_64

GitHub Actions / macOS 14-x86_64

GitHub Actions / Linux

GitHub Actions / Linux

GitHub Actions / macOS 12-arm64

GitHub Actions / macOS 13-arm64

GitHub Actions / macOS 14-arm64

GitHub Actions / macOS 12-arm64

GitHub Actions / macOS 13-arm64

GitHub Actions / macOS 14-arm64

GitHub Actions / macOS 12-arm64

GitHub Actions / macOS 13-arm64

GitHub Actions / macOS 14-arm64

GitHub Actions / Linux

GitHub Actions / Linux

GitHub Actions / macOS 12-arm64

GitHub Actions / macOS 13-arm64

GitHub Actions / macOS 14-arm64

GitHub Actions / macOS 12-x86_64

GitHub Actions / macOS 12-arm64

GitHub Actions / macOS 13-arm64