Merge pull request #1626 from pyhalov/pcre

Alexander Pyhalov

2016-01-13 0bc78b18641792c775fd92f83e0fa39caeca5805

Merge pull request #1626 from pyhalov/pcre

Update pcre to 8.38

 components/pcre/Makefile

@@ -25,14 +25,19 @@
include ../../make-rules/shared-macros.mk

COMPONENT_NAME=        pcre
COMPONENT_VERSION=    8.21
COMPONENT_VERSION=    8.38
COMPONENT_SRC=        $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE=    $(COMPONENT_SRC).tar.gz
COMPONENT_ARCHIVE_HASH=    \
    sha256:62e1116549ce5b1ad92901f04d8338d5f7b59f92abce8d15e9a17cafe0efb102
    sha256:9883e419c336c63b0cb5202b09537c140966d585e4d0da66147dc513da13e629
COMPONENT_ARCHIVE_URL=    http://sourceforge.net/projects/pcre/files/pcre/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)
COMPONENT_SUMMARY=    Perl-Compatible Regular Expressions
COMPONENT_PROJECT_URL=  http://pcre.org/
COMPONENT_BUGDB=    library/pcre
COMPONENT_FMRI=        library/pcre
COMPONENT_CLASSIFICATION=    Development/C
COMPONENT_LICENSE=    BSD
COMPONENT_LICENSE_FILE=    LICENCE

include $(WS_TOP)/make-rules/prep.mk
include $(WS_TOP)/make-rules/configure.mk
@@ -91,6 +96,13 @@

COMPONENT_BUILD_ARGS+=    -e

# Master test results are the same for 32-bit and 64-bit, so override
# here, rather than create multiple identical master files.
COMPONENT_TEST_MASTER = $(COMPONENT_TEST_RESULTS_DIR)/results-all.master

COMPONENT_TEST_TRANSFORMS += \
    '-e "s|Testsuite summary for PCRE .*|Testsuite summary for PCRE|" '

ASLR_MODE = $(ASLR_ENABLE)

COMPONENT_INSTALL_ARGS+=    "INSTALL=$(INSTALL)"

 components/pcre/patches/01-doc.patch

New file
@@ -0,0 +1,27 @@
# Update doc files regarding JIT support on Solaris.
# Patch was developed in-house and is not appropriate for upstream.

--- pcre-8.37-orig/doc/pcrejit.3    Fri Jan 31 06:31:55 2014
+++ pcre-8.37/doc/pcrejit.3    Fri May  8 09:29:37 2015
@@ -44,6 +44,8 @@
   SPARC 32-bit (experimental)
 .sp
 If --enable-jit is set on an unsupported platform, compilation fails.
+.sp
+JIT support is not available on Solaris.
 .P
 A program that is linked with PCRE 8.20 or later can tell if JIT support is
 available by calling \fBpcre_config()\fP with the PCRE_CONFIG_JIT option. The
diff -ru pcre-8.37-orig/doc/html/pcrejit.html pcre-8.37/doc/html/pcrejit.html
--- pcre-8.37-orig/doc/html/pcrejit.html    Tue Apr 28 04:37:57 2015
+++ pcre-8.37/doc/html/pcrejit.html    Fri May  8 09:29:37 2015
@@ -69,6 +69,9 @@
 If --enable-jit is set on an unsupported platform, compilation fails.
 </P>
 <P>
+JIT support is not available on Solaris.
+</P>
+<P>
 A program that is linked with PCRE 8.20 or later can tell if JIT support is
 available by calling <b>pcre_config()</b> with the PCRE_CONFIG_JIT option. The
 result is 1 when JIT is available, and 0 otherwise. However, a simple program

 components/pcre/patches/02-Makefile_in.patch

New file
@@ -0,0 +1,17 @@
# Patch was developed in-house and is not appropriate for upstream.

--- pcre-8.37-orig/Makefile.in    Tue Apr 28 04:37:57 2015
+++ pcre-8.37/Makefile.in    Fri May  8 14:57:44 2015
@@ -782,9 +782,9 @@
 EXEEXT = @EXEEXT@
 EXTRA_LIBPCRE16_LDFLAGS = @EXTRA_LIBPCRE16_LDFLAGS@
 EXTRA_LIBPCRE32_LDFLAGS = @EXTRA_LIBPCRE32_LDFLAGS@
-EXTRA_LIBPCRECPP_LDFLAGS = @EXTRA_LIBPCRECPP_LDFLAGS@
-EXTRA_LIBPCREPOSIX_LDFLAGS = @EXTRA_LIBPCREPOSIX_LDFLAGS@
-EXTRA_LIBPCRE_LDFLAGS = @EXTRA_LIBPCRE_LDFLAGS@
+EXTRA_LIBPCRECPP_LDFLAGS = @CXXFLAGS@ @LDFLAGS@
+EXTRA_LIBPCREPOSIX_LDFLAGS = @LDFLAGS@
+EXTRA_LIBPCRE_LDFLAGS = @LDFLAGS@
 FGREP = @FGREP@
 GCOV_CFLAGS = @GCOV_CFLAGS@
 GCOV_CXXFLAGS = @GCOV_CXXFLAGS@

 components/pcre/patches/03-test-driver.patch

New file
@@ -0,0 +1,19 @@
Comment out the set -u (nounset) shell option in test-driver,
which errors out when encountering unset variables.
During "gmake test" the pcregrep binary is never called because it
causes a problem in the pcregrep libtool wrapper for
an unset variable $libtool_install_magic.
Problem is not seen when running "gmake check" directly from
command line.  Solaris-specific patch not appropriate for upstream.

--- pcre-8.37-orig/test-driver    2015-04-28 04:17:22.000000000 -0700
+++ pcre-8.37/test-driver    2015-06-19 11:43:59.905679371 -0700
@@ -29,7 +29,7 @@ scriptversion=2013-07-13.22; # UTC
 
 # Make unconditional expansion of undefined variables an error.  This
 # helps a lot in preventing typo-related bugs.
-set -u
+# set -u
 
 usage_error ()
 {

 components/pcre/patches/Makefile.in.patch

File was deleted

 components/pcre/patches/doc.patch

File was deleted

 components/pcre/patches/pcre_compile.patch

File was deleted

 components/pcre/pcre.license

File was deleted

 components/pcre/pcre.p5m

@@ -1,71 +1,80 @@
#
# CDDL HEADER START
# This file and its contents are supplied under the terms of the
# Common Development and Distribution License ("CDDL"), version 1.0.
# You may only use this file in accordance with the terms of version
# 1.0 of the CDDL.
#
# The contents of this file are subject to the terms of the
# Common Development and Distribution License (the "License").
# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
# See the License for the specific language governing permissions
# and limitations under the License.
#
# When distributing Covered Code, include this CDDL HEADER in each
# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
# If applicable, add the following below this CDDL HEADER, with the
# fields enclosed by brackets "[]" replaced with your own identifying
# information: Portions Copyright [yyyy] [name of copyright owner]
#
# CDDL HEADER END
#
# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
# A full copy of the text of the CDDL should have accompanied this
# source.  A copy of the CDDL is also available via the Internet at
# http://www.illumos.org/license/CDDL.
#

<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
#
# Copyright 2016 Alexander Pyhalov
#

set name=pkg.fmri value=pkg:/library/pcre@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Perl-Compatible Regular Expressions"
set name=pkg.description value="The PCRE library is a set of functions that implement regular expression pattern matching using almost the same syntax and semantics as Perl"
set name=com.oracle.info.description value="the PCRE library"
set name=com.oracle.info.tpno value=9271
set name=info.classification value="org.opensolaris.category.2008:Development/C"
set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="$(COMPONENT_SUMMARY)"
set name=info.classification value="$(COMPONENT_CLASSIFICATION)"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
set name=org.opensolaris.arc-caseid \
    value=PSARC/2012/081

license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'

file llib-lpcre path=usr/lib/llib-lpcre
file pcre_internal.h path=usr/include/pcre/pcre_internal.h
file ucp.h path=usr/include/pcre/ucp.h

file path=usr/bin/$(MACH64)/pcre-config
file path=usr/bin/$(MACH64)/pcregrep
file path=usr/bin/$(MACH64)/pcretest
file path=usr/bin/$(MACH64)/pcre-config
file path=usr/bin/pcre-config
file path=usr/bin/pcregrep
file path=usr/bin/pcretest
file path=usr/include/pcre/pcre.h
file pcre_internal.h path=usr/include/pcre/pcre_internal.h
file path=usr/include/pcre/pcre_scanner.h
file path=usr/include/pcre/pcre_stringpiece.h
file path=usr/include/pcre/pcrecpp.h
file path=usr/include/pcre/pcrecpparg.h
file path=usr/include/pcre/pcreposix.h
file ucp.h path=usr/include/pcre/ucp.h
link path=usr/lib/$(MACH64)/libpcre.so target=libpcre.so.0.0.0
link path=usr/lib/$(MACH64)/libpcre.so.0 target=libpcre.so.0.0.0
file path=usr/lib/$(MACH64)/libpcre.so.0.0.0
link path=usr/lib/$(MACH64)/libpcrecpp.so target=libpcrecpp.so.0.0.0
link path=usr/lib/$(MACH64)/libpcrecpp.so.0 target=libpcrecpp.so.0.0.0
file path=usr/lib/$(MACH64)/libpcrecpp.so.0.0.0
link path=usr/lib/$(MACH64)/libpcreposix.so target=libpcreposix.so.0.0.0
link path=usr/lib/$(MACH64)/libpcreposix.so.0 target=libpcreposix.so.0.0.0
file path=usr/lib/$(MACH64)/libpcreposix.so.0.0.0
file path=usr/lib/$(MACH64)/pkgconfig/libpcre.pc
file path=usr/lib/$(MACH64)/pkgconfig/libpcrecpp.pc
file path=usr/lib/$(MACH64)/pkgconfig/libpcreposix.pc
link path=usr/lib/libpcre.so target=libpcre.so.0.0.0
link path=usr/lib/libpcre.so.0 target=libpcre.so.0.0.0
file path=usr/lib/libpcre.so.0.0.0
link path=usr/lib/libpcrecpp.so target=libpcrecpp.so.0.0.0
link path=usr/lib/libpcrecpp.so.0 target=libpcrecpp.so.0.0.0
file path=usr/lib/libpcrecpp.so.0.0.0
link path=usr/lib/libpcreposix.so target=libpcreposix.so.0.0.0
link path=usr/lib/libpcreposix.so.0 target=libpcreposix.so.0.0.0
file path=usr/lib/libpcreposix.so.0.0.0
file llib-lpcre path=usr/lib/llib-lpcre
file path=usr/lib/pkgconfig/libpcre.pc
file path=usr/lib/pkgconfig/libpcrecpp.pc
file path=usr/lib/pkgconfig/libpcreposix.pc
file path=usr/share/doc/pcre/AUTHORS
file path=usr/share/doc/pcre/COPYING
file path=usr/share/doc/pcre/ChangeLog
file path=usr/share/doc/pcre/LICENCE
file path=usr/share/doc/pcre/NEWS
file path=usr/share/doc/pcre/README
file path=usr/share/doc/pcre/html/NON-AUTOTOOLS-BUILD.txt
file path=usr/share/doc/pcre/html/README.txt
file path=usr/share/doc/pcre/html/index.html
file path=usr/share/doc/pcre/html/pcre-config.html
file path=usr/share/doc/pcre/html/pcre.html
file path=usr/share/doc/pcre/html/pcre16.html
file path=usr/share/doc/pcre/html/pcre32.html
file path=usr/share/doc/pcre/html/pcre_assign_jit_stack.html
file path=usr/share/doc/pcre/html/pcre_compile.html
file path=usr/share/doc/pcre/html/pcre_compile2.html
@@ -83,12 +92,15 @@
file path=usr/share/doc/pcre/html/pcre_get_stringtable_entries.html
file path=usr/share/doc/pcre/html/pcre_get_substring.html
file path=usr/share/doc/pcre/html/pcre_get_substring_list.html
file path=usr/share/doc/pcre/html/pcre_info.html
file path=usr/share/doc/pcre/html/pcre_jit_exec.html
file path=usr/share/doc/pcre/html/pcre_jit_stack_alloc.html
file path=usr/share/doc/pcre/html/pcre_jit_stack_free.html
file path=usr/share/doc/pcre/html/pcre_maketables.html
file path=usr/share/doc/pcre/html/pcre_pattern_to_host_byte_order.html
file path=usr/share/doc/pcre/html/pcre_refcount.html
file path=usr/share/doc/pcre/html/pcre_study.html
file path=usr/share/doc/pcre/html/pcre_utf16_to_host_byte_order.html
file path=usr/share/doc/pcre/html/pcre_utf32_to_host_byte_order.html
file path=usr/share/doc/pcre/html/pcre_version.html
file path=usr/share/doc/pcre/html/pcreapi.html
file path=usr/share/doc/pcre/html/pcrebuild.html
@@ -107,12 +119,97 @@
file path=usr/share/doc/pcre/html/pcreprecompile.html
file path=usr/share/doc/pcre/html/pcresample.html
file path=usr/share/doc/pcre/html/pcrestack.html
file path=usr/share/doc/pcre/html/pcresyntax.html
file path=usr/share/doc/pcre/html/pcretest.html
file path=usr/share/doc/pcre/html/pcreunicode.html
file path=usr/share/doc/pcre/pcre-config.txt
file path=usr/share/doc/pcre/pcre.txt
file path=usr/share/doc/pcre/pcregrep.txt
file path=usr/share/doc/pcre/pcretest.txt
file path=usr/share/man/man1/pcre-config.1
file path=usr/share/man/man1/pcregrep.1
file path=usr/share/man/man1/pcretest.1
file path=usr/share/man/man3/pcre.3
file path=usr/share/man/man3/pcre16.3
link path=usr/share/man/man3/pcre16_assign_jit_stack.3 \
    target=pcre_assign_jit_stack.3
link path=usr/share/man/man3/pcre16_compile.3 target=pcre_compile.3
link path=usr/share/man/man3/pcre16_compile2.3 target=pcre_compile2.3
link path=usr/share/man/man3/pcre16_config.3 target=pcre_config.3
link path=usr/share/man/man3/pcre16_copy_named_substring.3 \
    target=pcre_copy_named_substring.3
link path=usr/share/man/man3/pcre16_copy_substring.3 \
    target=pcre_copy_substring.3
link path=usr/share/man/man3/pcre16_dfa_exec.3 target=pcre_dfa_exec.3
link path=usr/share/man/man3/pcre16_exec.3 target=pcre_exec.3
link path=usr/share/man/man3/pcre16_free_study.3 target=pcre_free_study.3
link path=usr/share/man/man3/pcre16_free_substring.3 \
    target=pcre_free_substring.3
link path=usr/share/man/man3/pcre16_free_substring_list.3 \
    target=pcre_free_substring_list.3
link path=usr/share/man/man3/pcre16_fullinfo.3 target=pcre_fullinfo.3
link path=usr/share/man/man3/pcre16_get_named_substring.3 \
    target=pcre_get_named_substring.3
link path=usr/share/man/man3/pcre16_get_stringnumber.3 \
    target=pcre_get_stringnumber.3
link path=usr/share/man/man3/pcre16_get_stringtable_entries.3 \
    target=pcre_get_stringtable_entries.3
link path=usr/share/man/man3/pcre16_get_substring.3 target=pcre_get_substring.3
link path=usr/share/man/man3/pcre16_get_substring_list.3 \
    target=pcre_get_substring_list.3
link path=usr/share/man/man3/pcre16_jit_exec.3 target=pcre_jit_exec.3
link path=usr/share/man/man3/pcre16_jit_stack_alloc.3 \
    target=pcre_jit_stack_alloc.3
link path=usr/share/man/man3/pcre16_jit_stack_free.3 \
    target=pcre_jit_stack_free.3
link path=usr/share/man/man3/pcre16_maketables.3 target=pcre_maketables.3
link path=usr/share/man/man3/pcre16_pattern_to_host_byte_order.3 \
    target=pcre_pattern_to_host_byte_order.3
link path=usr/share/man/man3/pcre16_refcount.3 target=pcre_refcount.3
link path=usr/share/man/man3/pcre16_study.3 target=pcre_study.3
link path=usr/share/man/man3/pcre16_utf16_to_host_byte_order.3 \
    target=pcre_utf16_to_host_byte_order.3
link path=usr/share/man/man3/pcre16_version.3 target=pcre_version.3
file path=usr/share/man/man3/pcre32.3
link path=usr/share/man/man3/pcre32_assign_jit_stack.3 \
    target=pcre_assign_jit_stack.3
link path=usr/share/man/man3/pcre32_compile.3 target=pcre_compile.3
link path=usr/share/man/man3/pcre32_compile2.3 target=pcre_compile2.3
link path=usr/share/man/man3/pcre32_config.3 target=pcre_config.3
link path=usr/share/man/man3/pcre32_copy_named_substring.3 \
    target=pcre_copy_named_substring.3
link path=usr/share/man/man3/pcre32_copy_substring.3 \
    target=pcre_copy_substring.3
link path=usr/share/man/man3/pcre32_dfa_exec.3 target=pcre_dfa_exec.3
link path=usr/share/man/man3/pcre32_exec.3 target=pcre_exec.3
link path=usr/share/man/man3/pcre32_free_study.3 target=pcre_free_study.3
link path=usr/share/man/man3/pcre32_free_substring.3 \
    target=pcre_free_substring.3
link path=usr/share/man/man3/pcre32_free_substring_list.3 \
    target=pcre_free_substring_list.3
link path=usr/share/man/man3/pcre32_fullinfo.3 target=pcre_fullinfo.3
link path=usr/share/man/man3/pcre32_get_named_substring.3 \
    target=pcre_get_named_substring.3
link path=usr/share/man/man3/pcre32_get_stringnumber.3 \
    target=pcre_get_stringnumber.3
link path=usr/share/man/man3/pcre32_get_stringtable_entries.3 \
    target=pcre_get_stringtable_entries.3
link path=usr/share/man/man3/pcre32_get_substring.3 target=pcre_get_substring.3
link path=usr/share/man/man3/pcre32_get_substring_list.3 \
    target=pcre_get_substring_list.3
link path=usr/share/man/man3/pcre32_jit_exec.3 target=pcre_jit_exec.3
link path=usr/share/man/man3/pcre32_jit_stack_alloc.3 \
    target=pcre_jit_stack_alloc.3
link path=usr/share/man/man3/pcre32_jit_stack_free.3 \
    target=pcre_jit_stack_free.3
link path=usr/share/man/man3/pcre32_maketables.3 target=pcre_maketables.3
link path=usr/share/man/man3/pcre32_pattern_to_host_byte_order.3 \
    target=pcre_pattern_to_host_byte_order.3
link path=usr/share/man/man3/pcre32_refcount.3 target=pcre_refcount.3
link path=usr/share/man/man3/pcre32_study.3 target=pcre_study.3
link path=usr/share/man/man3/pcre32_utf32_to_host_byte_order.3 \
    target=pcre_utf32_to_host_byte_order.3
link path=usr/share/man/man3/pcre32_version.3 target=pcre_version.3
file path=usr/share/man/man3/pcre_assign_jit_stack.3
file path=usr/share/man/man3/pcre_compile.3
file path=usr/share/man/man3/pcre_compile2.3
@@ -130,18 +227,22 @@
file path=usr/share/man/man3/pcre_get_stringtable_entries.3
file path=usr/share/man/man3/pcre_get_substring.3
file path=usr/share/man/man3/pcre_get_substring_list.3
file path=usr/share/man/man3/pcre_info.3
file path=usr/share/man/man3/pcre_jit_exec.3
file path=usr/share/man/man3/pcre_jit_stack_alloc.3
file path=usr/share/man/man3/pcre_jit_stack_free.3
file path=usr/share/man/man3/pcre_maketables.3
file path=usr/share/man/man3/pcre_pattern_to_host_byte_order.3
file path=usr/share/man/man3/pcre_refcount.3
file path=usr/share/man/man3/pcre_study.3
file path=usr/share/man/man3/pcre_utf16_to_host_byte_order.3
file path=usr/share/man/man3/pcre_utf32_to_host_byte_order.3
file path=usr/share/man/man3/pcre_version.3
file path=usr/share/man/man3/pcreapi.3
file path=usr/share/man/man3/pcrebuild.3
file path=usr/share/man/man3/pcrecallout.3
file path=usr/share/man/man3/pcrecompat.3
file path=usr/share/man/man3/pcrecpp.3
file path=usr/share/man/man3/pcredemo.3
file path=usr/share/man/man3/pcrejit.3
file path=usr/share/man/man3/pcrelimits.3
file path=usr/share/man/man3/pcrematching.3
@@ -154,18 +255,3 @@
file path=usr/share/man/man3/pcrestack.3
file path=usr/share/man/man3/pcresyntax.3
file path=usr/share/man/man3/pcreunicode.3

link path=usr/lib/$(MACH64)/libpcre.so target=libpcre.so.0.0.0
link path=usr/lib/$(MACH64)/libpcre.so.0 target=libpcre.so.0.0.0
link path=usr/lib/$(MACH64)/libpcrecpp.so target=libpcrecpp.so.0.0.0
link path=usr/lib/$(MACH64)/libpcrecpp.so.0 target=libpcrecpp.so.0.0.0
link path=usr/lib/$(MACH64)/libpcreposix.so target=libpcreposix.so.0.0.0
link path=usr/lib/$(MACH64)/libpcreposix.so.0 target=libpcreposix.so.0.0.0
link path=usr/lib/libpcre.so target=libpcre.so.0.0.0
link path=usr/lib/libpcre.so.0 target=libpcre.so.0.0.0
link path=usr/lib/libpcrecpp.so target=libpcrecpp.so.0.0.0
link path=usr/lib/libpcrecpp.so.0 target=libpcrecpp.so.0.0.0
link path=usr/lib/libpcreposix.so target=libpcreposix.so.0.0.0
link path=usr/lib/libpcreposix.so.0 target=libpcreposix.so.0.0.0

license pcre.license license="BSD"

 components/pcre/test/results-all.master

New file
@@ -0,0 +1,32 @@
make[1]: Entering directory '$(@D)'
/usr/gnu/bin/make  check-am
make[2]: Entering directory '$(@D)'
/usr/gnu/bin/make  
make[3]: Entering directory '$(@D)'
/usr/gnu/bin/make  all-am
make[4]: Entering directory '$(@D)'
make[4]: Leaving directory '$(@D)'
make[3]: Leaving directory '$(@D)'
/usr/gnu/bin/make  check-TESTS
make[3]: Entering directory '$(@D)'
make[4]: Entering directory '$(@D)'
PASS: pcrecpp_unittest
PASS: pcre_scanner_unittest
PASS: pcre_stringpiece_unittest
PASS: RunTest
PASS: RunGrepTest
============================================================================
Testsuite summary for PCRE
============================================================================
# TOTAL: 5
# PASS:  5
# SKIP:  0
# XFAIL: 0
# FAIL:  0
# XPASS: 0
# ERROR: 0
============================================================================
make[4]: Leaving directory '$(@D)'
make[3]: Leaving directory '$(@D)'
make[2]: Leaving directory '$(@D)'
make[1]: Leaving directory '$(@D)'