SF.net SVN: gar:[25806] csw/mgar/pkg/protobuf/trunk

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Wed Jul 6 16:15:08 CEST 2016 

Revision: 25806
          http://sourceforge.net/p/gar/code/25806
Author:   dmichelsen
Date:     2016-07-06 14:15:07 +0000 (Wed, 06 Jul 2016)
Log Message:
-----------
protobuf/trunk: Update to 3.0.0-beta-3.1

Modified Paths:
--------------
    csw/mgar/pkg/protobuf/trunk/Makefile
    csw/mgar/pkg/protobuf/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/protobuf/trunk/files/0001-Use-PATH_MAX-not-only-for-Sparc-but-also-i386.patch

Modified: csw/mgar/pkg/protobuf/trunk/Makefile
===================================================================
--- csw/mgar/pkg/protobuf/trunk/Makefile	2016-07-06 14:12:27 UTC (rev 25805)
+++ csw/mgar/pkg/protobuf/trunk/Makefile	2016-07-06 14:15:07 UTC (rev 25806)
@@ -8,7 +8,8 @@
 # http://developers.sun.com/solaris/articles/cmp_stlport_libCstd.html
 
 NAME = protobuf
-VERSION = 2.6.1
+#VERSION = 2.6.1
+VERSION = 3.0.0-beta-3.1
 GARTYPE = v2
 define BLURB
 	Protocol Buffers are a way of encoding structured data in an efficient yet
@@ -17,46 +18,45 @@
 endef
 DESCRIPTION = Google Protocol buffers
 MASTER_SITES = https://github.com/google/protobuf/releases/download/v$(VERSION)/
-DISTFILES += $(DISTNAME).tar.bz2
+MASTER_SITES += https://github.com/google/protobuf/archive/
+#DISTFILES += $(DISTNAME).tar.bz2
+#DISTFILES += $(NAME)-cpp-$(VERSION).tar.gz
+DISTFILES += v$(VERSION).tar.gz
 
+PATCHFILES += 0001-Use-PATH_MAX-not-only-for-Sparc-but-also-i386.patch
+
 VENDOR_URL = https://github.com/google/protobuf/
 LICENSE = LICENSE
 
-GARCOMPILER = GNU
-BUILD64 = 1
-CONFIGURE_ARGS += $(DIRPATHS)
+PACKAGES += CSWlibprotobuf-lite10
+SPKG_DESC_CSWlibprotobuf-lite10 = $(DESCRIPTION), libprotobuf-lite.so.10
+PKGFILES_CSWlibprotobuf-lite10 += $(call pkgfiles_lib,libprotobuf-lite.so.10)
+RUNTIME_DEP_PKGS_CSWlibprotobuf-lite10 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibprotobuf-lite10 += CSWlibstdc++6
 
-PYCOMPILE = 1
+PACKAGES += CSWlibprotobuf10
+SPKG_DESC_CSWlibprotobuf10 = $(DESCRIPTION), libprotobuf.so.10
+PKGFILES_CSWlibprotobuf10 += $(call pkgfiles_lib,libprotobuf.so.10)
+RUNTIME_DEP_PKGS_CSWlibprotobuf10 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibprotobuf10 += CSWlibstdc++6
+RUNTIME_DEP_PKGS_CSWlibprotobuf10 += CSWlibz1
 
-PACKAGES += CSWlibprotobuf-lite9
-SPKG_DESC_CSWlibprotobuf-lite9 = $(DESCRIPTION), libprotobuf-lite.so.9
-PKGFILES_CSWlibprotobuf-lite9 += $(call pkgfiles_lib,libprotobuf-lite.so.9)
-RUNTIME_DEP_PKGS_CSWlibprotobuf-lite9 += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWlibprotobuf-lite9 += CSWlibstdc++6
+PACKAGES += CSWlibprotoc10
+SPKG_DESC_CSWlibprotoc10 = $(DESCRIPTION), libprotoc.so.10
+PKGFILES_CSWlibprotoc10 += $(call pkgfiles_lib,libprotoc.so.10)
+RUNTIME_DEP_PKGS_CSWlibprotoc10 += CSWlibprotobuf10
+RUNTIME_DEP_PKGS_CSWlibprotoc10 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibprotoc10 += CSWlibstdc++6
 
-PACKAGES += CSWlibprotobuf9
-SPKG_DESC_CSWlibprotobuf9 = $(DESCRIPTION), libprotobuf.so.9
-PKGFILES_CSWlibprotobuf9 += $(call pkgfiles_lib,libprotobuf.so.9)
-RUNTIME_DEP_PKGS_CSWlibprotobuf9 += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWlibprotobuf9 += CSWlibstdc++6
-RUNTIME_DEP_PKGS_CSWlibprotobuf9 += CSWlibz1
-
-PACKAGES += CSWlibprotoc9
-SPKG_DESC_CSWlibprotoc9 = $(DESCRIPTION), libprotoc.so.9
-PKGFILES_CSWlibprotoc9 += $(call pkgfiles_lib,libprotoc.so.9)
-RUNTIME_DEP_PKGS_CSWlibprotoc9 += CSWlibprotobuf9
-RUNTIME_DEP_PKGS_CSWlibprotoc9 += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWlibprotoc9 += CSWlibstdc++6
-
 PACKAGES += CSWprotobuf-dev
 SPKG_DESC_CSWprotobuf-dev = $(DESCRIPTION), header files
 # PKGFILES is catchall
-RUNTIME_DEP_PKGS_CSWprotobuf-dev += CSWpy-protobuf
+#RUNTIME_DEP_PKGS_CSWprotobuf-dev += CSWpy-protobuf
 RUNTIME_DEP_PKGS_CSWprotobuf-dev += CSWlibgcc-s1
 RUNTIME_DEP_PKGS_CSWprotobuf-dev += CSWlibstdc++6
-RUNTIME_DEP_PKGS_CSWprotobuf-dev += CSWlibprotobuf-lite9
-RUNTIME_DEP_PKGS_CSWprotobuf-dev += CSWlibprotobuf9
-RUNTIME_DEP_PKGS_CSWprotobuf-dev += CSWlibprotoc9
+RUNTIME_DEP_PKGS_CSWprotobuf-dev += CSWlibprotobuf-lite10
+RUNTIME_DEP_PKGS_CSWprotobuf-dev += CSWlibprotobuf10
+RUNTIME_DEP_PKGS_CSWprotobuf-dev += CSWlibprotoc10
 
 # Python support
 PACKAGES += CSWpy-protobuf
@@ -70,8 +70,32 @@
 CHECKPKG_OVERRIDES_CSWpy-protobuf += python-package-missing-py26-files
 CHECKPKG_OVERRIDES_CSWpy-protobuf += surplus-dependency|CSWpython
 
+#EXTRA_CPPFLAGS += -D__EXTENSIONS__ -DGOOGLE_PROTOBUF_ARCH_SPARC
+
+GARCOMPILER = GNU
+BUILD64 = 1
+CONFIGURE_ARGS += $(DIRPATHS)
+
+CONFIGURE_ARGS-32 += --disable-64bit-solaris
+CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL))
+
+# We need 'id -u'
+CONFIGURE_ENV_PATH = /usr/xpg4/bin:$(PATH)
+
+# We need 'grep' to accept '-f'
+BUILD_ENV_PATH = /opt/csw/gnu:$(PATH)
+
+PYCOMPILE = 1
+
+# The test protobuf-test is dumping core in the testsuite, skip for now
+SKIPTEST ?= 1
+
 include gar/category.mk
 
+post-extract:
+	cd $(WORKSRC) && $(CONFIGURE_ENV) bash autogen.sh
+	@$(MAKECOOKIE)
+
 post-build:
 	(cd $(WORKSRC)/python; python setup.py build)
 	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/protobuf/trunk/checksums
===================================================================
--- csw/mgar/pkg/protobuf/trunk/checksums	2016-07-06 14:12:27 UTC (rev 25805)
+++ csw/mgar/pkg/protobuf/trunk/checksums	2016-07-06 14:15:07 UTC (rev 25806)
@@ -1 +1 @@
-11aaac2d704eef8efd1867a807865d85  protobuf-2.6.1.tar.bz2
+a8360bfdb1fa8e5195341bb814fdf835  v3.0.0-beta-3.1.tar.gz

Added: csw/mgar/pkg/protobuf/trunk/files/0001-Use-PATH_MAX-not-only-for-Sparc-but-also-i386.patch
===================================================================
--- csw/mgar/pkg/protobuf/trunk/files/0001-Use-PATH_MAX-not-only-for-Sparc-but-also-i386.patch	                        (rev 0)
+++ csw/mgar/pkg/protobuf/trunk/files/0001-Use-PATH_MAX-not-only-for-Sparc-but-also-i386.patch	2016-07-06 14:15:07 UTC (rev 25806)
@@ -0,0 +1,27 @@
+From 5f9f0fbc3ff8c5d50401c4befae7642a77f5e050 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Wed, 6 Jul 2016 13:49:08 +0200
+Subject: [PATCH] Use PATH_MAX not only for Sparc but also i386
+
+---
+ src/google/protobuf/compiler/command_line_interface.cc | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/google/protobuf/compiler/command_line_interface.cc b/src/google/protobuf/compiler/command_line_interface.cc
+index fcad6b6..8daddb9 100644
+--- a/src/google/protobuf/compiler/command_line_interface.cc
++++ b/src/google/protobuf/compiler/command_line_interface.cc
+@@ -50,7 +50,9 @@
+ #include <iostream>
+ #include <ctype.h>
+ 
+-#ifdef GOOGLE_PROTOBUF_ARCH_SPARC
++#include <config.h>
++
++#if HAVE_LIMITS_H
+ #include <limits.h> //For PATH_MAX
+ #endif
+ 
+-- 
+2.4.0
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

More information about the devel mailing list