svn commit: r453086 - in head/devel/py-grpcio: . files

Vanilla I. Shu vanilla at FreeBSD.org
Sun Oct 29 00:10:29 UTC 2017 

Author: vanilla
Date: Sun Oct 29 00:10:26 2017
New Revision: 453086
URL: https://svnweb.freebsd.org/changeset/ports/453086

Log:
  1: Update to 1.7.0.
  2: unbreak on aarch64.
  
  PR:		223019 [2]
  Submitted by:	jbeich@ [2]
  MFH:		2017Q4

Added:
  head/devel/py-grpcio/files/patch-third__party_boringssl_crypto_cpu-aarch64-linux.c   (contents, props changed)
Modified:
  head/devel/py-grpcio/Makefile
  head/devel/py-grpcio/distinfo
  head/devel/py-grpcio/files/patch-setup.py
  head/devel/py-grpcio/files/patch-src_core_tsi_ssl__transport__security.c
  head/devel/py-grpcio/files/patch-src_python_grpcio_grpc__core__dependencies.py
  head/devel/py-grpcio/files/patch-third__party_boringssl_include_openssl_base.h
  head/devel/py-grpcio/files/patch-third__party_boringssl_ssl_CMakeLists.txt

Modified: head/devel/py-grpcio/Makefile
==============================================================================
--- head/devel/py-grpcio/Makefile	Sat Oct 28 23:47:31 2017	(r453085)
+++ head/devel/py-grpcio/Makefile	Sun Oct 29 00:10:26 2017	(r453086)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	grpcio
-PORTVERSION=	1.6.3
+PORTVERSION=	1.7.0
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -18,7 +18,6 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>1:devel/py-six
 		${PYTHON_PKGNAMEPREFIX}futures>=3:devel/py-futures
 LIB_DEPENDS=	libcares.so:dns/c-ares
 
-BROKEN_aarch64=		fails to compile: cpu-aarch64-linux.c: fatal error: 'sys/auxv.h' file not found
 BROKEN_powerpc64=	fails to compile: cpu-ppc64le.c: 'AT_HWCAP2' undeclared
 
 USES=		localbase:ldflags python

Modified: head/devel/py-grpcio/distinfo
==============================================================================
--- head/devel/py-grpcio/distinfo	Sat Oct 28 23:47:31 2017	(r453085)
+++ head/devel/py-grpcio/distinfo	Sun Oct 29 00:10:26 2017	(r453086)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1506586700
-SHA256 (grpcio-1.6.3.tar.gz) = e9662782c58bc21be26163b78136eaed091dfd45fac699cb711ee9eeeb7e2f9b
-SIZE (grpcio-1.6.3.tar.gz) = 9964070
+TIMESTAMP = 1509152129
+SHA256 (grpcio-1.7.0.tar.gz) = 6662af1f07cf7a3d171a7f56afc2cfeff262a5f2c52d15ae5ea581d0c367aea8
+SIZE (grpcio-1.7.0.tar.gz) = 9999425

Modified: head/devel/py-grpcio/files/patch-setup.py
==============================================================================
--- head/devel/py-grpcio/files/patch-setup.py	Sat Oct 28 23:47:31 2017	(r453085)
+++ head/devel/py-grpcio/files/patch-setup.py	Sun Oct 29 00:10:26 2017	(r453086)
@@ -1,4 +1,4 @@
---- setup.py.orig	2017-09-27 21:43:56 UTC
+--- setup.py.orig	2017-10-26 17:03:10 UTC
 +++ setup.py
 @@ -37,13 +37,6 @@ PYTHON_STEM = os.path.join('src', 'pytho
  CORE_INCLUDE = ('include', '.',)
@@ -14,11 +14,11 @@
  README = os.path.join(PYTHON_STEM, 'README.rst')
  
  # Ensure we're in the proper directory whether or not we're being used by pip.
-@@ -141,12 +134,9 @@ CYTHON_EXTENSION_MODULE_NAMES = ('grpc._
+@@ -139,12 +132,9 @@ CYTHON_EXTENSION_MODULE_NAMES = ('grpc._
  CYTHON_HELPER_C_FILES = ()
  
  CORE_C_FILES = tuple(grpc_core_dependencies.CORE_SOURCE_FILES)
--if "win32" in sys.platform and "64bit" in platform.architecture()[0]:
+-if "win32" in sys.platform:
 -  CORE_C_FILES = filter(lambda x: 'third_party/cares' not in x, CORE_C_FILES)
  
  EXTENSION_INCLUDE_DIRECTORIES = (

Modified: head/devel/py-grpcio/files/patch-src_core_tsi_ssl__transport__security.c
==============================================================================
--- head/devel/py-grpcio/files/patch-src_core_tsi_ssl__transport__security.c	Sat Oct 28 23:47:31 2017	(r453085)
+++ head/devel/py-grpcio/files/patch-src_core_tsi_ssl__transport__security.c	Sun Oct 29 00:10:26 2017	(r453086)
@@ -1,4 +1,4 @@
---- src/core/tsi/ssl_transport_security.c.orig	2017-09-27 21:43:56 UTC
+--- src/core/tsi/ssl_transport_security.c.orig	2017-10-26 17:03:10 UTC
 +++ src/core/tsi/ssl_transport_security.c
 @@ -20,6 +20,7 @@
  

Modified: head/devel/py-grpcio/files/patch-src_python_grpcio_grpc__core__dependencies.py
==============================================================================
--- head/devel/py-grpcio/files/patch-src_python_grpcio_grpc__core__dependencies.py	Sat Oct 28 23:47:31 2017	(r453085)
+++ head/devel/py-grpcio/files/patch-src_python_grpcio_grpc__core__dependencies.py	Sun Oct 29 00:10:26 2017	(r453086)
@@ -1,6 +1,6 @@
---- src/python/grpcio/grpc_core_dependencies.py.orig	2017-09-27 21:43:56 UTC
+--- src/python/grpcio/grpc_core_dependencies.py.orig	2017-10-26 17:03:11 UTC
 +++ src/python/grpcio/grpc_core_dependencies.py
-@@ -610,7 +610,6 @@ CORE_SOURCE_FILES = [
+@@ -616,7 +616,6 @@ CORE_SOURCE_FILES = [
    'third_party/boringssl/ssl/ssl_file.c',
    'third_party/boringssl/ssl/ssl_lib.c',
    'third_party/boringssl/ssl/ssl_privkey.c',
@@ -8,7 +8,7 @@
    'third_party/boringssl/ssl/ssl_session.c',
    'third_party/boringssl/ssl/ssl_stat.c',
    'third_party/boringssl/ssl/ssl_transcript.c',
-@@ -638,53 +637,4 @@ CORE_SOURCE_FILES = [
+@@ -644,53 +643,4 @@ CORE_SOURCE_FILES = [
    'third_party/zlib/trees.c',
    'third_party/zlib/uncompr.c',
    'third_party/zlib/zutil.c',

Added: head/devel/py-grpcio/files/patch-third__party_boringssl_crypto_cpu-aarch64-linux.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/py-grpcio/files/patch-third__party_boringssl_crypto_cpu-aarch64-linux.c	Sun Oct 29 00:10:26 2017	(r453086)
@@ -0,0 +1,45 @@
+--- third_party/boringssl/crypto/cpu-aarch64-linux.c.orig	2017-09-27 21:43:59 UTC
++++ third_party/boringssl/crypto/cpu-aarch64-linux.c
+@@ -16,7 +16,42 @@
+ 
+ #if defined(OPENSSL_AARCH64) && !defined(OPENSSL_STATIC_ARMCAP)
+ 
++#if __has_include(<sys/auxv.h>)
+ #include <sys/auxv.h>
++#elif defined(__FreeBSD__)
++#include <sys/param.h>
++#include <sys/sysctl.h>
++#include <elf.h>
++#include <errno.h>
++#include <unistd.h>
++
++#ifndef AT_HWCAP
++#define AT_HWCAP                25
++#endif
++
++static unsigned long getauxval(unsigned long type) {
++  Elf_Auxinfo auxv[AT_COUNT];
++  size_t len = sizeof(auxv);
++  int mib[] = {
++    CTL_KERN,
++    KERN_PROC,
++    KERN_PROC_AUXV,
++    getpid(),
++  };
++
++  if (sysctl(mib, nitems(mib), auxv, &len, NULL, 0) != -1) {
++    for (size_t i = 0; i < nitems(auxv); i++)
++      if ((unsigned long)auxv[i].a_type == type)
++        return auxv[i].a_un.a_val;
++
++    errno = ENOENT;
++  }
++  return 0;
++}
++#else
++#define AT_HWCAP                16
++#define getauxval(x)            0
++#endif /* <sys/auxv.h> */
+ 
+ #include <openssl/arm_arch.h>
+ 

Modified: head/devel/py-grpcio/files/patch-third__party_boringssl_include_openssl_base.h
==============================================================================
--- head/devel/py-grpcio/files/patch-third__party_boringssl_include_openssl_base.h	Sat Oct 28 23:47:31 2017	(r453085)
+++ head/devel/py-grpcio/files/patch-third__party_boringssl_include_openssl_base.h	Sun Oct 29 00:10:26 2017	(r453086)
@@ -1,4 +1,4 @@
---- third_party/boringssl/include/openssl/base.h.orig	2017-09-27 21:43:59 UTC
+--- third_party/boringssl/include/openssl/base.h.orig	2017-10-26 17:03:13 UTC
 +++ third_party/boringssl/include/openssl/base.h
 @@ -328,9 +328,6 @@ typedef void *OPENSSL_BLOCK;
  // MSVC doesn't set __cplusplus to 201103 to indicate C++11 support (see

Modified: head/devel/py-grpcio/files/patch-third__party_boringssl_ssl_CMakeLists.txt
==============================================================================
--- head/devel/py-grpcio/files/patch-third__party_boringssl_ssl_CMakeLists.txt	Sat Oct 28 23:47:31 2017	(r453085)
+++ head/devel/py-grpcio/files/patch-third__party_boringssl_ssl_CMakeLists.txt	Sun Oct 29 00:10:26 2017	(r453086)
@@ -1,4 +1,4 @@
---- third_party/boringssl/ssl/CMakeLists.txt.orig	2017-09-28 08:26:07 UTC
+--- third_party/boringssl/ssl/CMakeLists.txt.orig	2017-10-26 17:03:13 UTC
 +++ third_party/boringssl/ssl/CMakeLists.txt
 @@ -25,7 +25,6 @@ add_library(
    ssl_file.c

More information about the svn-ports-head mailing list