[csw-devel] SF.net SVN: gar:[12160] csw/mgar/pkg/pcre/trunk

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Mon Jan 3 16:30:09 CET 2011


Revision: 12160
          http://gar.svn.sourceforge.net/gar/?rev=12160&view=rev
Author:   dmichelsen
Date:     2011-01-03 15:30:08 +0000 (Mon, 03 Jan 2011)

Log Message:
-----------
pcre: Update to 8.11 and split off soname-specific libraries

Modified Paths:
--------------
    csw/mgar/pkg/pcre/trunk/Makefile
    csw/mgar/pkg/pcre/trunk/checksums
    csw/mgar/pkg/pcre/trunk/files/0001-Allow-norunpath-for-libtool.patch

Added Paths:
-----------
    csw/mgar/pkg/pcre/trunk/files/bug-attachment-433.patch

Modified: csw/mgar/pkg/pcre/trunk/Makefile
===================================================================
--- csw/mgar/pkg/pcre/trunk/Makefile	2011-01-03 15:28:56 UTC (rev 12159)
+++ csw/mgar/pkg/pcre/trunk/Makefile	2011-01-03 15:30:08 UTC (rev 12160)
@@ -1,5 +1,5 @@
 NAME = pcre
-VERSION = 8.10
+VERSION = 8.11
 CATEGORIES = lib
 
 DESCRIPTION = Perl-compatible regular expression tools
@@ -11,26 +11,71 @@
 endef
 
 MASTER_SITES = ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/
-DISTFILES  = $(NAME)-$(VERSION).tar.gz
-
+DISTFILES  = $(NAME)-$(VERSION).tar.bz2
 PATCHFILES = 0001-Allow-norunpath-for-libtool.patch
 
-SPKG_SOURCEURL = http://www.pcre.org
+# pcregrep testsuite crashes as reported here:
+#   http://bugs.exim.org/show_bug.cgi?id=1054
+# Use fix for 64 bit PPC which solves the problem as reported in this bug report:
+#   http://bugs.exim.org/show_bug.cgi?id=1048
+PATCHFILES += bug-attachment-433.patch
 
+# We define upstream file regex so we can be notifed of new upstream software release
+UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2
+
+VENDOR_URL = http://www.pcre.org
+
 BUILD_DEP_PKGS = CSWgnulinks
-RUNTIME_DEP_PKGS_CSWpcrert = CSWncurses
-RUNTIME_DEP_PKGS_CSWpcre = CSWpcrert CSWzlib CSWbzip2 CSWreadline $(RUNTIME_DEP_PKGS_CSWpcrert)
 
-PACKAGES = CSWpcre CSWpcrert
+PACKAGES = CSWpcre
 CATALOGNAME_CSWpcrert = pcre_rt
-LICENSE = LICENCE
-
-SPKG_DESC_CSWpcrert = Perl-compatible regular expression runtime libraries
 SPKG_DESC_CSWpcre = Perl-compatible regular expression tools
+RUNTIME_DEP_PKGS_CSWpcre += CSWreadline
+RUNTIME_DEP_PKGS_CSWpcre += CSWlibpcre0
+RUNTIME_DEP_PKGS_CSWpcre += CSWbzip2
+RUNTIME_DEP_PKGS_CSWpcre += CSWzlib
+RUNTIME_DEP_PKGS_CSWpcre += CSWncurses
+RUNTIME_DEP_PKGS_CSWpcre += CSWlibpcreposix0
 
-# We define upstream file regex so we can be notifed of new upstream software release
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
+PACKAGES += CSWpcrert
+CATALOGNAME_CSWpcrert = pcrert
+SPKG_DESC_CSWpcrert = Legacy stub as contents was moved to libpcre0, libpcrecpp0 and libpcreposix0
+PKGFILES_CSWpcrert = NOFILES
+RUNTIME_DEP_PKGS_CSWpcrert = CSWlibpcre0 CSWlibpcrecpp0 CSWlibpcreposix0
+# This is a legacy lib, force dependencies to new libraries
+CHECKPKG_OVERRIDES_CSWpcrert += surplus-dependency|CSWlibpcrecpp0
+CHECKPKG_OVERRIDES_CSWpcrert += surplus-dependency|CSWlibpcreposix0
+CHECKPKG_OVERRIDES_CSWpcrert += surplus-dependency|CSWlibpcre0
+ARCHALL_CSWpcrert = 1
 
+PACKAGES += CSWpcre-devel
+CATALOGNAME_CSWpcre-devel = pcre_devel
+SPKG_DESC_CSWpcre-devel = Development files for PCRE
+RUNTIME_DEP_PKGS_CSWpcre-devel += CSWlibpcre0
+RUNTIME_DEP_PKGS_CSWpcre-devel += CSWlibpcreposix0
+RUNTIME_DEP_PKGS_CSWpcre-devel += CSWlibpcrecpp0
+PKGFILES_CSWpcre-devel = $(PKGFILES_DEVEL)
+
+PACKAGES += CSWlibpcre0
+CATALOGNAME_CSWlibpcre0 = libpcre0
+SPKG_DESC_CSWlibpcre0 = Perl-compatible regular expression tools, libpcre.so.0
+PKGFILES_CSWlibpcre0 = $(call baseisadirs,$(libdir),libpcre\.so\.0(\.\d+)*)
+RUNTIME_DEP_PKGS_CSWlibpcre0 += CSWncurses
+
+PACKAGES += CSWlibpcrecpp0
+CATALOGNAME_CSWlibpcrecpp0 = libpcrecpp0
+SPKG_DESC_CSWlibpcrecpp0 += Perl-compatible regular expression tools, libpcrecpp.so.0
+PKGFILES_CSWlibpcrecpp0 += $(call baseisadirs,$(libdir),libpcrecpp\.so\.0(\.\d+)*)
+RUNTIME_DEP_PKGS_CSWlibpcrecpp0 += CSWncurses
+RUNTIME_DEP_PKGS_CSWlibpcrecpp0 += CSWlibpcre0
+
+PACKAGES += CSWlibpcreposix0
+CATALOGNAME_CSWlibpcreposix0 = libpcreposix0
+SPKG_DESC_CSWlibpcreposix0 += Perl-compatible regular expression tools, libpcreposix.so.0
+PKGFILES_CSWlibpcreposix0 += $(call baseisadirs,$(libdir),libpcreposix\.so\.0(\.\d+)*)
+RUNTIME_DEP_PKGS_CSWlibpcreposix0 += CSWncurses
+RUNTIME_DEP_PKGS_CSWlibpcreposix0 += CSWlibpcre0
+
 BUILD64 = 1
 NOISAEXEC = 1
 
@@ -47,8 +92,6 @@
 MERGE_SCRIPTS_isa-extra = copy-relocated-only copy-config-only
 MERGE_DIRS_isa-extra = $(libdir)
 
-PKGFILES_CSWpcrert = $(PKGFILES_RT)
-
 include gar/category.mk
 
 # The testcases need 'diff -u' which Solaris 8 diff does not have,

Modified: csw/mgar/pkg/pcre/trunk/checksums
===================================================================
--- csw/mgar/pkg/pcre/trunk/checksums	2011-01-03 15:28:56 UTC (rev 12159)
+++ csw/mgar/pkg/pcre/trunk/checksums	2011-01-03 15:30:08 UTC (rev 12160)
@@ -1,2 +1 @@
-6e0b68956c29258407405f6dc4995900  0001-Allow-norunpath-for-libtool.patch
-9524f0ff50b9093c02c81f911e41b066  pcre-8.10.tar.gz
+ef907b8792ec7f90f0dcd773848f0b3b  pcre-8.11.tar.bz2

Modified: csw/mgar/pkg/pcre/trunk/files/0001-Allow-norunpath-for-libtool.patch
===================================================================
--- csw/mgar/pkg/pcre/trunk/files/0001-Allow-norunpath-for-libtool.patch	2011-01-03 15:28:56 UTC (rev 12159)
+++ csw/mgar/pkg/pcre/trunk/files/0001-Allow-norunpath-for-libtool.patch	2011-01-03 15:30:08 UTC (rev 12160)
@@ -1,6 +1,6 @@
-From aee3f4961e3d9be5b67fdf9589e7e1dcc22a5564 Mon Sep 17 00:00:00 2001
+From a023da4c69da0ad9f922764b0701762c7e6c53d6 Mon Sep 17 00:00:00 2001
 From: Dagobert Michelsen <dam at opencsw.org>
-Date: Mon, 28 Jun 2010 16:39:45 +0200
+Date: Mon, 3 Jan 2011 15:04:02 +0100
 Subject: [PATCH] Allow -norunpath for libtool
 
 ---
@@ -8,18 +8,18 @@
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/ltmain.sh b/ltmain.sh
-index a72f2fd..6b8bee1 100755
+index 04eaea4..fd4ac68 100755
 --- a/ltmain.sh
 +++ b/ltmain.sh
-@@ -4765,7 +4765,7 @@ func_mode_link ()
-       # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
-       # @file GCC response files
+@@ -5091,7 +5091,7 @@ func_mode_link ()
+       # @file                GCC response files
+       # -tp=*                Portland pgcc target processor selection
        -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
--      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
-+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-norunpath)
+-      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*)
++      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|-norunpath)
          func_quote_for_eval "$arg"
  	arg="$func_quote_for_eval_result"
          func_append compile_command " $arg"
 -- 
-1.7.1
+1.7.3.2
 

Added: csw/mgar/pkg/pcre/trunk/files/bug-attachment-433.patch
===================================================================
--- csw/mgar/pkg/pcre/trunk/files/bug-attachment-433.patch	                        (rev 0)
+++ csw/mgar/pkg/pcre/trunk/files/bug-attachment-433.patch	2011-01-03 15:30:08 UTC (rev 12160)
@@ -0,0 +1,61 @@
+From f67f1b7d0d17e85dd09a1112a2988efc54215910 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar at redhat.com>
+Date: Fri, 17 Dec 2010 14:29:23 +0100
+Subject: [PATCH] Do not cast long int to long via pointer
+
+This breaks things on big endian machine where long int is bigger than int.
+---
+ pcregrep.c |   16 ++++++++++------
+ 1 files changed, 10 insertions(+), 6 deletions(-)
+
+diff --git a/pcregrep.c b/pcregrep.c
+index 204a480..1598411 100644
+--- a/pcregrep.c
++++ b/pcregrep.c
+@@ -186,8 +186,8 @@ static BOOL utf8 = FALSE;
+ 
+ /* Structure for options and list of them */
+ 
+-enum { OP_NODATA, OP_STRING, OP_OP_STRING, OP_NUMBER, OP_OP_NUMBER,
+-       OP_PATLIST };
++enum { OP_NODATA, OP_STRING, OP_OP_STRING, OP_NUMBER, OP_LONGNUMBER,
++     OP_OP_NUMBER, OP_PATLIST };
+ 
+ typedef struct option_item {
+   int type;
+@@ -239,8 +239,8 @@ static option_item optionlist[] = {
+   { OP_NODATA,    N_LBUFFER, NULL,             "line-buffered", "use line buffering" },
+   { OP_NODATA,    N_LOFFSETS, NULL,            "line-offsets",  "output line numbers and offsets, not text" },
+   { OP_STRING,    N_LOCALE, &locale,           "locale=locale", "use the named locale" },
+-  { OP_NUMBER,    N_M_LIMIT,&match_limit,      "match-limit=number", "set PCRE match limit option" },
+-  { OP_NUMBER,    N_M_LIMIT_REC,&match_limit_recursion, "recursion-limit=number", "set PCRE match recursion limit option" },
++  { OP_LONGNUMBER,    N_M_LIMIT,&match_limit,      "match-limit=number", "set PCRE match limit option" },
++  { OP_LONGNUMBER,    N_M_LIMIT_REC,&match_limit_recursion, "recursion-limit=number", "set PCRE match recursion limit option" },
+   { OP_NODATA,    'M',      NULL,              "multiline",     "run in multiline mode" },
+   { OP_STRING,    'N',      &newline,          "newline=type",  "set newline type (CR, LF, CRLF, ANYCRLF or ANY)" },
+   { OP_NODATA,    'n',      NULL,              "line-number",   "print line number with output lines" },
+@@ -2278,7 +2278,8 @@ for (i = 1; i < argc; i++)
+ 
+   /* Otherwise, deal with single string or numeric data values. */
+ 
+-  else if (op->type != OP_NUMBER && op->type != OP_OP_NUMBER)
++  else if (op->type != OP_NUMBER && op->type != OP_LONGNUMBER &&
++          op->type != OP_OP_NUMBER)
+     {
+     *((char **)op->dataptr) = option_data;
+     }
+@@ -2308,7 +2309,10 @@ for (i = 1; i < argc; i++)
+           option_data, op->one_char);
+       pcregrep_exit(usage(2));
+       }
+-    *((int *)op->dataptr) = n;
++    if (op->type == OP_LONGNUMBER)
++        *((unsigned long int *)op->dataptr) = n;
++    else
++        *((int *)op->dataptr) = n;
+     }
+   }
+ 
+-- 
+1.7.3.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