diff --git a/recipes-support/libphonenumber.inc b/recipes-support/libphonenumber.inc index 2366d0e..3e56a2c 100644 --- a/recipes-support/libphonenumber.inc +++ b/recipes-support/libphonenumber.inc @@ -1,4 +1,5 @@ # SPDX-FileCopyrightText: 2018 Volker Krause +# SPDX-FileCopyrightText: 2022 Andreas Cord-Landwehr # # SPDX-License-Identifier: MIT @@ -14,10 +15,12 @@ DEPENDS = " \ protobuf-native \ icu \ virtual/javac-native \ + abseil-cpp \ " SRC_URI = " \ git://github.com/googlei18n/${BPN}.git;nobranch=1;protocol=https \ + file://0001-Move-find_package-call-for-absl-to-global-scope.patch \ " S = "${WORKDIR}/git/cpp" diff --git a/recipes-support/libphonenumber/0001-Move-find_package-call-for-absl-to-global-scope.patch b/recipes-support/libphonenumber/0001-Move-find_package-call-for-absl-to-global-scope.patch new file mode 100644 index 0000000..9d1b140 --- /dev/null +++ b/recipes-support/libphonenumber/0001-Move-find_package-call-for-absl-to-global-scope.patch @@ -0,0 +1,29 @@ +From 00ccef439ff8c67e74019d3e55d6e10bd4d87a73 Mon Sep 17 00:00:00 2001 +From: Andreas Cord-Landwehr +Date: Fri, 30 Dec 2022 23:36:00 +0100 +Subject: [PATCH] Move find_package call for absl to global scope + +absl is needed for compilation also with GEOCODER disabled. + +Signed-off-by: Andreas Cord-Landwehr +--- + cpp/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt +index 4ba99c398..a2b33ce54 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -202,8 +202,8 @@ add_custom_command ( + DEPENDS ${PROTOBUF_SOURCES} + ) + ++find_package(absl REQUIRED) + if (${BUILD_GEOCODER} STREQUAL "ON") +- find_package(absl) + + # Geocoding data cpp file generation + set (TOOLS_DIR "${CMAKE_CURRENT_BINARY_DIR}/tools") +-- +2.37.2 + diff --git a/recipes-support/libphonenumber_8.11.5.bb b/recipes-support/libphonenumber_8.13.3.bb similarity index 62% rename from recipes-support/libphonenumber_8.11.5.bb rename to recipes-support/libphonenumber_8.13.3.bb index 99127c5..2e99ccd 100644 --- a/recipes-support/libphonenumber_8.11.5.bb +++ b/recipes-support/libphonenumber_8.13.3.bb @@ -2,4 +2,4 @@ # SPDX-License-Identifier: CC0-1.0 require ${PN}.inc -SRCREV = "df9d37a1a002cf22b479a113d069326dfb1b781f" +SRCREV = "7f6c068beddd2a07165cce1ab3aa3158789fa3ba"