author | Antonio Rojas
<arojas@archlinux.org> 2023-07-05 11:47:48 UTC |
committer | Antonio Rojas
<arojas@archlinux.org> 2023-07-05 11:47:48 UTC |
parent | 9713275fe277853b05876a6c43faedef9973a4bf |
PKGBUILD | +3 | -1 |
protobuf-23.patch | +1 | -2 |
diff --git a/PKGBUILD b/PKGBUILD index e2227d1..b8691e1 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -15,7 +15,7 @@ makedepends=(gtest cmake go ninja git) source=(https://github.com/nmeum/android-tools/releases/download/$_tag/android-tools-$_tag.tar.xz protobuf-23.patch) sha256sums=('60234ecbca19a17a7e2f46a4581960d645b7c55b870d924a21494c76a6f548ec' - '4de4a9951a2748b2816514c66d326488bf65d89cff0af94962a6f9ee4f450462') + '2b39c68197584fa7b9c06de0b5f27a8bdddb61fa7f245ca02d6fd9cef5d40346') prepare() { cd android-tools-$_tag @@ -30,6 +30,8 @@ build() { -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ + -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON \ + -Dprotobuf_MODULE_COMPATIBLE=ON \ -G Ninja -S . -B build cmake --build build } diff --git a/protobuf-23.patch b/protobuf-23.patch index 517fcf5..053b5bc 100644 --- a/protobuf-23.patch +++ b/protobuf-23.patch @@ -1,9 +1,8 @@ --- android-tools-34.0.1.orig/vendor/CMakeLists.txt 2023-06-28 23:15:15.544237905 +0200 +++ android-tools-34.0.1/vendor/CMakeLists.txt 2023-06-28 23:45:28.672277935 +0200 -@@ -73,6 +73,8 @@ +@@ -73,6 +73,7 @@ pkg_check_modules(libzstd REQUIRED IMPORTED_TARGET libzstd) -+find_package(Protobuf CONFIG REQUIRED) find_package(Protobuf REQUIRED) +set(PROTOBUF_LIBRARIES protobuf::libprotobuf) set(THREADS_PREFER_PTHREAD_FLAG ON)