From ce6ce5508f8a60fe016584cd52ed148432fcf3e0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Thu, 21 Jul 2016 01:05:35 +0300 Subject: [PATCH] fix includes path to avoid hack --- includes.patch | 15 +++++++++++++++ php-pecl-grpc.spec | 5 +++-- 2 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 includes.patch diff --git a/includes.patch b/includes.patch new file mode 100644 index 0000000..14e2ccc --- /dev/null +++ b/includes.patch @@ -0,0 +1,15 @@ +--- grpc-0.15.0/config.m4~ 2016-06-28 02:33:35.000000000 +0300 ++++ grpc-0.15.0/config.m4 2016-07-20 22:29:20.633876591 +0300 +@@ -5,9 +5,9 @@ + dnl Write more examples of tests here... + + dnl # --with-grpc -> add include path +- PHP_ADD_INCLUDE(../../grpc/include) +- PHP_ADD_INCLUDE(../../grpc/src/php/ext/grpc) +- PHP_ADD_INCLUDE(../../grpc/third_party/boringssl/include) ++ PHP_ADD_INCLUDE(include) ++ PHP_ADD_INCLUDE(src/php/ext/grpc) ++ PHP_ADD_INCLUDE(third_party/boringssl/include) + + LIBS="-lpthread $LIBS" + diff --git a/php-pecl-grpc.spec b/php-pecl-grpc.spec index daa37f9..b0a7737 100644 --- a/php-pecl-grpc.spec +++ b/php-pecl-grpc.spec @@ -15,6 +15,7 @@ License: BSD Group: Development/Languages/PHP Source0: http://pecl.php.net/get/%{modname}-%{version}.tgz # Source0-md5: ba80ec5aa995d7b9e3df7d6d299bbd4b +Patch0: includes.patch URL: http://pecl.php.net/package/grpc/ %{?with_tests:BuildRequires: %{php_name}-cli} BuildRequires: %{php_name}-devel >= 4:5.5 @@ -37,12 +38,12 @@ clients and servers using any combination of the supported languages. %prep %setup -qc mv %{modname}-%{version}/* . +%patch0 -p1 %build phpize %configure -%{__make} \ - EXTRA_INCLUDES="-I include/ -I src/php/ext/grpc/ -I third_party/boringssl/include/" +%{__make} %if %{with tests} # simple module load test -- 2.44.0