mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2025-02-06 23:47:10 +00:00
extra/protobuf to 28.0-2
This commit is contained in:
Kevin Mihelich
parent
af90546793
commit
6cca654d3c
3 changed files with 41 additions and 13 deletions
|
|
@ -1,10 +1,10 @@
|
|||
pkgbase = protobuf
|
||||
pkgdesc = Protocol Buffers - Google's data interchange format
|
||||
pkgver = 27.3
|
||||
pkgver = 28.0
|
||||
pkgrel = 2
|
||||
url = https://developers.google.com/protocol-buffers/
|
||||
arch = x86_64
|
||||
license = BSD
|
||||
license = BSD-3-Clause
|
||||
checkdepends = python-pytest
|
||||
checkdepends = python-numpy
|
||||
makedepends = bazel
|
||||
|
|
@ -21,11 +21,12 @@ pkgbase = protobuf
|
|||
depends = glibc
|
||||
depends = zlib
|
||||
depends = abseil-cpp
|
||||
source = https://github.com/protocolbuffers/protobuf/archive/v27.3/protobuf-27.3.tar.gz
|
||||
source = https://github.com/protocolbuffers/protobuf/commit/2e62ef1e.patch
|
||||
options = !lto
|
||||
source = https://github.com/protocolbuffers/protobuf/archive/v28.0/protobuf-28.0.tar.gz
|
||||
source = protobuf-fix-build-type-none.patch
|
||||
source = protobuf-25.3-ruby-disable-LTO.patch
|
||||
sha512sums = a3a555f17a069dd4aa0d683d3126915077fe4211ae6532a4947fb76a9eeb1ed7d25d29ada8dc372435a08aad1aa14374d88e92ac7c195510f57609efaf9d341d
|
||||
sha512sums = f42d9bd702abe2c7fc4dcb07d050376287ac60b0b7e2fde0d7a9e9df24a620866bee5fd7de2e3b216095376de47e1fe7443cca74c9a9e85c1a0bc42e8973a280
|
||||
sha512sums = 8745f625ac781f3bbefe9494cbf570143d38aecc1521edef7a52ffb403b8be24df2c71f4f2410b5a5b78a0f3e8a38a7d19be2cf916b1b9125349d2da18262cd1
|
||||
sha512sums = 18bc71031bbcbc3810a9985fa670465040f06a6c104ab8079b56bdfc499bb6cec40805a0cefd455031142490a576dc60aa8000523877ac0353b93558e9beabbd
|
||||
sha512sums = 1ebdea4e533ee0f71baf1b3fe2623ca723b36a08c6b97475ea5996b10aeb6873cf94d9120596ddd1216bd2f6feb991f8c33078e8104008a5078ace5be5431efd
|
||||
|
||||
pkgname = protobuf
|
||||
|
|
@ -36,7 +37,7 @@ pkgname = protobuf
|
|||
|
||||
pkgname = python-protobuf
|
||||
pkgdesc = Python 3 bindings for Google Protocol Buffers
|
||||
depends = protobuf=27.3
|
||||
depends = protobuf=28.0
|
||||
depends = python
|
||||
|
||||
pkgname = ruby-google-protobuf
|
||||
|
|
|
|||
|
|
@ -16,13 +16,13 @@
|
|||
|
||||
pkgbase='protobuf'
|
||||
pkgname=('protobuf' 'ruby-google-protobuf')
|
||||
pkgver=27.3
|
||||
pkgver=28.0
|
||||
pkgrel=2
|
||||
# Note: python-protobuf needs to be updated alongside this package to the same version
|
||||
pkgdesc="Protocol Buffers - Google's data interchange format"
|
||||
arch=('x86_64')
|
||||
url='https://developers.google.com/protocol-buffers/'
|
||||
license=('BSD')
|
||||
license=('BSD-3-Clause')
|
||||
depends=(
|
||||
'gcc-libs'
|
||||
'glibc'
|
||||
|
|
@ -45,16 +45,18 @@ checkdepends=(
|
|||
python-numpy
|
||||
)
|
||||
source=(https://github.com/protocolbuffers/protobuf/archive/v$pkgver/$pkgname-$pkgver.tar.gz
|
||||
https://github.com/protocolbuffers/protobuf/commit/2e62ef1e.patch
|
||||
protobuf-fix-build-type-none.patch
|
||||
$pkgbase-25.3-ruby-disable-LTO.patch) # https://github.com/protocolbuffers/protobuf/issues/11935
|
||||
sha512sums=('a3a555f17a069dd4aa0d683d3126915077fe4211ae6532a4947fb76a9eeb1ed7d25d29ada8dc372435a08aad1aa14374d88e92ac7c195510f57609efaf9d341d'
|
||||
'f42d9bd702abe2c7fc4dcb07d050376287ac60b0b7e2fde0d7a9e9df24a620866bee5fd7de2e3b216095376de47e1fe7443cca74c9a9e85c1a0bc42e8973a280'
|
||||
sha512sums=('8745f625ac781f3bbefe9494cbf570143d38aecc1521edef7a52ffb403b8be24df2c71f4f2410b5a5b78a0f3e8a38a7d19be2cf916b1b9125349d2da18262cd1'
|
||||
'18bc71031bbcbc3810a9985fa670465040f06a6c104ab8079b56bdfc499bb6cec40805a0cefd455031142490a576dc60aa8000523877ac0353b93558e9beabbd'
|
||||
'1ebdea4e533ee0f71baf1b3fe2623ca723b36a08c6b97475ea5996b10aeb6873cf94d9120596ddd1216bd2f6feb991f8c33078e8104008a5078ace5be5431efd')
|
||||
|
||||
options=(!lto)
|
||||
|
||||
_gemname=google-protobuf
|
||||
|
||||
prepare() {
|
||||
patch -d $pkgname-$pkgver -p1 < 2e62ef1e.patch # Fix cmake config compatibility mode
|
||||
patch -d $pkgname-$pkgver -p1 < protobuf-fix-build-type-none.patch # Fix cmake config compatibility mode
|
||||
patch -d $pkgbase-$pkgver -p1 < $pkgbase-25.3-ruby-disable-LTO.patch
|
||||
}
|
||||
|
||||
|
|
|
|||
25
extra/protobuf/protobuf-fix-build-type-none.patch
Normal file
25
extra/protobuf/protobuf-fix-build-type-none.patch
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
From 2e62ef1eaa2e712afc5f87aa2c55d478fe96230d Mon Sep 17 00:00:00 2001
|
||||
From: Antonio Rojas <arojas@archlinux.org>
|
||||
Date: Wed, 5 Jul 2023 13:03:11 +0200
|
||||
Subject: [PATCH] Handle BUILD_TYPE=None in protobuf-module.cmake
|
||||
|
||||
Fixes Protobuf_PROTOC_EXECUTABLE being undefined in that case.
|
||||
---
|
||||
cmake/protobuf-module.cmake.in | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/cmake/protobuf-module.cmake.in b/cmake/protobuf-module.cmake.in
|
||||
index 0bb05e38fad8..e5b2b2e4b3af 100644
|
||||
--- a/cmake/protobuf-module.cmake.in
|
||||
+++ b/cmake/protobuf-module.cmake.in
|
||||
@@ -153,6 +153,10 @@ if(NOT Protobuf_PROTOC_EXECUTABLE AND TARGET protobuf::protoc)
|
||||
get_target_property(Protobuf_PROTOC_EXECUTABLE protobuf::protoc
|
||||
IMPORTED_LOCATION_NOCONFIG)
|
||||
endif()
|
||||
+ if(NOT EXISTS "${Protobuf_PROTOC_EXECUTABLE}")
|
||||
+ get_target_property(Protobuf_PROTOC_EXECUTABLE protobuf::protoc
|
||||
+ IMPORTED_LOCATION_NONE)
|
||||
+ endif()
|
||||
endif()
|
||||
|
||||
# Version info variable
|
||||
Loading…
Reference in a new issue