mirrors/aports
1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2026-02-21 07:42:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

community/abseil-cpp: upgrade to 20211102.0

Browse Source 
* disable broken tests
* build with c++11
* fixes #13490
This commit is contained in:
Duncan Bellamy 2022-01-30 09:37:11 +00:00 committed by alice
parent 139c5f0d24
commit 1f4f58fbde
3 changed files with 17 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
community/abseil-cpp/0001-external-gtest.patch
View File

@ -1,28 +0,0 @@
This patch makes it possible to use our system provided gtest
diff -up ./CMakeLists.txt.2 ./CMakeLists.txt
--- ./CMakeLists.txt.2 2021-04-20 12:55:14.000000000 -0400
+++ ./CMakeLists.txt 2021-05-21 22:26:12.910191071 -0400
@@ -127,6 +127,22 @@ if(BUILD_TESTING)
set(absl_gtest_src_dir ${ABSL_LOCAL_GOOGLETEST_DIR})
endif()
include(CMake/Googletest/DownloadGTest.cmake)
+ else()
+ # Set up gtest targets
+ find_library(GTEST_LIB gtest)
+ add_library(gtest UNKNOWN IMPORTED)
+ set_target_properties(gtest PROPERTIES IMPORTED_LOCATION ${GTEST_LIB})
+ find_library(GTEST_MAIN_LIB gtest_main)
+ add_library(gtest_main UNKNOWN IMPORTED)
+ set_target_properties(gtest_main PROPERTIES IMPORTED_LOCATION ${GTEST_MAIN_LIB} INTERFACE_LINK_LIBRARIES gtest)
+
+ # Set up gmock targets
+ find_library(GMOCK_LIB gmock)
+ add_library(gmock UNKNOWN IMPORTED)
+ set_target_properties(gmock PROPERTIES IMPORTED_LOCATION ${GMOCK_LIB} INTERFACE_LINK_LIBRARIES gtest)
+ find_library(GMOCK_MAIN_LIB gmock_main)
+ add_library(gmock_main UNKNOWN IMPORTED)
+ set_target_properties(gmock_main PROPERTIES IMPORTED_LOCATION ${GMOCK_MAIN_LIB} INTERFACE_LINK_LIBRARIES "gmock;Threads::Threads")
endif()
check_target(gtest)

13
community/abseil-cpp/0002-abseil.patch
View File

@ -10,13 +10,14 @@ An all-in-one patch that fixes several issues:
--- a/absl/base/internal/unscaledcycleclock.h
+++ b/absl/base/internal/unscaledcycleclock.h
@@ -46,7 +46,7 @@
@@ -46,7 +46,8 @@
// The following platforms have an implementation of a hardware counter.
#if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || \
- defined(__powerpc__) || defined(__ppc__) || \
+ ((defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)) || \
defined(_M_IX86) || defined(_M_X64)
- defined(__powerpc__) || defined(__ppc__) || defined(__riscv) || \
+ defined(__riscv) || \
+ ((defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)) || \
defined(_M_IX86) || defined(_M_X64)
#define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1
#else
--- a/absl/debugging/internal/examine_stack.cc
@ -32,7 +33,7 @@ An all-in-one patch that fixes several issues:
#include "absl/base/attributes.h"
#include "absl/base/internal/raw_logging.h"
#include "absl/base/macros.h"
@@ -63,8 +67,10 @@ void* GetProgramCounter(void* vuc) {
@@ -63,8 +67,10 @@
return reinterpret_cast<void*>(context->uc_mcontext.pc);
#elif defined(__powerpc64__)
return reinterpret_cast<void*>(context->uc_mcontext.gp_regs[32]);
@ -46,7 +47,7 @@ An all-in-one patch that fixes several issues:
#elif defined(__s390__) && !defined(__s390x__)
--- a/absl/debugging/internal/stacktrace_config.h
+++ b/absl/debugging/internal/stacktrace_config.h
@@ -55,7 +55,7 @@
@@ -59,7 +59,7 @@
#elif defined(__i386__) || defined(__x86_64__)
#define ABSL_STACKTRACE_INL_HEADER \
"absl/debugging/internal/stacktrace_x86-inl.inc"

20
community/abseil-cpp/APKBUILD
View File

@ -1,8 +1,8 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Duncan Bellamy <dunk@denkimushi.com>
pkgname=abseil-cpp
pkgver=20210324.2
pkgrel=3
pkgver=20211102.0
pkgrel=0
pkgdesc="Abseil Common Libraries (C++) "
url="https://abseil.io/"
arch="all"
@ -14,12 +14,9 @@ makedepends="
"
subpackages="$pkgname-dev"
source="https://github.com/abseil/abseil-cpp/archive/$pkgver/abseil-cpp-$pkgver.tar.gz
0001-external-gtest.patch
0002-abseil.patch
"
[ "$CARCH" != "x86_64" ] && options="!check" # Multiple tests broken on all arches but x86_64
build() {
cmake -B build \
-DCMAKE_CXX_STANDARD=11 \
@ -28,12 +25,16 @@ build() {
-DCMAKE_INSTALL_LIBDIR=lib \
-DBUILD_SHARED_LIBS=ON \
-DBUILD_TESTING=ON \
-DABSL_USE_EXTERNAL_GOOGLETEST=ON
-DABSL_USE_EXTERNAL_GOOGLETEST=ON \
-DABSL_PROPAGATE_CXX_STD=ON \
-DABSL_FIND_GOOGLETEST=ON
cmake --build build
}
# disable broken tests
check() {
CTEST_OUTPUT_ON_FAILURE=TRUE ctest --test-dir build
CTEST_OUTPUT_ON_FAILURE=TRUE ctest --test-dir build -E "absl_str_format_convert_test|absl_mutex_test\
|absl_notification_test|absl_per_thread_sem_test|absl_sysinfo_test|absl_random_beta_distribution_test"
}
package() {
@ -41,7 +42,6 @@ package() {
}
sha512sums="
7b935f0f2787a81438f30072f2191138ce3c099e4b22addfbe8ebe579d906604bc6ab03f054d3d6917a08ef5cb7a4371c1a501a7dfbc15c50301261dbf5f6e27 abseil-cpp-20210324.2.tar.gz
90cc3f364da665a2de7f88104cbff926ba006a696e11aaed234f4a0ca00f1e33f9dc9bf188663c27e5fb0916c92c7a17008d7b06c4413fc107bd8197f4249a4d 0001-external-gtest.patch
2ef99418586ba0e1567b6df44d27cab42109106f660884b28875ecea9ac3e55eda878f2aa170478539028e63307fa1a45d2bf834dc42c8c5830b2073ac94ae90 0002-abseil.patch
fed68aa434c02ec6faa9d1c81f1ad35b60ec024b44957e2e0ac31e6075e385c06a3e1b616afeb4bb7c2413191fd7827d82e1f9f0796b52ed21fb2c41dd9031cf abseil-cpp-20211102.0.tar.gz
78bca9372af30624a303b53cbc07b4bfe0ca5a11ef2126c6b3fb34714e3b119fa4bf9a088968b491a7823107df5083c0d4b4aed0e47b8e872ba572543e9a52ea 0002-abseil.patch
"