forked from pool/protobuf
c467dc3b10
- Add upstream patch which fixes build with Bazel 0.22.0. * 0001-remove-PACKAGE_NAME-and-REPOSITORY_NAME-deprecated.patch OBS-URL: https://build.opensuse.org/request/show/679026 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/protobuf?expand=0&rev=70
29 lines
883 B
Diff
29 lines
883 B
Diff
From e94bf13e6e834610bffb8c54a8fb523dc7f9d229 Mon Sep 17 00:00:00 2001
|
|
From: Ittai Zeidman <ittaiz@gmail.com>
|
|
Date: Mon, 21 May 2018 23:48:10 +0300
|
|
Subject: [PATCH] remove PACKAGE_NAME and REPOSITORY_NAME deprecated usage
|
|
(#4650)
|
|
|
|
---
|
|
protobuf.bzl | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/protobuf.bzl b/protobuf.bzl
|
|
index 78f19c62..4226a142 100644
|
|
--- a/protobuf.bzl
|
|
+++ b/protobuf.bzl
|
|
@@ -266,8 +266,8 @@ def internal_gen_well_known_protos_java(srcs):
|
|
Args:
|
|
srcs: the well known protos
|
|
"""
|
|
- root = Label("%s//protobuf_java" % (REPOSITORY_NAME)).workspace_root
|
|
- pkg = PACKAGE_NAME + "/" if PACKAGE_NAME else ""
|
|
+ root = Label("%s//protobuf_java" % (native.repository_name())).workspace_root
|
|
+ pkg = native.package_name() + "/" if native.package_name() else ""
|
|
if root == "":
|
|
include = " -I%ssrc " % pkg
|
|
else:
|
|
--
|
|
2.20.1
|
|
|