Revision: 25864
http://sourceforge.net/p/gar/code/25864
Author: dmichelsen
Date: 2016-08-03 08:52:44 +0000 (Wed, 03 Aug 2016)
Log Message:
-----------
protobuf/trunk: Cleanup Python stuff now in separate recipe
Modified Paths:
--------------
csw/mgar/pkg/protobuf/trunk/Makefile
Removed 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-08-03 08:51:37 UTC (rev
25863)
+++ csw/mgar/pkg/protobuf/trunk/Makefile 2016-08-03 08:52:44 UTC (rev
25864)
@@ -48,28 +48,12 @@
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 += CSWlibgcc-s1
RUNTIME_DEP_PKGS_CSWprotobuf-dev += CSWlibstdc++6
RUNTIME_DEP_PKGS_CSWprotobuf-dev += CSWlibprotobuf-lite10
RUNTIME_DEP_PKGS_CSWprotobuf-dev += CSWlibprotobuf10
RUNTIME_DEP_PKGS_CSWprotobuf-dev += CSWlibprotoc10
-# Python support
-# Disabled, this is now a separate upstream tarball
-#PACKAGES += CSWpy-protobuf
-SPKG_DESC_CSWpy-protobuf= $(DESCRIPTION), Python support
-RUNTIME_DEP_PKGS_CSWpy-protobuf += CSWpython
-PKGFILES_CSWpy-protobuf += $(libdir)/python.*
-ARCHALL_CSWpy-protobuf = 1
-CHECKPKG_OVERRIDES_CSWpy-protobuf += surplus-dependency|CSWprotobuf
-
-# This is intended, no more Python 2.6
-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)
@@ -83,8 +67,6 @@
# 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.
# Enable tests afain after this is fixed:
# https://github.com/google/protobuf/issues/1755
@@ -92,14 +74,3 @@
include gar/category.mk
-#post-extract:
-# cd $(WORKSRC) && $(CONFIGURE_ENV) bash autogen.sh
-# @$(MAKECOOKIE)
-
-#post-build:
-# (cd $(WORKSRC)/python; python setup.py build)
-# @$(MAKECOOKIE)
-
-#post-install:
-# (cd $(WORKSRC)/python; python setup.py install --root=$(DESTDIR)
--prefix=$(prefix))
-# @$(MAKECOOKIE)
Deleted:
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
2016-08-03 08:51:37 UTC (rev 25863)
+++
csw/mgar/pkg/protobuf/trunk/files/0001-Use-PATH_MAX-not-only-for-Sparc-but-also-i386.patch
2016-08-03 08:52:44 UTC (rev 25864)
@@ -1,27 +0,0 @@
-From 5f9f0fbc3ff8c5d50401c4befae7642a77f5e050 Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <d...@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.
