diff options
| author | kXuan | 2023-09-06 12:00:44 +0800 |
|---|---|---|
| committer | kXuan | 2023-09-06 12:00:44 +0800 |
| commit | 3a7b9ad32dfd4b878bf02fdb9402d715937fd425 (patch) | |
| tree | feea501b1e8f2ab2560a9f8d084ec0869b429d41 | |
| parent | 9dfb0fdcdb12df7cf77ba5b2b97e99aad04e80ad (diff) | |
| download | aur-3a7b9ad32dfd4b878bf02fdb9402d715937fd425.tar.gz | |
fix build error on linking to protobuf
Signed-off-by: kXuan <kxuanobj@gmail.com>
| -rw-r--r-- | .SRCINFO | 5 | ||||
| -rw-r--r-- | 0001-fix-build-error.patch | 37 | ||||
| -rw-r--r-- | PKGBUILD | 11 |
3 files changed, 49 insertions, 4 deletions
@@ -1,12 +1,15 @@ pkgbase = protoc-gen-grpc-web pkgdesc = Protobuf gRPC compiler for Web Clients pkgver = 1.4.2 - pkgrel = 0 + pkgrel = 1 url = https://github.com/grpc/grpc-web arch = x86_64 license = Apache2 + makedepends = pkg-config depends = protobuf>=3 source = https://github.com/grpc/grpc-web/archive/1.4.2.tar.gz + source = 0001-fix-build-error.patch sha512sums = 7b2ddc7ae9e60ded0f137a16a7bb2ec97a8473e4c946339f8a2cd69a594cbf1f1b9767a0e3e5ae1ed789809b50a944251098a15468bf858be22e5360624f5b0f + sha512sums = SKIP pkgname = protoc-gen-grpc-web diff --git a/0001-fix-build-error.patch b/0001-fix-build-error.patch new file mode 100644 index 000000000000..7d73b01e416d --- /dev/null +++ b/0001-fix-build-error.patch @@ -0,0 +1,37 @@ +From f5ddfee0b5a3228d2a2e337e545ce706474651be Mon Sep 17 00:00:00 2001 +From: kXuan <kxuanobj@gmail.com> +Date: Wed, 6 Sep 2023 11:52:53 +0800 +Subject: [PATCH] fix build error + +Signed-off-by: kXuan <kxuanobj@gmail.com> +--- + javascript/net/grpc/web/generator/Makefile | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/javascript/net/grpc/web/generator/Makefile b/javascript/net/grpc/web/generator/Makefile +index 44b0196..63a0a0a 100644 +--- a/javascript/net/grpc/web/generator/Makefile ++++ b/javascript/net/grpc/web/generator/Makefile +@@ -14,8 +14,8 @@ + + CXX ?= g++ + CPPFLAGS += -I/usr/local/include -pthread +-CXXFLAGS += -std=c++11 +-LDFLAGS += -L/usr/local/lib -lprotoc -lprotobuf -lpthread -ldl ++CXXFLAGS += -std=c++17 ++LDFLAGS += -L/usr/local/lib -lprotoc $(shell pkg-config --libs protobuf) -lpthread -ldl + PREFIX ?= /usr/local + MIN_MACOS_VERSION := 10.7 # Supports OS X Lion + STATIC ?= yes +@@ -32,7 +32,7 @@ endif + all: protoc-gen-grpc-web + + protoc-gen-grpc-web: grpc_generator.o +- $(CXX) $^ $(LDFLAGS) -o $@ ++ $(CXX) $^ -o $@ $(LDFLAGS) + + install: protoc-gen-grpc-web + mkdir -p $(PREFIX)/bin +-- +2.42.0 + @@ -2,15 +2,20 @@ pkgname=protoc-gen-grpc-web pkgver=1.4.2 -pkgrel=0 +pkgrel=1 pkgdesc='Protobuf gRPC compiler for Web Clients' arch=('x86_64') url='https://github.com/grpc/grpc-web' license=('Apache2') depends=('protobuf>=3') -source=("https://github.com/grpc/grpc-web/archive/${pkgver}.tar.gz") -sha512sums=('7b2ddc7ae9e60ded0f137a16a7bb2ec97a8473e4c946339f8a2cd69a594cbf1f1b9767a0e3e5ae1ed789809b50a944251098a15468bf858be22e5360624f5b0f') +makedepends=('pkg-config') +source=("https://github.com/grpc/grpc-web/archive/${pkgver}.tar.gz" "0001-fix-build-error.patch") +sha512sums=('7b2ddc7ae9e60ded0f137a16a7bb2ec97a8473e4c946339f8a2cd69a594cbf1f1b9767a0e3e5ae1ed789809b50a944251098a15468bf858be22e5360624f5b0f' 'SKIP') +prepare() { + cd "grpc-web-$pkgver" + patch --forward --strip=1 --input="${srcdir}/0001-fix-build-error.patch" +} build() { cd "grpc-web-${pkgver}" make STATIC=no plugin |