diff options
| author | kamil <kamil@pkgsrc.org> | 2016-08-06 21:38:45 +0000 |
|---|---|---|
| committer | kamil <kamil@pkgsrc.org> | 2016-08-06 21:38:45 +0000 |
| commit | 8281da42a752d8768e09f2842b3275e94c42dddb (patch) | |
| tree | bb9d1fcef6eff5121c76800df894cf84e8072aac /devel/protobuf | |
| parent | 8969d2d6de044d3572116bedb53a40d9556613eb (diff) | |
| download | pkgsrc-8281da42a752d8768e09f2842b3275e94c42dddb.tar.gz | |
Install patch for protobuf/patches/patch-gmock_configure
Diffstat (limited to 'devel/protobuf')
| -rw-r--r-- | devel/protobuf/distinfo | 4 | ||||
| -rw-r--r-- | devel/protobuf/patches/patch-gmock_configure | 22 | ||||
| -rw-r--r-- | devel/protobuf/patches/patch-gtest_configure | 16 |
3 files changed, 24 insertions, 18 deletions
diff --git a/devel/protobuf/distinfo b/devel/protobuf/distinfo index 6f9f3f31749..a46a663d44a 100644 --- a/devel/protobuf/distinfo +++ b/devel/protobuf/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.7 2016/08/06 11:40:14 kamil Exp $ +$NetBSD: distinfo,v 1.8 2016/08/06 21:38:45 kamil Exp $ SHA1 (protobuf-cpp-3.0.0.tar.gz) = 00140d255922bf33ef3842168954e3269fbba3af RMD160 (protobuf-cpp-3.0.0.tar.gz) = 01a00093e0f7297b3fb7933ef5700d2753109c95 SHA512 (protobuf-cpp-3.0.0.tar.gz) = 72491ab54244b82f69f39bc485336d986d7238cdf62b48c6e02e53412f348f5cc0756a7249f45c32e7ddb37aaa1e1864244543d1414d6ce7dc03be00ef5f27ab Size (protobuf-cpp-3.0.0.tar.gz) = 4075839 bytes -SHA1 (patch-gmock_configure) = 1703fe1d7bedcf0bf810d1e39ce5105275ae8239 +SHA1 (patch-gmock_configure) = 49a4c9301ad4c1973ee7058213df50a7833161f0 SHA1 (patch-gmock_configure.ac) = cfd7b7c87eff4b06ce6ecb34dec046561bbdc113 SHA1 (patch-src_google_protobuf_stubs_atomicops.h) = 6a13cf5597a09f862450916b00d8eae42877b5da SHA1 (patch-src_google_protobuf_stubs_atomicops__internals__arm__gcc.h) = 93cf8135660e945044e5a560a3010e32e660ae6f diff --git a/devel/protobuf/patches/patch-gmock_configure b/devel/protobuf/patches/patch-gmock_configure new file mode 100644 index 00000000000..f515310bd28 --- /dev/null +++ b/devel/protobuf/patches/patch-gmock_configure @@ -0,0 +1,22 @@ +$NetBSD: patch-gmock_configure,v 1.1 2016/08/06 21:38:45 kamil Exp $ + +--- gmock/configure.orig 2016-07-15 19:19:42.000000000 +0000 ++++ gmock/configure +@@ -15761,7 +15761,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + have_pthreads="$acx_pthread_ok" + fi +- if test "x$have_pthreads" == "xyes"; then ++ if test "x$have_pthreads" = "xyes"; then + HAVE_PTHREADS_TRUE= + HAVE_PTHREADS_FALSE='#' + else +@@ -15791,7 +15791,7 @@ else + enable_external_gtest=yes + fi + +-if test "x$with_gtest" == "xno"; then : ++if test "x$with_gtest" = "xno"; then : + as_fn_error $? "Support for GoogleTest was explicitly disabled. Currently GoogleMock has a hard + dependency upon GoogleTest to build, please provide a version, or allow + GoogleMock to use any installed version and fall back upon its internal diff --git a/devel/protobuf/patches/patch-gtest_configure b/devel/protobuf/patches/patch-gtest_configure deleted file mode 100644 index d80d83f2aa3..00000000000 --- a/devel/protobuf/patches/patch-gtest_configure +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-gtest_configure,v 1.3 2015/06/10 01:31:51 wiedi Exp $ - -Fix unportable test(1) construct. -http://code.google.com/p/protobuf/issues/detail?id=483 - ---- gtest/configure.orig 2014-10-22 20:10:24.000000000 +0000 -+++ gtest/configure -@@ -15726,7 +15726,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - have_pthreads="$acx_pthread_ok" - fi -- if test "x$have_pthreads" == "xyes"; then -+ if test "x$have_pthreads" = "xyes"; then - HAVE_PTHREADS_TRUE= - HAVE_PTHREADS_FALSE='#' - else |