mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 17:09:10 -07:00
net-libs/grpc: version bump to 1.13.0
Fix protobuf plugins not respecting CFLAGS Package-Manager: Portage-2.3.41, Repoman-2.3.9
This commit is contained in:
Georgy Yakovlev
@@ -1,3 +1,4 @@
|
||||
DIST grpc-1.12.0.tar.gz 13692310 BLAKE2B 86b9063416140453718c51df4f238bb3d5ac8549ece065c95d3c461c069358badec5a9a77aef694cd11a09f53e060f9ea51f3b40d9a2424837605c4899a21c57 SHA512 68a8c261ea570790974769d6c0ca8138cf4242b79e9ff74a11b10d35a27f98ff24c03f3d05932ac46811c0ba7d1a094388ae8dbeb495fc8e723ad74695994d49
|
||||
DIST grpc-1.12.1.tar.gz 13692045 BLAKE2B d35706b553917d0f27e4474509f361ec7962b738031f11ca814d7ec33429f848b3b3356cae9a28b9a0cb376df5a6348d312c80ed4eeb51b81e68b317584a2e4a SHA512 9dd6d8c4b4e2713cf27ed55b1e97fdf5ed6d80f43b798b83f08e2f4646387dfd0696b21d4f44dbd99a061d388790dc15da49ac5afb0bb06116cfd6f07b7d6962
|
||||
DIST grpc-1.13.0.tar.gz 13755973 BLAKE2B 533f0a7d4eb606b8a55f12aade503285dbff2cfa29ff2af71d407e3df25f3ec4b7572335c455d5dd0069eb343f18f8641a4f9326065cc118922942f77d2d2403 SHA512 25a489cd67d12219696c397afa75282eb702bd0af418381990b2eeb4b56483a46276d05314710582dd17be04c80aaf9bb16e01e2c1729d9a59d84ff273baa254
|
||||
DIST protobuf-3.5.2.tar.gz 4584659 BLAKE2B f582212169d802a5844574eb900c9f8cbb343b7e73f2074e5ff0bfc544ebd13f4bc2b78271fb70f4465d78fdc39972ed68339f453c0d3ffe98d8564fbf520544 SHA512 09d10cf0c07a0ba249428bbf20f5dbed840965fa06b3c09682f286a4dee9d84bb96f3b5b50e993d48ef1f20440531255ce7d0e60a648bf3fe536a5f2b0b74181
|
||||
|
||||
@@ -0,0 +1,47 @@
|
||||
From 7e2d98df390787797fa494b26c72896f16f6e2a6 Mon Sep 17 00:00:00 2001
|
||||
From: Georgy Yakovlev <gyakovlev@gentoo.org>
|
||||
Date: Sat, 30 Jun 2018 00:21:53 -0700
|
||||
Subject: [PATCH] Makefile: fix host ar handling
|
||||
|
||||
Cherry picked lines from
|
||||
https://github.com/grpc/grpc/pull/11476
|
||||
---
|
||||
Makefile | 6 ++++--
|
||||
1 file changed, 4 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 8333858588..b5a44b7096 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -328,6 +328,7 @@ HOST_CC ?= $(CC)
|
||||
HOST_CXX ?= $(CXX)
|
||||
HOST_LD ?= $(LD)
|
||||
HOST_LDXX ?= $(LDXX)
|
||||
+HOST_AR ?= $(AR)
|
||||
|
||||
CFLAGS += -std=c99 -Wsign-conversion -Wconversion $(W_SHADOW) $(W_EXTRA_SEMI)
|
||||
CXXFLAGS += -std=c++11
|
||||
@@ -444,6 +445,7 @@ HOST_CFLAGS = $(CFLAGS)
|
||||
HOST_CXXFLAGS = $(CXXFLAGS)
|
||||
HOST_LDFLAGS = $(LDFLAGS)
|
||||
HOST_LDLIBS = $(LDLIBS)
|
||||
+HOST_AROPTS = $(AROPTS)
|
||||
|
||||
# These are automatically computed variables.
|
||||
# There shouldn't be any need to change anything from now on.
|
||||
@@ -6886,10 +6888,10 @@ $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a: protobuf_dep_error
|
||||
else
|
||||
|
||||
$(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBGRPC_PLUGIN_SUPPORT_OBJS)
|
||||
- $(E) "[AR] Creating $@"
|
||||
+ $(E) "[HOSTAR] Creating $@"
|
||||
$(Q) mkdir -p `dirname $@`
|
||||
$(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a
|
||||
- $(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a $(LIBGRPC_PLUGIN_SUPPORT_OBJS)
|
||||
+ $(Q) $(HOST_AR) $(HOST_AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a $(LIBGRPC_PLUGIN_SUPPORT_OBJS)
|
||||
ifeq ($(SYSTEM),Darwin)
|
||||
$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a
|
||||
endif
|
||||
--
|
||||
2.18.0
|
||||
|
||||
171
net-libs/grpc/grpc-1.13.0.ebuild
Normal file
171
net-libs/grpc/grpc-1.13.0.ebuild
Normal file
@@ -0,0 +1,171 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
|
||||
DISTUTILS_OPTIONAL=1
|
||||
|
||||
inherit distutils-r1 flag-o-matic toolchain-funcs
|
||||
|
||||
# should match pinned git submodule version of third_party/protobuf
|
||||
# look it up here https://github.com/grpc/grpc/tree/v"${PV}"/third_party
|
||||
# also should ~depend on same version of dev-libs/protobuf below
|
||||
PROTOBUF_VERSION="3.5.2"
|
||||
|
||||
DESCRIPTION="Modern open source high performance RPC framework"
|
||||
HOMEPAGE="http://www.grpc.io"
|
||||
SRC_URI="
|
||||
https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
|
||||
tools? ( https://github.com/google/protobuf/archive/v${PROTOBUF_VERSION}.tar.gz -> protobuf-${PROTOBUF_VERSION}.tar.gz )
|
||||
"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="examples doc python systemtap static-libs tools"
|
||||
|
||||
REQUIRED_USE="
|
||||
python? ( ${PYTHON_REQUIRED_USE} )
|
||||
tools? ( python )
|
||||
"
|
||||
|
||||
RDEPEND="
|
||||
>=dev-libs/openssl-1.0.2:0=[-bindist]
|
||||
~dev-libs/protobuf-${PROTOBUF_VERSION}:=
|
||||
dev-util/google-perftools
|
||||
net-dns/c-ares:=
|
||||
sys-libs/zlib:=
|
||||
python? ( ${PYTHON_DEPS}
|
||||
dev-python/coverage[${PYTHON_USEDEP}]
|
||||
dev-python/cython[${PYTHON_USEDEP}]
|
||||
>=dev-python/protobuf-python-3.5.1:=[${PYTHON_USEDEP}]
|
||||
dev-python/six[${PYTHON_USEDEP}]
|
||||
dev-python/wheel[${PYTHON_USEDEP}]
|
||||
virtual/python-enum34[${PYTHON_USEDEP}]
|
||||
virtual/python-futures[${PYTHON_USEDEP}]
|
||||
)
|
||||
systemtap? ( dev-util/systemtap )
|
||||
"
|
||||
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/pkgconfig
|
||||
doc? (
|
||||
python? (
|
||||
dev-python/sphinx[${PYTHON_USEDEP}]
|
||||
dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
|
||||
)
|
||||
)
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/0001-grpc-1.13.0-fix-host-ar-handling.patch"
|
||||
"${FILESDIR}/0002-grpc-1.3.0-Fix-unsecure-.pc-files.patch"
|
||||
"${FILESDIR}/0003-grpc-1.3.0-Don-t-run-ldconfig.patch"
|
||||
"${FILESDIR}/0004-grpc-1.11.0-fix-cpp-so-version.patch"
|
||||
"${FILESDIR}/0005-grpc-1.11.0-pkgconfig-libdir.patch"
|
||||
"${FILESDIR}/0009-grpc-1.12.1-gcc8-fixes.patch"
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
sed -i 's@$(prefix)/lib@$(prefix)/$(INSTALL_LIBDIR)@g' Makefile || die "fix libdir"
|
||||
default
|
||||
use python && distutils-r1_src_prepare
|
||||
}
|
||||
|
||||
python_prepare() {
|
||||
if use tools; then
|
||||
rm -r third_party/protobuf || die "removing empty protobuf dir failed"
|
||||
ln -s "${S}"/../protobuf-"${PROTOBUF_VERSION}" third_party/protobuf || die
|
||||
pushd tools/distrib/python/grpcio_tools >/dev/null || die
|
||||
# absolute symlinks will fail
|
||||
# ./src -> ${S}/src
|
||||
ln -s ../../../../src ./ || die
|
||||
# ./third_party -> ${S}/third_party
|
||||
ln -s ../../../../third_party ./ || die
|
||||
# ./grpc_root -> ${S}
|
||||
ln -s ../../../../ ./grpc_root || die
|
||||
popd >/dev/null || die
|
||||
fi
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
tc-export CC CXX PKG_CONFIG
|
||||
|
||||
emake \
|
||||
V=1 \
|
||||
prefix=/usr \
|
||||
INSTALL_LIBDIR="$(get_libdir)" \
|
||||
AR="$(tc-getAR)" \
|
||||
AROPTS="rcs" \
|
||||
CFLAGS="${CFLAGS}" \
|
||||
CXXFLAGS="${CXXFLAGS}" \
|
||||
LD="${CC}" \
|
||||
LDXX="${CXX}" \
|
||||
STRIP=/bin/true \
|
||||
HOST_CC="$(tc-getBUILD_CC)" \
|
||||
HOST_CXX="$(tc-getBUILD_CXX)" \
|
||||
HOST_LD="$(tc-getBUILD_CC)" \
|
||||
HOST_LDXX="$(tc-getBUILD_CXX)" \
|
||||
HOST_AR="$(tc-getBUILD_AR)" \
|
||||
HAS_SYSTEMTAP="$(usex systemtap true false)"
|
||||
|
||||
use python && distutils-r1_src_compile
|
||||
}
|
||||
|
||||
python_compile() {
|
||||
export GRPC_PYTHON_BUILD_SYSTEM_CARES=1
|
||||
export GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=1
|
||||
export GRPC_PYTHON_BUILD_SYSTEM_ZLIB=1
|
||||
export GRPC_PYTHON_BUILD_WITH_CYTHON=1
|
||||
distutils-r1_python_compile
|
||||
|
||||
if use tools; then
|
||||
pushd tools/distrib/python/grpcio_tools >/dev/null || die
|
||||
distutils-r1_python_compile
|
||||
popd >/dev/null || die
|
||||
fi
|
||||
}
|
||||
|
||||
python_compile_all() {
|
||||
if use doc; then
|
||||
esetup.py doc
|
||||
mv doc/build doc/html || die
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake \
|
||||
prefix="${D}"/usr \
|
||||
INSTALL_LIBDIR="$(get_libdir)" \
|
||||
STRIP=/bin/true \
|
||||
install
|
||||
|
||||
use static-libs || find "${ED}" -name '*.a' -delete
|
||||
|
||||
if use examples; then
|
||||
find examples -name '.gitignore' -delete || die
|
||||
dodoc -r examples
|
||||
docompress -x /usr/share/doc/${PF}/examples
|
||||
fi
|
||||
|
||||
if use doc; then
|
||||
find doc -name '.gitignore' -delete || die
|
||||
local DOCS=( AUTHORS README.md doc/. )
|
||||
fi
|
||||
|
||||
einstalldocs
|
||||
|
||||
use python && distutils-r1_src_install
|
||||
|
||||
}
|
||||
|
||||
python_install() {
|
||||
distutils-r1_python_install
|
||||
|
||||
if use tools; then
|
||||
pushd tools/distrib/python/grpcio_tools >/dev/null || die
|
||||
distutils-r1_python_install
|
||||
popd >/dev/null || die
|
||||
fi
|
||||
}
|
||||
Reference in New Issue
Block a user