diff options
| author | Ariadne Conill <ariadne@dereferenced.org> | 2021-04-08 17:39:48 -0600 |
|---|---|---|
| committer | Ariadne Conill <ariadne@dereferenced.org> | 2021-04-08 17:41:25 -0600 |
| commit | 6492949eea0c45013fda0031c5eaf903cc770a2b (patch) | |
| tree | 8f3c5e51ce1187338e1c7b1042b77b2dd2477733 | |
| parent | a318081e5c8b9509e0ad73d0639130f9413a889a (diff) | |
| download | aports-6492949eea0c45013fda0031c5eaf903cc770a2b.tar.gz aports-6492949eea0c45013fda0031c5eaf903cc770a2b.tar.bz2 aports-6492949eea0c45013fda0031c5eaf903cc770a2b.tar.xz | |
community/libphonenumber: fix sporadic race condition when building
By switching to ninja, we were able to find conflicting rules in the generated
build system files. A patch has been applied to work around the conflicting
build system rules.
| -rw-r--r-- | community/libphonenumber/APKBUILD | 12 | ||||
| -rw-r--r-- | community/libphonenumber/cmake-duplicate-rule-definition.patch | 14 |
2 files changed, 22 insertions, 4 deletions
diff --git a/community/libphonenumber/APKBUILD b/community/libphonenumber/APKBUILD index 4fab2ce27d..93844bb849 100644 --- a/community/libphonenumber/APKBUILD +++ b/community/libphonenumber/APKBUILD @@ -15,17 +15,20 @@ depends_dev=" makedepends="$depends_dev cmake gtest-dev + ninja " checkdepends="gtest" subpackages="$pkgname-static $pkgname-dev" -source="https://github.com/googlei18n/libphonenumber/archive/v$pkgver/libphonenumber-v$pkgver.tar.gz" +source="https://github.com/googlei18n/libphonenumber/archive/v$pkgver/libphonenumber-v$pkgver.tar.gz + cmake-duplicate-rule-definition.patch" build() { cd cpp - cmake -B build \ + cmake -B build -G Ninja \ -DCMAKE_BUILD_TYPE=None \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=lib + -DCMAKE_INSTALL_LIBDIR=lib \ + -DREGENERATE_METADATA=OFF cmake --build build } @@ -39,4 +42,5 @@ package() { DESTDIR="$pkgdir" cmake --install build } -sha512sums="2fd68a319d3c942e580763c62e2ef3731d30d792a43ef394d0d1e75a45913ce447b06b578691f33c93e6eba9a206c23e387ad8f4894f9796abf3f8a0a49c1bcb libphonenumber-v8.12.20.tar.gz" +sha512sums="2fd68a319d3c942e580763c62e2ef3731d30d792a43ef394d0d1e75a45913ce447b06b578691f33c93e6eba9a206c23e387ad8f4894f9796abf3f8a0a49c1bcb libphonenumber-v8.12.20.tar.gz +dc76f0649c401ec97a7449373b96247135c3b80cf1e5bb8afba005fed1055a74429d3c778b7519b609bdcfbb278be395ef83e0bd00228239b6f15d96b0d2df11 cmake-duplicate-rule-definition.patch" diff --git a/community/libphonenumber/cmake-duplicate-rule-definition.patch b/community/libphonenumber/cmake-duplicate-rule-definition.patch new file mode 100644 index 0000000000..18d8175e10 --- /dev/null +++ b/community/libphonenumber/cmake-duplicate-rule-definition.patch @@ -0,0 +1,14 @@ +Work around a deficiency in cmake's build rule generation. +Upstream: not yet + +--- libphonenumber-8.12.20.orig/cpp/CMakeLists.txt ++++ libphonenumber-8.12.20/cpp/CMakeLists.txt +@@ -351,7 +351,7 @@ + ${TEST_METADATA_TARGET} + "${RESOURCES_DIR}/PhoneNumberMetadataForTesting.xml" + "test_metadata" +- "metadata" ++ "test_metadata" + ) + list (APPEND TESTING_LIBRARY_SOURCES "src/phonenumbers/test_metadata.cc") + |