Skip to content

Commit

Permalink
pkgbuild: compressor-common-depends.patch
Browse files Browse the repository at this point in the history
This patch adds an explicit dependency link between src/Compressor and
src/common.

This is a bug in the upstream build, as src/Compressor depends on common
objects, and will cause racy build failures at high -j level (12+)
  • Loading branch information
bazaah committed Oct 26, 2022
1 parent d5a6299 commit 97e0684
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 1 deletion.
2 changes: 2 additions & 0 deletions .SRCINFO
Original file line number Diff line number Diff line change
Expand Up @@ -154,13 +154,15 @@ pkgbase = ceph
source = disable-empty-readable.sh-test.patch
source = disable-test-cls-fifo.patch
source = ceph-16.2.7-delete-test-librados-asio.patch
source = ceph-17.2.4-compressor-common-depends.patch
sha512sums = 430e916004a697bddda8cb7a83026b6e0e2b2e618e645df48c0580d16d7370d5a40d94b802db5b344faeab7c4e48d65c8ade47d0cbf0eaa0e7ddf399b09a279d
sha512sums = 4354001c1abd9a0c385ba7bd529e3638fb6660b6a88d4e49706d4ac21c81b8e829303a20fb5445730bdac18c4865efb10bc809c1cd56d743c12aa9a52e160049
sha512sums = e107508a41fca50845cc2494e64adaba93efb95a2fa486fc962510a8ba4b2180d93067cae9870f119e88e5e8b28a046bc2240b0b23cdd8933d1fb1a6a9668c1e
sha512sums = ea069b75b786c22166c609b127b512802cc5c6e9512d792d7b7b34d276f5b86d57c8c35cfc7b5c855a59c0ba87ba1aabe2ca26da72b26bff46b6ba8410ddb27e
sha512sums = 2234d005df71b3b6013e6b76ad07a5791e3af7efec5f41c78eb1a9c92a22a67f0be9560be59b52534e90bfe251bcf32c33d5d40163f3f8f7e7420691f0f4a222
sha512sums = 3774cbc1a979ee8bf7138b96defcf69499444afe0b7186b21feac3453a3a5ec93741f5942d256d93999e9bc306c8d018206893e04e1a3eb9e03593105d9f5791
sha512sums = 66770a80ba4e05ea72d4809cb5819cce7499ea7523b85b1a57370df68de1d7f6f94b1c10d0f9f9a3c8e6a86d0419434c70778c568cd06a0dd2e6126631a3355c
sha512sums = cd20e9358e49d3342c7c2a00ac538f628cdf86dc25f1870b77ea2d3df386772caedc333506387b68d8d357913ba1eb761700d843103c3c173df71cd79473cefa

pkgname = ceph
depends = ceph-libs=17.2.4-1
Expand Down
8 changes: 7 additions & 1 deletion PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -59,14 +59,20 @@ source=(
# Test improperly creates librados::async_write templates, in boost 1.80
# not sure why yet, need to ask upstream for help
'ceph-16.2.7-delete-test-librados-asio.patch'

# Compressor code depends on src/common objects existing, but this isn't enforced
# by the build, which can lead to racy failures. Fix this by adding explicit CMake
# rules
'ceph-17.2.4-compressor-common-depends.patch'
)
sha512sums=('430e916004a697bddda8cb7a83026b6e0e2b2e618e645df48c0580d16d7370d5a40d94b802db5b344faeab7c4e48d65c8ade47d0cbf0eaa0e7ddf399b09a279d'
'4354001c1abd9a0c385ba7bd529e3638fb6660b6a88d4e49706d4ac21c81b8e829303a20fb5445730bdac18c4865efb10bc809c1cd56d743c12aa9a52e160049'
'e107508a41fca50845cc2494e64adaba93efb95a2fa486fc962510a8ba4b2180d93067cae9870f119e88e5e8b28a046bc2240b0b23cdd8933d1fb1a6a9668c1e'
'ea069b75b786c22166c609b127b512802cc5c6e9512d792d7b7b34d276f5b86d57c8c35cfc7b5c855a59c0ba87ba1aabe2ca26da72b26bff46b6ba8410ddb27e'
'2234d005df71b3b6013e6b76ad07a5791e3af7efec5f41c78eb1a9c92a22a67f0be9560be59b52534e90bfe251bcf32c33d5d40163f3f8f7e7420691f0f4a222'
'3774cbc1a979ee8bf7138b96defcf69499444afe0b7186b21feac3453a3a5ec93741f5942d256d93999e9bc306c8d018206893e04e1a3eb9e03593105d9f5791'
'66770a80ba4e05ea72d4809cb5819cce7499ea7523b85b1a57370df68de1d7f6f94b1c10d0f9f9a3c8e6a86d0419434c70778c568cd06a0dd2e6126631a3355c')
'66770a80ba4e05ea72d4809cb5819cce7499ea7523b85b1a57370df68de1d7f6f94b1c10d0f9f9a3c8e6a86d0419434c70778c568cd06a0dd2e6126631a3355c'
'cd20e9358e49d3342c7c2a00ac538f628cdf86dc25f1870b77ea2d3df386772caedc333506387b68d8d357913ba1eb761700d843103c3c173df71cd79473cefa')

# -fno-plt causes linker errors (undefined reference to internal methods)
# similar issue: https://bugs.archlinux.org/task/54845
Expand Down
9 changes: 9 additions & 0 deletions ceph-17.2.4-compressor-common-depends.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
diff --git a/src/compressor/CMakeLists.txt b/src/compressor/CMakeLists.txt
index 9b10fff5330..412e91ace57 100644
--- a/src/compressor/CMakeLists.txt
+++ b/src/compressor/CMakeLists.txt
@@ -46,3 +46,4 @@ endif()

add_custom_target(compressor_plugins DEPENDS
${ceph_compressor_libs})
+add_dependencies(compressor_plugins common-objs)

0 comments on commit 97e0684

Please sign in to comment.