[csw-devel] SF.net SVN: gar:[16992] csw/mgar/pkg/pcre/trunk
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Sun Feb 5 00:05:58 CET 2012
Revision: 16992
http://gar.svn.sourceforge.net/gar/?rev=16992&view=rev
Author: dmichelsen
Date: 2012-02-04 23:05:58 +0000 (Sat, 04 Feb 2012)
Log Message:
-----------
pcre/trunk: Update to 8.30, move to new libpcre16-0 library for 16 bit chars, introduce libpcre.so.1, drop pcre_rt
Modified Paths:
--------------
csw/mgar/pkg/pcre/trunk/Makefile
csw/mgar/pkg/pcre/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/pcre/trunk/files/0002-Remove-bashism.patch
Modified: csw/mgar/pkg/pcre/trunk/Makefile
===================================================================
--- csw/mgar/pkg/pcre/trunk/Makefile 2012-02-04 20:28:37 UTC (rev 16991)
+++ csw/mgar/pkg/pcre/trunk/Makefile 2012-02-04 23:05:58 UTC (rev 16992)
@@ -1,5 +1,5 @@
NAME = pcre
-VERSION = 8.21
+VERSION = 8.30
CATEGORIES = lib
GARTYPE = v2
@@ -15,20 +15,26 @@
DISTFILES = $(DISTNAME).tar.bz2
PATCHFILES = 0001-Allow-norunpath-for-libtool.patch
+# Use patch until this is fixed:
+# http://bugs.exim.org/show_bug.cgi?id=1206
+PATCHFILES += 0002-Remove-bashism.patch
+
VENDOR_URL = http://www.pcre.org
PACKAGES = CSWpcre
CATALOGNAME_CSWpcre = pcre
SPKG_DESC_CSWpcre = Perl-compatible regular expression tools
RUNTIME_DEP_PKGS_CSWpcre += CSWlibreadline6
-RUNTIME_DEP_PKGS_CSWpcre += CSWlibpcre0
+RUNTIME_DEP_PKGS_CSWpcre += CSWlibpcre1
+RUNTIME_DEP_PKGS_CSWpcre += CSWlibpcre16-0
RUNTIME_DEP_PKGS_CSWpcre += CSWlibbz2-1-0
RUNTIME_DEP_PKGS_CSWpcre += CSWlibz1
RUNTIME_DEP_PKGS_CSWpcre += CSWlibpcreposix0
PACKAGES += CSWlibpcre-dev
-SPKG_DESC_CSWlibpcre-dev = Development files for libpcre.so.0, libpcrecpp.so.0 and libpcreposix.so.0
-RUNTIME_DEP_PKGS_CSWlibpcre-dev += CSWlibpcre0
+SPKG_DESC_CSWlibpcre-dev = Development files for libpcre.so.1, libpcre16.so.0, libpcrecpp.so.0 and libpcreposix.so.0
+RUNTIME_DEP_PKGS_CSWlibpcre-dev += CSWlibpcre1
+RUNTIME_DEP_PKGS_CSWlibpcre-dev += CSWlibpcre16-0
RUNTIME_DEP_PKGS_CSWlibpcre-dev += CSWlibpcreposix0
RUNTIME_DEP_PKGS_CSWlibpcre-dev += CSWlibpcrecpp0
PKGFILES_CSWlibpcre-dev += $(PKGFILES_DEVEL)
@@ -42,26 +48,23 @@
CHECKPKG_OVERRIDES_CSWlibpcre-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/pcre/html/pcresample.html
CHECKPKG_OVERRIDES_CSWlibpcre-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/pcre/html/pcredemo.html
-PACKAGES += CSWlibpcre0
-CATALOGNAME_CSWlibpcre0 = libpcre0
-SPKG_DESC_CSWlibpcre0 = Perl-compatible regular expression tools, libpcre.so.0
-PKGFILES_CSWlibpcre0 = $(call pkgfiles_lib,libpcre.so.0)
-OBSOLETED_BY_CSWlibpcre0 += CSWpcrert
-CATALOGNAME_CSWpcrert = pcre_rt_stub
+PACKAGES += CSWlibpcre1
+SPKG_DESC_CSWlibpcre1 = Perl-compatible regular expression tools, libpcre.so.1
+PKGFILES_CSWlibpcre1 = $(call pkgfiles_lib,libpcre.so.1)
+PACKAGES += CSWlibpcre16-0
+SPKG_DESC_CSWlibpcre16-0 = Perl-compatible regular expression tools, libpcre16.so.0
+PKGFILES_CSWlibpcre16-0 = $(call pkgfiles_lib,libpcre16.so.0)
+
PACKAGES += CSWlibpcrecpp0
-CATALOGNAME_CSWlibpcrecpp0 = libpcrecpp0
SPKG_DESC_CSWlibpcrecpp0 += Perl-compatible regular expression tools, libpcrecpp.so.0
PKGFILES_CSWlibpcrecpp0 += $(call pkgfiles_lib,libpcrecpp.so.0)
RUNTIME_DEP_PKGS_CSWlibpcrecpp0 += CSWlibpcre0
-OBSOLETED_BY_CSWlibpcrecpp0 += CSWpcrert
PACKAGES += CSWlibpcreposix0
-CATALOGNAME_CSWlibpcreposix0 = libpcreposix0
SPKG_DESC_CSWlibpcreposix0 += Perl-compatible regular expression tools, libpcreposix.so.0
PKGFILES_CSWlibpcreposix0 += $(call pkgfiles_lib,libpcreposix.so.0)
RUNTIME_DEP_PKGS_CSWlibpcreposix0 += CSWlibpcre0
-OBSOLETED_BY_CSWlibpcreposix0 += CSWpcrert
REINPLACE_USRLOCAL += doc/pcre-config.1
REINPLACE_USRLOCAL += doc/pcresample.3
@@ -75,12 +78,22 @@
CONFIGURE_ARGS += --enable-pcregrep-libz
CONFIGURE_ARGS += --enable-pcregrep-libbz2
CONFIGURE_ARGS += --enable-pcretest-libreadline
+CONFIGURE_ARGS += --enable-pcre16
# No JIT for Sparc, may try for x86 at some later time
#CONFIGURE_ARGS += --enable-jit
+# We need more than the default 8 MB of stack space
+TEST_SCRIPTS = custom
+
include gar/category.mk
# The testcases need 'diff -u' which Solaris 8 diff does not have,
# but we need Solaris strip, otherwise pcregrep is broken and 200m in size...
PATH := /usr/ccs/bin:/opt/csw/gnu:$(PATH)
+
+test-custom:
+ @echo " ==> Running make $(TEST_TARGET) in $*"
+ cd $(WORKSRC) && /usr/bin/ulimit -s 16384 && /usr/bin/env -i $(TEST_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(TEST_OVERRIDE_VARS),$(TTT)="$(TEST_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(TEST_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $(OBJDIR) $(TEST_ARGS) $(TEST_TARGET)
+ @$(MAKECOOKIE)
+
Modified: csw/mgar/pkg/pcre/trunk/checksums
===================================================================
--- csw/mgar/pkg/pcre/trunk/checksums 2012-02-04 20:28:37 UTC (rev 16991)
+++ csw/mgar/pkg/pcre/trunk/checksums 2012-02-04 23:05:58 UTC (rev 16992)
@@ -1 +1 @@
-0a7b592bea64b7aa7f4011fc7171a730 pcre-8.21.tar.bz2
+98e8928cccc945d04279581e778fbdff pcre-8.30.tar.bz2
Added: csw/mgar/pkg/pcre/trunk/files/0002-Remove-bashism.patch
===================================================================
--- csw/mgar/pkg/pcre/trunk/files/0002-Remove-bashism.patch (rev 0)
+++ csw/mgar/pkg/pcre/trunk/files/0002-Remove-bashism.patch 2012-02-04 23:05:58 UTC (rev 16992)
@@ -0,0 +1,25 @@
+From 3fea8bd4c59e4efa53cc9cf842c8836dacdcba89 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Sat, 4 Feb 2012 23:19:53 +0100
+Subject: [PATCH] Remove bashism
+
+---
+ RunTest | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/RunTest b/RunTest
+index aae292e..0d542f9 100755
+--- a/RunTest
++++ b/RunTest
+@@ -135,7 +135,7 @@ $sim ./pcretest -C pcre8 >/dev/null
+ support8=$?
+ $sim ./pcretest -C pcre16 >/dev/null
+ support16=$?
+-if [ $(( $support8 + $support16 )) -eq 2 ] ; then
++if [ `expr $support8 + $support16` -eq 2 ] ; then
+ test8=
+ test16=-16
+ if [ "$arg8" = yes -a "$arg16" != yes ] ; then
+--
+1.7.8.3
+
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