pkgbuild: use rdkafka.mpatch + set env

bazaah · Mar 6, 2023 · dd2565d · dd2565d
1 parent d045174
commit dd2565d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/.SRCINFO b/.SRCINFO
@@ -162,6 +162,7 @@ pkgbase = ceph
 	source = ceph-17.2.4-pybind-unmock-cythonize.patch
 	source = ceph-17.2.5-fix-iterator-depreciations.patch
 	source = ceph-18.0.0-mgr-sqlite-pragmas.patch
+	source = rdkafka.mpatch
 	sha512sums = 10cd3d9eb01c91c148a92f1f7d040bbd78af5bb1ab15d071d93f54b37097dc9e1268eed9e788fe32794d137f6af81abd6a2aeaee39cef44d2c45234a15cc6020
 	sha512sums = 4354001c1abd9a0c385ba7bd529e3638fb6660b6a88d4e49706d4ac21c81b8e829303a20fb5445730bdac18c4865efb10bc809c1cd56d743c12aa9a52e160049
 	sha512sums = 41dbc1c395cdf9b3edf5c5d91bbc90f416b4338ad964fa3471f26a4312d3ec2a5dcebbc351a1640dc4b047b4f71aa134ac7486747e5f62980092b0176e7567f5
@@ -177,6 +178,7 @@ pkgbase = ceph
 	sha512sums = 781a01e622a70d56bf1948bdc0b427ffa95a86cec7dd9d26c6007a9ec024a942a8ca55f2acc3d37344862f1d6bf11cae998d8071754cd841a66bfba4ec9c58bf
 	sha512sums = 2a6f33791760e14543c90077bfc6bf1b6b82ee2996e80b4762eadb887a0d9a67c221b6f10832ddf780dc6abaed246a1e2ee7680c9c861c4ff70e61b752a37b36
 	sha512sums = b2e1f495b57f3ed65b466719faded1713d8155e10b6432b704c632501313b6a98a56461164942cf303427770be0d5efe4798572fe8490ee977bf652906166bde
+	sha512sums = e4703027fccdb18be4255ba087a165e2a780248d8d52f18a776ef7b50f09f312a9e9a0d5832440a19f248b508e4ed4a869c1baa4362923f93a61e9a471760178
 
 pkgname = ceph
 	depends = ceph-libs=17.2.5-5

diff --git a/PKGBUILD b/PKGBUILD
@@ -91,6 +91,11 @@ source=(
   # fixes an issue with mgr usage of libradossqlite and temp tables,
   # backported from the upstream
   'ceph-18.0.0-mgr-sqlite-pragmas.patch'
+
+  # Fix for upstream bugs in pkgconfig of rdkafka
+  # https://github.com/bazaah/aur-ceph/issues/11
+  # https://github.com/confluentinc/librdkafka/issues/4155
+  'rdkafka.mpatch'
 )
 sha512sums=('10cd3d9eb01c91c148a92f1f7d040bbd78af5bb1ab15d071d93f54b37097dc9e1268eed9e788fe32794d137f6af81abd6a2aeaee39cef44d2c45234a15cc6020'
             '4354001c1abd9a0c385ba7bd529e3638fb6660b6a88d4e49706d4ac21c81b8e829303a20fb5445730bdac18c4865efb10bc809c1cd56d743c12aa9a52e160049'
@@ -106,7 +111,8 @@ sha512sums=('10cd3d9eb01c91c148a92f1f7d040bbd78af5bb1ab15d071d93f54b37097dc9e126
             '81f540c8312972887a7cb43b8a4e29bfc6f24d5774787a4a8edfe65cca7d3b08faa08ecd09066d7ea67111769a5aec7385fe9a969546626f58874dd8aff5b664'
             '781a01e622a70d56bf1948bdc0b427ffa95a86cec7dd9d26c6007a9ec024a942a8ca55f2acc3d37344862f1d6bf11cae998d8071754cd841a66bfba4ec9c58bf'
             '2a6f33791760e14543c90077bfc6bf1b6b82ee2996e80b4762eadb887a0d9a67c221b6f10832ddf780dc6abaed246a1e2ee7680c9c861c4ff70e61b752a37b36'
-            'b2e1f495b57f3ed65b466719faded1713d8155e10b6432b704c632501313b6a98a56461164942cf303427770be0d5efe4798572fe8490ee977bf652906166bde')
+            'b2e1f495b57f3ed65b466719faded1713d8155e10b6432b704c632501313b6a98a56461164942cf303427770be0d5efe4798572fe8490ee977bf652906166bde'
+            'e4703027fccdb18be4255ba087a165e2a780248d8d52f18a776ef7b50f09f312a9e9a0d5832440a19f248b508e4ed4a869c1baa4362923f93a61e9a471760178')
 
 # -fno-plt causes linker errors (undefined reference to internal methods)
 # similar issue: https://bugs.archlinux.org/task/54845
@@ -143,6 +149,9 @@ prepare() {
   # disable/remove broken tests
   sed -i '/add_ceph_test(smoke.sh/d' src/test/CMakeLists.txt
   sed -i '/add_ceph_test(safe-to-destroy.sh/d' src/test/osd/CMakeLists.txt
+
+  mkdir -p "__pkgconfig__"
+  patch /usr/lib/pkgconfig/rdkafka.pc "${srcdir}/rdkafka.mpatch" -o "__pkgconfig__/rdkafka.pc"
 }
 
 build() {
@@ -158,6 +167,7 @@ build() {
   export CXXFLAGS+=" ${CPPFLAGS}"
   export CMAKE_BUILD_TYPE='RelWithDebInfo'
   export CMAKE_WARN_UNUSED_CLI=no
+  export PKG_CONFIG_PATH="$PWD/__pkgconfig__:$(pkg-config --variable pc_path pkg-config)"
 
   cmake \
     -B build \