mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
dev-libs/libphonenumber: drop 8.12.39
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
This commit is contained in:
Andreas Sturmlechner
@@ -1,2 +1 @@
|
||||
DIST libphonenumber-8.12.39.tar.gz 11007180 BLAKE2B 27a47b35497772740da04cb9b79e1a6b4fd6f9b0d4a89768e1ba9212672f1a0fd06c5837aa8858a4680b5c47ef16721c6ef145d8d2cd77dccbe27bb4b0897dcf SHA512 82570c60b132022a713c0664de2c29997cff0ab8c3ab97dbec0f8d1cd1782090ba92ca7d2f044760f523c986660f13b70aacf8a9c247a3b80eb19d35227bc2a8
|
||||
DIST libphonenumber-8.13.47.tar.gz 12929410 BLAKE2B 97af74d0c4c3f01baaeca370f0ad8d71abbff58edbb7209d5809e43f0171b0c3a997aa0a190131e935326ac72702706221429bf166e0726a44126bda36bb0169 SHA512 0ad3e59e4972bdb7f3e9abce4f1e2bd2924c21d437e734d6bc752cc86660a8a48b3b15ecd662c406e0279ef1112d9bd53b8ab9a9c4e593d3c8b87f9d6d23a5f7
|
||||
|
||||
@@ -1,54 +0,0 @@
|
||||
Upstream: no, I probably should, although this patch isn't nice, but
|
||||
neither is their cmake code
|
||||
|
||||
From a0c72f32b3c318f66975400af81b9b44d8a8d9c7 Mon Sep 17 00:00:00 2001
|
||||
From: Heiko Becker <heirecka@exherbo.org>
|
||||
Date: Wed, 27 Mar 2019 21:07:22 +0100
|
||||
Subject: [PATCH] Fix build with BUILD_STATIC_LIB=ON
|
||||
|
||||
---
|
||||
cpp/CMakeLists.txt | 14 +++++++++++---
|
||||
1 file changed, 11 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
|
||||
index 38ce1f50..dd9399be 100644
|
||||
--- a/cpp/CMakeLists.txt
|
||||
+++ b/cpp/CMakeLists.txt
|
||||
@@ -441,7 +441,9 @@ if (${BUILD_GEOCODER} STREQUAL "ON")
|
||||
list (APPEND GEOCODER_DEPS ${COMMON_DEPS})
|
||||
# Note that the subset of base/ on which the geocoder relies is implemented
|
||||
# on top of Boost header-only libraries (e.g. scoped_ptr.hpp).
|
||||
- target_link_libraries (geocoding ${LIBRARY_DEPS})
|
||||
+ if (${BUILD_STATIC_LIB} STREQUAL "ON")
|
||||
+ target_link_libraries (geocoding ${LIBRARY_DEPS})
|
||||
+ endif()
|
||||
target_link_libraries (geocoding-shared ${LIBRARY_DEPS})
|
||||
endif ()
|
||||
|
||||
@@ -599,7 +601,9 @@ if (BUILD_SHARED_LIB)
|
||||
endif ()
|
||||
|
||||
if (${BUILD_GEOCODER} STREQUAL "ON")
|
||||
- install (TARGETS geocoding LIBRARY DESTINATION ${LIBDIR} ARCHIVE DESTINATION ${LIBDIR})
|
||||
+ if (${BUILD_STATIC_LIB} STREQUAL "ON")
|
||||
+ install (TARGETS geocoding LIBRARY DESTINATION ${LIBDIR} ARCHIVE DESTINATION ${LIBDIR})
|
||||
+ endif()
|
||||
install (TARGETS geocoding-shared LIBRARY DESTINATION ${LIBDIR} ARCHIVE
|
||||
DESTINATION ${LIBDIR})
|
||||
endif ()
|
||||
@@ -611,7 +615,11 @@ if (${BUILD_GEOCODER} STREQUAL "ON")
|
||||
geocoding_test_program
|
||||
"test/phonenumbers/geocoding/geocoding_test_program.cc"
|
||||
)
|
||||
- target_link_libraries (geocoding_test_program geocoding phonenumber)
|
||||
+ if (${BUILD_STATIC_LIB} STREQUAL "ON")
|
||||
+ target_link_libraries (geocoding_test_program geocoding phonenumber)
|
||||
+ else ()
|
||||
+ target_link_libraries (geocoding_test_program geocoding-shared phonenumber-shared)
|
||||
+ endif ()
|
||||
endif ()
|
||||
|
||||
# Build an RPM
|
||||
--
|
||||
2.21.0
|
||||
|
||||
@@ -1,110 +0,0 @@
|
||||
From 387f1daf0f9cd25ffa2654cc536e5678dd96a571 Mon Sep 17 00:00:00 2001
|
||||
From: Andreas Sturmlechner <asturm@gentoo.org>
|
||||
Date: Mon, 15 Nov 2021 19:13:37 +0100
|
||||
Subject: [PATCH] Add BUILD_TESTING option
|
||||
|
||||
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
|
||||
---
|
||||
cpp/CMakeLists.txt | 13 +++++++++++--
|
||||
tools/cpp/CMakeLists.txt | 17 +++++++++--------
|
||||
2 files changed, 20 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
|
||||
index 44db6834..f8e40978 100644
|
||||
--- a/cpp/CMakeLists.txt
|
||||
+++ b/cpp/CMakeLists.txt
|
||||
@@ -32,7 +32,9 @@ endif ()
|
||||
# depends on.
|
||||
|
||||
include (GNUInstallDirs)
|
||||
-include (../tools/cpp/gtest.cmake)
|
||||
+if (BUILD_TESTING)
|
||||
+ include (../tools/cpp/gtest.cmake)
|
||||
+endif()
|
||||
|
||||
function (print_error DESCRIPTION FILE)
|
||||
message (FATAL_ERROR
|
||||
@@ -90,6 +92,7 @@ option ("USE_STD_MAP" "Force the use of std::map" "OFF")
|
||||
option ("BUILD_STATIC_LIB" "Build static libraries" "ON")
|
||||
option ("USE_STDMUTEX" "Use C++ 2011 std::mutex for multi-threading" "OFF")
|
||||
option ("USE_POSIX_THREAD" "Use Posix api for multi-threading" "OFF")
|
||||
+option ("BUILD_TESTING" "Build unit tests (gtest sources are needed)" "ON")
|
||||
|
||||
if (${USE_ALTERNATE_FORMATS} STREQUAL "ON")
|
||||
add_definitions ("-DI18N_PHONENUMBERS_USE_ALTERNATE_FORMATS")
|
||||
@@ -121,7 +124,9 @@ if (${USE_BOOST} STREQUAL "OFF" AND ${USE_STDMUTEX} STREQUAL "OFF")
|
||||
find_package (Threads)
|
||||
endif()
|
||||
|
||||
-find_or_build_gtest ()
|
||||
+if (BUILD_TESTING)
|
||||
+ find_or_build_gtest ()
|
||||
+endif()
|
||||
|
||||
if (${USE_RE2} STREQUAL "ON")
|
||||
find_required_library (RE2 re2/re2.h re2 "Google RE2")
|
||||
@@ -492,11 +497,13 @@ if (${BUILD_GEOCODER} STREQUAL "ON")
|
||||
endif ()
|
||||
|
||||
# Build a specific library for testing purposes.
|
||||
+if (BUILD_TESTING)
|
||||
add_library (phonenumber_testing STATIC ${TESTING_LIBRARY_SOURCES})
|
||||
if (${BUILD_GEOCODER} STREQUAL "ON")
|
||||
add_dependencies (phonenumber_testing generate_geocoding_data)
|
||||
endif ()
|
||||
target_link_libraries (phonenumber_testing ${LIBRARY_DEPS})
|
||||
+endif()
|
||||
|
||||
if (${BUILD_GEOCODER} STREQUAL "ON")
|
||||
# Test geocoding data cpp files generation.
|
||||
@@ -551,6 +558,7 @@ if (${USE_ICU_REGEXP} STREQUAL "ON")
|
||||
endif ()
|
||||
|
||||
# Build the testing binary.
|
||||
+if (BUILD_TESTING)
|
||||
include_directories ("test")
|
||||
add_executable (libphonenumber_test ${TEST_SOURCES})
|
||||
set (TEST_LIBS phonenumber_testing ${GTEST_LIB})
|
||||
@@ -575,6 +583,7 @@ else ()
|
||||
DEPENDS libphonenumber_test
|
||||
)
|
||||
endif ()
|
||||
+endif ()
|
||||
|
||||
# Install rules.
|
||||
install (FILES
|
||||
diff --git a/tools/cpp/CMakeLists.txt b/tools/cpp/CMakeLists.txt
|
||||
index fafa8469..0c3a84e0 100644
|
||||
--- a/tools/cpp/CMakeLists.txt
|
||||
+++ b/tools/cpp/CMakeLists.txt
|
||||
@@ -20,11 +20,10 @@ project (generate_geocoding_data)
|
||||
|
||||
# Helper functions dealing with finding libraries and programs this library
|
||||
# depends on.
|
||||
-
|
||||
-include (gtest.cmake)
|
||||
-
|
||||
-find_or_build_gtest ()
|
||||
-
|
||||
+if (BUILD_TESTING)
|
||||
+ include (gtest.cmake)
|
||||
+ find_or_build_gtest ()
|
||||
+endif ()
|
||||
set (
|
||||
SOURCES
|
||||
"src/cpp-build/generate_geocoding_data.cc"
|
||||
@@ -52,6 +51,8 @@ if (NOT WIN32)
|
||||
endif ()
|
||||
|
||||
# Build the testing binary.
|
||||
-include_directories ("test")
|
||||
-add_executable (generate_geocoding_data_test ${TEST_SOURCES})
|
||||
-target_link_libraries (generate_geocoding_data_test ${TEST_LIBS})
|
||||
+if (BUILD_TESTING)
|
||||
+ include_directories ("test")
|
||||
+ add_executable (generate_geocoding_data_test ${TEST_SOURCES})
|
||||
+ target_link_libraries (generate_geocoding_data_test ${TEST_LIBS})
|
||||
+endif ()
|
||||
--
|
||||
2.33.1
|
||||
|
||||
@@ -1,48 +0,0 @@
|
||||
# Copyright 2021-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
CMAKE_MAKEFILE_GENERATOR="emake" # broken w/ ninja
|
||||
inherit cmake
|
||||
|
||||
DESCRIPTION="Library for parsing, formatting, and validating international phone numbers"
|
||||
HOMEPAGE="https://github.com/google/libphonenumber"
|
||||
SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
CMAKE_USE_DIR="${WORKDIR}"/${P}/cpp
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 arm64 ~ppc64 x86"
|
||||
IUSE="test"
|
||||
|
||||
RESTRICT="test !test? ( test )"
|
||||
|
||||
DEPEND="
|
||||
dev-libs/icu:=
|
||||
dev-libs/protobuf:=
|
||||
dev-libs/boost:=
|
||||
"
|
||||
RDEPEND="${DEPEND}"
|
||||
BDEPEND="
|
||||
virtual/pkgconfig
|
||||
test? ( dev-cpp/gtest )
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
# it is either this, or disable BUILD_GEOCODER
|
||||
# https://github.com/google/libphonenumber/pull/2556
|
||||
"${FILESDIR}"/${PN}-8.12.37-cmake.patch
|
||||
# see also https://github.com/google/libphonenumber/pull/2459
|
||||
# using a stripped-down patch w/ BUILD_TESTING
|
||||
"${FILESDIR}"/${PN}-8.12.37-testing.patch
|
||||
)
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DBUILD_STATIC_LIB=OFF
|
||||
-DBUILD_TESTING=$(usex test)
|
||||
-DREGENERATE_METADATA=OFF # avoid JRE dependency
|
||||
)
|
||||
cmake_src_configure
|
||||
}
|
||||
Reference in New Issue
Block a user