pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/devel {py-, }protobuf: don't share the patches directory



details:   https://anonhg.NetBSD.org/pkgsrc/rev/4e4f26e7c234
branches:  trunk
changeset: 317486:4e4f26e7c234
user:      markd <markd%pkgsrc.org@localhost>
date:      Tue Jan 08 05:56:19 2019 +0000

description:
{py-,}protobuf: don't share the patches directory
some patches only apply to py-protobuf.

diffstat:

 devel/protobuf/Makefile.common                                                        |    4 +-
 devel/protobuf/distinfo                                                               |    7 +-
 devel/protobuf/patches/patch-python_google_protobuf_pyext_descriptor.cc               |   15 -
 devel/protobuf/patches/patch-python_google_protobuf_pyext_descriptor_containers.cc    |   15 -
 devel/protobuf/patches/patch-python_google_protobuf_pyext_descriptor_pool.cc          |   15 -
 devel/protobuf/patches/patch-python_google_protobuf_pyext_extension_dict.cc           |   15 -
 devel/protobuf/patches/patch-python_google_protobuf_pyext_message.cc                  |   22 -
 devel/py-protobuf/Makefile                                                            |    5 +-
 devel/py-protobuf/patches/patch-configure                                             |  183 ++++++++++
 devel/py-protobuf/patches/patch-configure.ac                                          |   15 +
 devel/py-protobuf/patches/patch-m4_acx__check__suncc.m4                               |   15 +
 devel/py-protobuf/patches/patch-python_google_protobuf_pyext_descriptor.cc            |   15 +
 devel/py-protobuf/patches/patch-python_google_protobuf_pyext_descriptor_containers.cc |   15 +
 devel/py-protobuf/patches/patch-python_google_protobuf_pyext_descriptor_pool.cc       |   15 +
 devel/py-protobuf/patches/patch-python_google_protobuf_pyext_extension_dict.cc        |   15 +
 devel/py-protobuf/patches/patch-python_google_protobuf_pyext_message.cc               |   22 +
 devel/py-protobuf/patches/patch-src_google_protobuf_message__lite.cc                  |   14 +
 devel/py-protobuf/patches/patch-third__party_googletest_googlemock_configure          |   24 +
 devel/py-protobuf/patches/patch-third__party_googletest_googlemock_configure.ac       |   24 +
 19 files changed, 362 insertions(+), 93 deletions(-)

diffs (truncated from 558 to 300 lines):

diff -r fbcafce54ef3 -r 4e4f26e7c234 devel/protobuf/Makefile.common
--- a/devel/protobuf/Makefile.common    Tue Jan 08 03:57:16 2019 +0000
+++ b/devel/protobuf/Makefile.common    Tue Jan 08 05:56:19 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.12 2019/01/06 11:21:06 markd Exp $
+# $NetBSD: Makefile.common,v 1.13 2019/01/08 05:56:19 markd Exp $
 #
 # used by devel/protobuf/Makefile
 # used by devel/py-protobuf/Makefile
@@ -14,5 +14,3 @@
 LICENSE=       modified-bsd
 
 WRKSRC=                ${WRKDIR}/protobuf-${PKGVERSION_NOREV}
-
-PATCHDIR=      ${.CURDIR}/../../devel/protobuf/patches
diff -r fbcafce54ef3 -r 4e4f26e7c234 devel/protobuf/distinfo
--- a/devel/protobuf/distinfo   Tue Jan 08 03:57:16 2019 +0000
+++ b/devel/protobuf/distinfo   Tue Jan 08 05:56:19 2019 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.21 2019/01/06 11:21:06 markd Exp $
+$NetBSD: distinfo,v 1.22 2019/01/08 05:56:19 markd Exp $
 
 SHA1 (protobuf-cpp-3.6.1.tar.gz) = 0595bb8c2447ebd13bec4818f99fa8faa8c8b8c5
 RMD160 (protobuf-cpp-3.6.1.tar.gz) = b8b80a6c7150ead6acde8285b4462957cf2c2cd3
@@ -7,11 +7,6 @@
 SHA1 (patch-configure) = a35883ff62ba1db429a6cbc12b75714e78e28abf
 SHA1 (patch-configure.ac) = 208a5ce72905aa95ad73ee0f751d4a58f0c37f5f
 SHA1 (patch-m4_acx__check__suncc.m4) = faf96ee5d305c08d30e7c7d3578896971983e1dd
-SHA1 (patch-python_google_protobuf_pyext_descriptor.cc) = 32f3ddb90d3b52dd4b6919ec75047dcd2906a218
-SHA1 (patch-python_google_protobuf_pyext_descriptor_containers.cc) = 6aed9e2a5b5803fdecaf0d5a49a48ef219b5ca1f
-SHA1 (patch-python_google_protobuf_pyext_descriptor_pool.cc) = 9fe51dfd39f1e3af202a4cff586947b4ec8475a5
-SHA1 (patch-python_google_protobuf_pyext_extension_dict.cc) = 6fff247e007e7856442480600f98507712c80c69
-SHA1 (patch-python_google_protobuf_pyext_message.cc) = 30faea1052e097d976430e2224c97e98cadb5e75
 SHA1 (patch-src_google_protobuf_message__lite.cc) = 8f2ffe07b2710de5365148153978ad6d9939f522
 SHA1 (patch-third__party_googletest_googlemock_configure) = fe3b812e819130d87d99316144507d2454461cd1
 SHA1 (patch-third__party_googletest_googlemock_configure.ac) = dc06fc7aebaef02df536458e45f77386cc857261
diff -r fbcafce54ef3 -r 4e4f26e7c234 devel/protobuf/patches/patch-python_google_protobuf_pyext_descriptor.cc
--- a/devel/protobuf/patches/patch-python_google_protobuf_pyext_descriptor.cc   Tue Jan 08 03:57:16 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-python_google_protobuf_pyext_descriptor.cc,v 1.1 2019/01/06 11:21:06 markd Exp $
-
-python3.7 fixes
-
---- python/google/protobuf/pyext/descriptor.cc.orig    2018-07-30 22:16:10.000000000 +0000
-+++ python/google/protobuf/pyext/descriptor.cc
-@@ -56,7 +56,7 @@
-   #endif
-   #define PyString_AsStringAndSize(ob, charpp, sizep) \
-     (PyUnicode_Check(ob)? \
--       ((*(charpp) = PyUnicode_AsUTF8AndSize(ob, (sizep))) == NULL? -1: 0): \
-+       ((*(charpp) = const_cast<char*>(PyUnicode_AsUTF8AndSize(ob, (sizep)))) == NULL? -1: 0): \
-        PyBytes_AsStringAndSize(ob, (charpp), (sizep)))
- #endif
- 
diff -r fbcafce54ef3 -r 4e4f26e7c234 devel/protobuf/patches/patch-python_google_protobuf_pyext_descriptor_containers.cc
--- a/devel/protobuf/patches/patch-python_google_protobuf_pyext_descriptor_containers.cc        Tue Jan 08 03:57:16 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-python_google_protobuf_pyext_descriptor_containers.cc,v 1.1 2019/01/06 11:21:06 markd Exp $
-
-python3.7 fixes 
-
---- python/google/protobuf/pyext/descriptor_containers.cc.orig 2018-07-30 22:16:10.000000000 +0000
-+++ python/google/protobuf/pyext/descriptor_containers.cc
-@@ -66,7 +66,7 @@
-   #endif
-   #define PyString_AsStringAndSize(ob, charpp, sizep) \
-     (PyUnicode_Check(ob)? \
--       ((*(charpp) = PyUnicode_AsUTF8AndSize(ob, (sizep))) == NULL? -1: 0): \
-+       ((*(charpp) = const_cast<char*>(PyUnicode_AsUTF8AndSize(ob, (sizep)))) == NULL? -1: 0): \
-        PyBytes_AsStringAndSize(ob, (charpp), (sizep)))
- #endif
- 
diff -r fbcafce54ef3 -r 4e4f26e7c234 devel/protobuf/patches/patch-python_google_protobuf_pyext_descriptor_pool.cc
--- a/devel/protobuf/patches/patch-python_google_protobuf_pyext_descriptor_pool.cc      Tue Jan 08 03:57:16 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-python_google_protobuf_pyext_descriptor_pool.cc,v 1.1 2019/01/06 11:21:06 markd Exp $
-
-python3.7 fixes 
-
---- python/google/protobuf/pyext/descriptor_pool.cc.orig       2018-07-30 22:16:10.000000000 +0000
-+++ python/google/protobuf/pyext/descriptor_pool.cc
-@@ -48,7 +48,7 @@
-   #endif
-   #define PyString_AsStringAndSize(ob, charpp, sizep) \
-     (PyUnicode_Check(ob)? \
--       ((*(charpp) = PyUnicode_AsUTF8AndSize(ob, (sizep))) == NULL? -1: 0): \
-+       ((*(charpp) = const_cast<char*>(PyUnicode_AsUTF8AndSize(ob, (sizep)))) == NULL? -1: 0): \
-        PyBytes_AsStringAndSize(ob, (charpp), (sizep)))
- #endif
- 
diff -r fbcafce54ef3 -r 4e4f26e7c234 devel/protobuf/patches/patch-python_google_protobuf_pyext_extension_dict.cc
--- a/devel/protobuf/patches/patch-python_google_protobuf_pyext_extension_dict.cc       Tue Jan 08 03:57:16 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-python_google_protobuf_pyext_extension_dict.cc,v 1.1 2019/01/06 11:21:06 markd Exp $
-
-python3.7 fixes 
-
---- python/google/protobuf/pyext/extension_dict.cc.orig        2018-07-30 22:16:10.000000000 +0000
-+++ python/google/protobuf/pyext/extension_dict.cc
-@@ -53,7 +53,7 @@
-   #endif
-   #define PyString_AsStringAndSize(ob, charpp, sizep) \
-     (PyUnicode_Check(ob)? \
--       ((*(charpp) = PyUnicode_AsUTF8AndSize(ob, (sizep))) == NULL? -1: 0): \
-+       ((*(charpp) = const_cast<char*>(PyUnicode_AsUTF8AndSize(ob, (sizep)))) == NULL? -1: 0): \
-        PyBytes_AsStringAndSize(ob, (charpp), (sizep)))
- #endif
- 
diff -r fbcafce54ef3 -r 4e4f26e7c234 devel/protobuf/patches/patch-python_google_protobuf_pyext_message.cc
--- a/devel/protobuf/patches/patch-python_google_protobuf_pyext_message.cc      Tue Jan 08 03:57:16 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-$NetBSD: patch-python_google_protobuf_pyext_message.cc,v 1.1 2019/01/06 11:21:06 markd Exp $
-
---- python/google/protobuf/pyext/message.cc.orig       2018-07-30 22:16:10.000000000 +0000
-+++ python/google/protobuf/pyext/message.cc
-@@ -79,7 +79,7 @@
-     (PyUnicode_Check(ob)? PyUnicode_AsUTF8(ob): PyBytes_AsString(ob))
-   #define PyString_AsStringAndSize(ob, charpp, sizep) \
-     (PyUnicode_Check(ob)? \
--       ((*(charpp) = PyUnicode_AsUTF8AndSize(ob, (sizep))) == NULL? -1: 0): \
-+       ((*(charpp) = const_cast<char*>(PyUnicode_AsUTF8AndSize(ob, (sizep)))) == NULL? -1: 0): \
-        PyBytes_AsStringAndSize(ob, (charpp), (sizep)))
-   #endif
- #endif
-@@ -1529,7 +1529,7 @@ PyObject* HasField(CMessage* self, PyObj
-     return NULL;
-   }
- #else
--  field_name = PyUnicode_AsUTF8AndSize(arg, &size);
-+  field_name = const_cast<char*>(PyUnicode_AsUTF8AndSize(arg, &size));
-   if (!field_name) {
-     return NULL;
-   }
diff -r fbcafce54ef3 -r 4e4f26e7c234 devel/py-protobuf/Makefile
--- a/devel/py-protobuf/Makefile        Tue Jan 08 03:57:16 2019 +0000
+++ b/devel/py-protobuf/Makefile        Tue Jan 08 05:56:19 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2019/01/06 11:21:06 markd Exp $
+# $NetBSD: Makefile,v 1.16 2019/01/08 05:56:19 markd Exp $
 
 .include "../../devel/protobuf/Makefile.common"
 
@@ -9,7 +9,8 @@
 MAINTAINER=    khorben%defora.org@localhost
 COMMENT=       Python bindings for protobuf
 
-USE_LANGUAGES+=        c c++
+USE_LANGUAGES+=        c c++11
+CFLAGS+=       -std=c++11      # NetBSD complains without this
 
 PYSETUPSUBDIR= python
 PYSETUPBUILDARGS=      --cpp_implementation
diff -r fbcafce54ef3 -r 4e4f26e7c234 devel/py-protobuf/patches/patch-configure
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/py-protobuf/patches/patch-configure Tue Jan 08 05:56:19 2019 +0000
@@ -0,0 +1,183 @@
+$NetBSD: patch-configure,v 1.1 2019/01/08 05:56:19 markd Exp $
+
+Fix unportable test(1) operator.
+
+--- configure.orig     2018-06-06 19:44:06.000000000 +0000
++++ configure
+@@ -787,7 +787,6 @@ infodir
+ docdir
+ oldincludedir
+ includedir
+-runstatedir
+ localstatedir
+ sharedstatedir
+ sysconfdir
+@@ -882,7 +881,6 @@ datadir='${datarootdir}'
+ sysconfdir='${prefix}/etc'
+ sharedstatedir='${prefix}/com'
+ localstatedir='${prefix}/var'
+-runstatedir='${localstatedir}/run'
+ includedir='${prefix}/include'
+ oldincludedir='/usr/include'
+ docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
+@@ -1135,15 +1133,6 @@ do
+   | -silent | --silent | --silen | --sile | --sil)
+     silent=yes ;;
+ 
+-  -runstatedir | --runstatedir | --runstatedi | --runstated \
+-  | --runstate | --runstat | --runsta | --runst | --runs \
+-  | --run | --ru | --r)
+-    ac_prev=runstatedir ;;
+-  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+-  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+-  | --run=* | --ru=* | --r=*)
+-    runstatedir=$ac_optarg ;;
+-
+   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
+     ac_prev=sbindir ;;
+   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
+@@ -1281,7 +1270,7 @@ fi
+ for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
+               datadir sysconfdir sharedstatedir localstatedir includedir \
+               oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
+-              libdir localedir mandir runstatedir
++              libdir localedir mandir
+ do
+   eval ac_val=\$$ac_var
+   # Remove trailing slashes.
+@@ -1434,7 +1423,6 @@ Fine tuning of the installation director
+   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
+   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
+   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+-  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
+   --libdir=DIR            object code libraries [EPREFIX/lib]
+   --includedir=DIR        C header files [PREFIX/include]
+   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
+@@ -7600,7 +7588,7 @@ fi
+ fi
+ 
+   case $host_os in
+-    *solaris*)
++    *notsolaris*)
+       for ac_prog in isainfo
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+@@ -8796,7 +8784,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu 
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+-netbsd* | netbsdelf*-gnu)
++netbsd*)
+   if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+     lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+   else
+@@ -12231,9 +12219,6 @@ $as_echo_n "checking whether the $compil
+   openbsd* | bitrig*)
+     with_gnu_ld=no
+     ;;
+-  linux* | k*bsd*-gnu | gnu*)
+-    link_all_deplibs=no
+-    ;;
+   esac
+ 
+   ld_shlibs=yes
+@@ -12488,7 +12473,7 @@ _LT_EOF
+       fi
+       ;;
+ 
+-    netbsd* | netbsdelf*-gnu)
++    netbsd*)
+       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+       archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+       wlarc=
+@@ -13158,7 +13143,6 @@ $as_echo "$lt_cv_irix_exported_symbol" >
+       if test yes = "$lt_cv_irix_exported_symbol"; then
+           archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` 
$wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
+       fi
+-      link_all_deplibs=no
+       else
+       archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o 
$lib'
+       archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry 
$output_objdir/so_locations -exports_file $export_symbols -o $lib'
+@@ -13180,7 +13164,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >
+       esac
+       ;;
+ 
+-    netbsd* | netbsdelf*-gnu)
++    netbsd*)
+       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+       archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+       else
+@@ -14295,18 +14279,6 @@ fi
+   dynamic_linker='GNU/Linux ld.so'
+   ;;
+ 
+-netbsdelf*-gnu)
+-  version_type=linux
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=no
+-  hardcode_into_libs=yes
+-  dynamic_linker='NetBSD ld.elf_so'
+-  ;;
+-
+ netbsd*)
+   version_type=sunos
+   need_lib_prefix=no
+@@ -17201,7 +17173,7 @@ lt_prog_compiler_static_CXX=
+           ;;
+       esac
+       ;;
+-      netbsd* | netbsdelf*-gnu)
++      netbsd*)
+       ;;
+       *qnx* | *nto*)
+         # QNX uses GNU C++, but need to define -shared option too, otherwise
+@@ -17576,9 +17548,6 @@ $as_echo_n "checking whether the $compil
+       ;;



Home | Main Index | Thread Index | Old Index