[csw-devel] SF.net SVN: gar:[15785] csw/mgar/pkg/libmemcached/trunk
wilbury at users.sourceforge.net
wilbury at users.sourceforge.net
Tue Sep 27 23:22:58 CEST 2011
Revision: 15785
http://gar.svn.sourceforge.net/gar/?rev=15785&view=rev
Author: wilbury
Date: 2011-09-27 21:22:58 +0000 (Tue, 27 Sep 2011)
Log Message:
-----------
libmemcached/trunk: Update to 0.52, fix build.
Modified Paths:
--------------
csw/mgar/pkg/libmemcached/trunk/Makefile
csw/mgar/pkg/libmemcached/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/libmemcached/trunk/files/0001-Do-not-do-PANDORA_TEST_VC_DIR.patch
csw/mgar/pkg/libmemcached/trunk/files/0002-Use-opt-csw-bin-ggrep.patch
Removed Paths:
-------------
csw/mgar/pkg/libmemcached/trunk/files/0001-Do-not-use-Wstrict-prototypes-warning.patch
Modified: csw/mgar/pkg/libmemcached/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libmemcached/trunk/Makefile 2011-09-27 19:24:55 UTC (rev 15784)
+++ csw/mgar/pkg/libmemcached/trunk/Makefile 2011-09-27 21:22:58 UTC (rev 15785)
@@ -1,7 +1,7 @@
# $Id$
#
NAME = libmemcached
-VERSION = 0.51
+VERSION = 0.52
VENDOR_URL = http://libmemcached.org/
CATEGORIES = lib
DESCRIPTION = Library memcached interface
@@ -10,18 +10,19 @@
endef
SPKG_SOURCEURL = http://libmemcached.org/
MASTER_SITES = http://launchpad.net/libmemcached/1.0/$(VERSION)/+download/
-PATCHFILES = 0001-Do-not-use-Wstrict-prototypes-warning.patch
-#PATCHFILES += 0002-use-stdnamespace-for-index.patch
-#PATCHFILES += 0003-use-opt-csw-bin-ggrep.patch
-#PATCHFILES += 0004-use-opt-csw-bin-ggrep-for-pandora.patch
-#PATCHFILES += 0006-fix-tests.patch
-#PATCHFILES += 0007-fix-test_h.patch
+PATCHFILES += 0001-Do-not-do-PANDORA_TEST_VC_DIR.patch
+PATCHFILES += 0002-Use-opt-csw-bin-ggrep.patch
+
+BUILD_DEP_PKGS += CSWlibevent-dev
+RUNTIME_DEP_PKGS += CSWlibevent2-0-5
+
DISTFILES = $(NAME)-$(VERSION).tar.gz
UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
CONFIGURE_ARGS = $(DIRPATHS)
CONFIGURE_ARGS += --disable-dtrace
+CONFIGURE_ARGS += --disable-rpath
BUILD64 = 1
SKIPTEST = 1
@@ -31,44 +32,5 @@
GARCOMPILER = GCC4
-LDFLAGS_32="-R/opt/csw/lib/i386"
-LDFLAGS_64="-R/opt/csw/lib/amd64"
-
-PACKAGES = CSWlibmemcached
-SPKG_DESC_CSWlibmemcached = libmemcached library
-RUNTIME_DEP_PKGS_CSWlibmemcached += CSWlibmemcached8
-RUNTIME_DEP_PKGS_CSWlibmemcached += CSWlibhashkit1
-RUNTIME_DEP_PKGS_CSWlibmemcached += CSWlibmemcachedutil2
-RUNTIME_DEP_PKGS_CSWlibmemcached += CSWlibmemcachedprotocol0
-
-PACKAGES += CSWlibhashkit1
-CATALOGNAME_CSWlibhashkit1 = libhashkit1
-VENDOR_URL_CSWlibhashkit1 = http://libmemcached.org/libMemcached.html
-PKGFILES_CSWlibhashkit1 += $(call baseisadirs,$(libdir),libhashkit\.so\.1\.0\.0)
-PKGFILES_CSWlibhashkit1 += $(call baseisadirs,$(libdir),libhashkit\.so\.1(\.\d+)*)
-SPKG_DESC_CSWlibhashkit1 += $(DESCRIPTION), libhashkit.so.1
-
-PACKAGES += CSWlibmemcached8
-CATALOGNAME_CSWlibmemcached8 = libmemcached8
-VENDOR_URL_CSWlibmemcached8 = http://libmemcached.org/libMemcached.html
-PKGFILES_CSWlibmemcached8 += $(call baseisadirs,$(libdir),libmemcached\.so\.8\.0\.0)
-PKGFILES_CSWlibmemcached8 += $(call baseisadirs,$(libdir),libmemcached\.so\.8(\.\d+)*)
-SPKG_DESC_CSWlibmemcached8 += $(DESCRIPTION), libmemcached.so.8
-
-PACKAGES += CSWlibmemcachedprotocol0
-CATALOGNAME_CSWlibmemcachedprotocol0 = libmemcachedprotocol0
-VENDOR_URL_CSWlibmemcachedprotocol0 = http://libmemcached.org/
-PKGFILES_CSWlibmemcachedprotocol0 += $(call baseisadirs,$(libdir),libmemcachedprotocol\.so\.0\.0\.0)
-PKGFILES_CSWlibmemcachedprotocol0 += $(call baseisadirs,$(libdir),libmemcachedprotocol\.so\.0(\.\d+)*)
-SPKG_DESC_CSWlibmemcachedprotocol0 += $(DESCRIPTION), libmemcachedprotocol.so.0
-
-PACKAGES += CSWlibmemcachedutil2
-CATALOGNAME_CSWlibmemcachedutil2 = libmemcachedutil2
-VENDOR_URL_CSWlibmemcachedutil2 = http://libmemcached.org/
-PKGFILES_CSWlibmemcachedutil2 += $(call baseisadirs,$(libdir),libmemcachedutil\.so\.2\.0\.0)
-PKGFILES_CSWlibmemcachedutil2 += $(call baseisadirs,$(libdir),libmemcachedutil\.so\.2(\.\d+)*)
-SPKG_DESC_CSWlibmemcachedutil2 += $(DESCRIPTION), libmemcachedutil.so.2
-RUNTIME_DEP_PKGS_CSWlibmemcachedutil2 += CSWlibmemcached8
-
include gar/category.mk
Modified: csw/mgar/pkg/libmemcached/trunk/checksums
===================================================================
--- csw/mgar/pkg/libmemcached/trunk/checksums 2011-09-27 19:24:55 UTC (rev 15784)
+++ csw/mgar/pkg/libmemcached/trunk/checksums 2011-09-27 21:22:58 UTC (rev 15785)
@@ -1 +1 @@
-30fd0ce62a223dc5e7bd9e841f8baa4b libmemcached-0.51.tar.gz
+c3a735c6db51de5ce457565179fc40f2 libmemcached-0.52.tar.gz
Added: csw/mgar/pkg/libmemcached/trunk/files/0001-Do-not-do-PANDORA_TEST_VC_DIR.patch
===================================================================
--- csw/mgar/pkg/libmemcached/trunk/files/0001-Do-not-do-PANDORA_TEST_VC_DIR.patch (rev 0)
+++ csw/mgar/pkg/libmemcached/trunk/files/0001-Do-not-do-PANDORA_TEST_VC_DIR.patch 2011-09-27 21:22:58 UTC (rev 15785)
@@ -0,0 +1,65 @@
+From 963cad2ad2905750a29ca08d383a2eb14cba3913 Mon Sep 17 00:00:00 2001
+From: Juraj Lutter <wilbury at opencsw.org>
+Date: Tue, 27 Sep 2011 22:08:15 +0200
+Subject: [PATCH] Do not do PANDORA_TEST_VC_DIR.
+
+---
+ configure | 29 -----------------------------
+ m4/pandora_canonical.m4 | 1 -
+ 2 files changed, 0 insertions(+), 30 deletions(-)
+
+diff --git a/configure b/configure
+index b6d6df9..fad03a2 100755
+--- a/configure
++++ b/configure
+@@ -16127,35 +16127,6 @@ AM_BACKSLASH='\'
+
+ pandora_building_from_vc=no
+
+- if test -d ".bzr" ; then
+- pandora_building_from_bzr=yes
+- pandora_building_from_vc=yes
+- else
+- pandora_building_from_bzr=no
+- fi
+-
+- if test -d ".svn" ; then
+- pandora_building_from_svn=yes
+- pandora_building_from_vc=yes
+- else
+- pandora_building_from_svn=no
+- fi
+-
+- if test -d ".hg" ; then
+- pandora_building_from_hg=yes
+- pandora_building_from_vc=yes
+- else
+- pandora_building_from_hg=no
+- fi
+-
+- if test -d ".git" ; then
+- pandora_building_from_git=yes
+- pandora_building_from_vc=yes
+- else
+- pandora_building_from_git=no
+- fi
+-
+-
+ PANDORA_RELEASE_ID=`echo $VERSION | sed 's/[^0-9]//g'`
+
+ PANDORA_RELEASE_COMMENT=""
+diff --git a/m4/pandora_canonical.m4 b/m4/pandora_canonical.m4
+index ceb859a..cdcd112 100644
+--- a/m4/pandora_canonical.m4
++++ b/m4/pandora_canonical.m4
+@@ -117,7 +117,6 @@ AC_DEFUN([PANDORA_CANONICAL_TARGET],[
+ m4_if(PCT_VERSION_FROM_VC,yes,[
+ PANDORA_VC_INFO_HEADER
+ ],[
+- PANDORA_TEST_VC_DIR
+
+ changequote(<<, >>)dnl
+ PANDORA_RELEASE_ID=`echo $VERSION | sed 's/[^0-9]//g'`
+--
+1.7.6.1
+
Deleted: csw/mgar/pkg/libmemcached/trunk/files/0001-Do-not-use-Wstrict-prototypes-warning.patch
===================================================================
--- csw/mgar/pkg/libmemcached/trunk/files/0001-Do-not-use-Wstrict-prototypes-warning.patch 2011-09-27 19:24:55 UTC (rev 15784)
+++ csw/mgar/pkg/libmemcached/trunk/files/0001-Do-not-use-Wstrict-prototypes-warning.patch 2011-09-27 21:22:58 UTC (rev 15785)
@@ -1,39 +0,0 @@
-From 68db3657c8f086798bd01a878717d785c16c5b05 Mon Sep 17 00:00:00 2001
-From: Juraj Lutter <wilbury at unstable10x.(none)>
-Date: Wed, 7 Sep 2011 18:16:03 +0200
-Subject: [PATCH] Do not use -Wstrict-prototypes warning.
-
----
- configure | 2 +-
- m4/pandora_warnings.m4 | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure b/configure
-index b6d6df9..82db435 100755
---- a/configure
-+++ b/configure
-@@ -18502,7 +18502,7 @@ fi
-
- fi
-
-- CC_WARNINGS="${BASE_WARNINGS} -Wstrict-prototypes -Wmissing-prototypes -Wredundant-decls -Wmissing-declarations -Wcast-align ${CC_WARNINGS_FULL}"
-+ CC_WARNINGS="${BASE_WARNINGS} -Wmissing-prototypes -Wredundant-decls -Wmissing-declarations -Wcast-align ${CC_WARNINGS_FULL}"
- CXX_WARNINGS="${BASE_WARNINGS} -Woverloaded-virtual -Wnon-virtual-dtor -Wctor-dtor-privacy -Wno-long-long ${CXX_WARNINGS_FULL}"
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to use -Wmissing-declarations from C++" >&5
-diff --git a/m4/pandora_warnings.m4 b/m4/pandora_warnings.m4
-index 0f6d47a..372e719 100644
---- a/m4/pandora_warnings.m4
-+++ b/m4/pandora_warnings.m4
-@@ -237,7 +237,7 @@ uint16_t x= htons(80);
- [NO_CONVERSION="-Wno-conversion"])
- ])
-
-- CC_WARNINGS="${BASE_WARNINGS} -Wstrict-prototypes -Wmissing-prototypes -Wredundant-decls -Wmissing-declarations -Wcast-align ${CC_WARNINGS_FULL}"
-+ CC_WARNINGS="${BASE_WARNINGS} -Wmissing-prototypes -Wredundant-decls -Wmissing-declarations -Wcast-align ${CC_WARNINGS_FULL}"
- CXX_WARNINGS="${BASE_WARNINGS} -Woverloaded-virtual -Wnon-virtual-dtor -Wctor-dtor-privacy -Wno-long-long ${CXX_WARNINGS_FULL}"
-
- AC_CACHE_CHECK([whether it is safe to use -Wmissing-declarations from C++],
---
-1.7.6
-
Added: csw/mgar/pkg/libmemcached/trunk/files/0002-Use-opt-csw-bin-ggrep.patch
===================================================================
--- csw/mgar/pkg/libmemcached/trunk/files/0002-Use-opt-csw-bin-ggrep.patch (rev 0)
+++ csw/mgar/pkg/libmemcached/trunk/files/0002-Use-opt-csw-bin-ggrep.patch 2011-09-27 21:22:58 UTC (rev 15785)
@@ -0,0 +1,25 @@
+From 9832238e2cbd4edfa29eb996333c28f4d10d9b28 Mon Sep 17 00:00:00 2001
+From: Juraj Lutter <wilbury at opencsw.org>
+Date: Tue, 27 Sep 2011 22:29:37 +0200
+Subject: [PATCH] Use /opt/csw/bin/ggrep
+
+---
+ m4/pandora_vc_build.m4 | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/m4/pandora_vc_build.m4 b/m4/pandora_vc_build.m4
+index a1fb60b..fc45ccc 100644
+--- a/m4/pandora_vc_build.m4
++++ b/m4/pandora_vc_build.m4
+@@ -71,7 +71,7 @@ AC_DEFUN([PANDORA_BUILDING_FROM_VC],[
+ PANDORA_GIT_REVID=`git --no-pager log --max-count=1 | cut -f2 -d' ' | head -1`
+ if test "x$PANDORA_GIT_REVID" != "x${PANDORA_VC_REVNO}" ; then
+ PANDORA_VC_REVID="${PANDORA_GIT_REVID}"
+- PANDORA_VC_BRANCH=`git branch | grep -Ei "\* (.*)" | cut -f2 -d' '`
++ PANDORA_VC_BRANCH=`git branch | /opt/csw/bin/ggrep -Ei "\* (.*)" | cut -f2 -d' '`
+ fi
+ fi
+
+--
+1.7.6.1
+
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