]> git.pld-linux.org Git - packages/libphonenumber.git/blob - libphonenumber-no-fetch.patch
- updated to 8.12.46, more absl libs needed
[packages/libphonenumber.git] / libphonenumber-no-fetch.patch
1 --- libphonenumber-8.12.42/tools/cpp/CMakeLists.txt.orig        2022-01-27 15:51:40.000000000 +0100
2 +++ libphonenumber-8.12.42/tools/cpp/CMakeLists.txt     2022-02-08 20:53:10.523844007 +0100
3 @@ -26,29 +26,11 @@ project (generate_geocoding_data)
4  # Helper functions dealing with finding libraries and programs this library
5  # depends on.
6  include (gtest.cmake)
7 -include (FetchContent)
8 -
9 -# Downloading the abseil sources.
10 -FetchContent_Declare(
11 -    abseil-cpp
12 -    GIT_REPOSITORY  https://github.com/abseil/abseil-cpp.git
13 -    GIT_TAG         origin/master
14 -)
15 -
16 -# Building the abseil binaries
17 -FetchContent_GetProperties(abseil-cpp)
18 -if (NOT abseil-cpp_POPULATED)
19 -    FetchContent_Populate(abseil-cpp)
20 -endif ()
21 -
22 -if (NOT abseil-cpp_POPULATED)
23 -   message (FATAL_ERROR "Could not build abseil-cpp binaries.")
24 -endif ()
25  
26  # Safeguarding against any potential link errors as mentioned in
27  # https://github.com/abseil/abseil-cpp/issues/225
28  set(CMAKE_POSITION_INDEPENDENT_CODE TRUE)
29 -add_subdirectory(${abseil-cpp_SOURCE_DIR} ${abseil-cpp_BINARY_DIR})
30 +find_package(absl REQUIRED COMPONENTS btree strings)
31  
32  find_or_build_gtest ()
33  set (
34 --- libphonenumber-8.12.46/cpp/CMakeLists.txt.orig      2022-02-08 21:04:15.984964451 +0100
35 +++ libphonenumber-8.12.46/cpp/CMakeLists.txt   2022-02-08 21:08:15.033998716 +0100
36 @@ -474,10 +474,11 @@ if (${USE_POSIX_THREAD} STREQUAL "ON" OR
37    endif()
38  endif ()
39  
40 +find_package(absl REQUIRED COMPONENTS hash raw_hash_set strings synchronization)
41  # Safeguarding against any potential link errors as mentioned in
42  # https://github.com/abseil/abseil-cpp/issues/225
43  set(CMAKE_POSITION_INDEPENDENT_CODE TRUE)
44 -list (APPEND LIBRARY_DEPS absl::strings)
45 +list (APPEND LIBRARY_DEPS absl::hash absl::raw_hash_set absl::strings)
46  list (APPEND COMMON_DEPS absl::synchronization)
47  
48  if (APPLE)
49    list (APPEND COMMON_DEPS ${COREFOUNDATION_LIB} ${FOUNDATION_LIB})
50 --- libphonenumber-8.12.42/cpp/CMakeLists.txt.orig      2022-02-08 21:57:33.440581630 +0100
51 +++ libphonenumber-8.12.42/cpp/CMakeLists.txt   2022-02-08 22:20:13.587822822 +0100
52 @@ -18,7 +18,7 @@ cmake_minimum_required (VERSION 3.11)
53  
54  # Pick the C++ standard to compile with.
55  # Abseil currently supports C++11, C++14, and C++17.
56 -set(CMAKE_CXX_STANDARD 11)
57 +set(CMAKE_CXX_STANDARD 17)
58  set(CMAKE_CXX_STANDARD_REQUIRED ON)
59  
60  project (libphonenumber)
This page took 0.15342 seconds and 3 git commands to generate.