Merge remote-tracking branch 'mfischer/pcre' into next

diff --git a/config/rootfiles/common/pcre b/config/rootfiles/common/pcre
index 5c292700c77ce6d28e70b913f1190d8692baa33d..78ac2a24fba7e91a6ceb7a5b673a4f59d72988d4 100644 (file)
--- a/config/rootfiles/common/pcre
+++ b/config/rootfiles/common/pcre
@@ -10,15 +10,15 @@
 #usr/lib/libpcre.la
 usr/lib/libpcre.so
 usr/lib/libpcre.so.1
-usr/lib/libpcre.so.1.0.1
+usr/lib/libpcre.so.1.2.4
 #usr/lib/libpcrecpp.la
 usr/lib/libpcrecpp.so
 usr/lib/libpcrecpp.so.0
-usr/lib/libpcrecpp.so.0.0.0
+usr/lib/libpcrecpp.so.0.0.1
 #usr/lib/libpcreposix.la
 usr/lib/libpcreposix.so
 usr/lib/libpcreposix.so.0
-usr/lib/libpcreposix.so.0.0.1
+usr/lib/libpcreposix.so.0.0.3
 #usr/lib/pkgconfig/libpcre.pc
 #usr/lib/pkgconfig/libpcrecpp.pc
 #usr/lib/pkgconfig/libpcreposix.pc
@@ -30,10 +30,13 @@ usr/lib/libpcreposix.so.0.0.1
 #usr/share/doc/pcre/NEWS
 #usr/share/doc/pcre/README
 #usr/share/doc/pcre/html
+#usr/share/doc/pcre/html/NON-AUTOTOOLS-BUILD.txt
+#usr/share/doc/pcre/html/README.txt
 #usr/share/doc/pcre/html/index.html
 #usr/share/doc/pcre/html/pcre-config.html
 #usr/share/doc/pcre/html/pcre.html
 #usr/share/doc/pcre/html/pcre16.html
+#usr/share/doc/pcre/html/pcre32.html
 #usr/share/doc/pcre/html/pcre_assign_jit_stack.html
 #usr/share/doc/pcre/html/pcre_compile.html
 #usr/share/doc/pcre/html/pcre_compile2.html
@@ -51,6 +54,7 @@ usr/lib/libpcreposix.so.0.0.1
 #usr/share/doc/pcre/html/pcre_get_stringtable_entries.html
 #usr/share/doc/pcre/html/pcre_get_substring.html
 #usr/share/doc/pcre/html/pcre_get_substring_list.html
+#usr/share/doc/pcre/html/pcre_jit_exec.html
 #usr/share/doc/pcre/html/pcre_jit_stack_alloc.html
 #usr/share/doc/pcre/html/pcre_jit_stack_free.html
 #usr/share/doc/pcre/html/pcre_maketables.html
@@ -58,6 +62,7 @@ usr/lib/libpcreposix.so.0.0.1
 #usr/share/doc/pcre/html/pcre_refcount.html
 #usr/share/doc/pcre/html/pcre_study.html
 #usr/share/doc/pcre/html/pcre_utf16_to_host_byte_order.html
+#usr/share/doc/pcre/html/pcre_utf32_to_host_byte_order.html
 #usr/share/doc/pcre/html/pcre_version.html
 #usr/share/doc/pcre/html/pcreapi.html
 #usr/share/doc/pcre/html/pcrebuild.html
@@ -105,6 +110,7 @@ usr/lib/libpcreposix.so.0.0.1
 #usr/share/man/man3/pcre16_get_stringtable_entries.3
 #usr/share/man/man3/pcre16_get_substring.3
 #usr/share/man/man3/pcre16_get_substring_list.3
+#usr/share/man/man3/pcre16_jit_exec.3
 #usr/share/man/man3/pcre16_jit_stack_alloc.3
 #usr/share/man/man3/pcre16_jit_stack_free.3
 #usr/share/man/man3/pcre16_maketables.3
@@ -113,6 +119,33 @@ usr/lib/libpcreposix.so.0.0.1
 #usr/share/man/man3/pcre16_study.3
 #usr/share/man/man3/pcre16_utf16_to_host_byte_order.3
 #usr/share/man/man3/pcre16_version.3
+#usr/share/man/man3/pcre32.3
+#usr/share/man/man3/pcre32_assign_jit_stack.3
+#usr/share/man/man3/pcre32_compile.3
+#usr/share/man/man3/pcre32_compile2.3
+#usr/share/man/man3/pcre32_config.3
+#usr/share/man/man3/pcre32_copy_named_substring.3
+#usr/share/man/man3/pcre32_copy_substring.3
+#usr/share/man/man3/pcre32_dfa_exec.3
+#usr/share/man/man3/pcre32_exec.3
+#usr/share/man/man3/pcre32_free_study.3
+#usr/share/man/man3/pcre32_free_substring.3
+#usr/share/man/man3/pcre32_free_substring_list.3
+#usr/share/man/man3/pcre32_fullinfo.3
+#usr/share/man/man3/pcre32_get_named_substring.3
+#usr/share/man/man3/pcre32_get_stringnumber.3
+#usr/share/man/man3/pcre32_get_stringtable_entries.3
+#usr/share/man/man3/pcre32_get_substring.3
+#usr/share/man/man3/pcre32_get_substring_list.3
+#usr/share/man/man3/pcre32_jit_exec.3
+#usr/share/man/man3/pcre32_jit_stack_alloc.3
+#usr/share/man/man3/pcre32_jit_stack_free.3
+#usr/share/man/man3/pcre32_maketables.3
+#usr/share/man/man3/pcre32_pattern_to_host_byte_order.3
+#usr/share/man/man3/pcre32_refcount.3
+#usr/share/man/man3/pcre32_study.3
+#usr/share/man/man3/pcre32_utf32_to_host_byte_order.3
+#usr/share/man/man3/pcre32_version.3
 #usr/share/man/man3/pcre_assign_jit_stack.3
 #usr/share/man/man3/pcre_compile.3
 #usr/share/man/man3/pcre_compile2.3
@@ -130,6 +163,7 @@ usr/lib/libpcreposix.so.0.0.1
 #usr/share/man/man3/pcre_get_stringtable_entries.3
 #usr/share/man/man3/pcre_get_substring.3
 #usr/share/man/man3/pcre_get_substring_list.3
+#usr/share/man/man3/pcre_jit_exec.3
 #usr/share/man/man3/pcre_jit_stack_alloc.3
 #usr/share/man/man3/pcre_jit_stack_free.3
 #usr/share/man/man3/pcre_maketables.3
@@ -137,12 +171,14 @@ usr/lib/libpcreposix.so.0.0.1
 #usr/share/man/man3/pcre_refcount.3
 #usr/share/man/man3/pcre_study.3
 #usr/share/man/man3/pcre_utf16_to_host_byte_order.3
+#usr/share/man/man3/pcre_utf32_to_host_byte_order.3
 #usr/share/man/man3/pcre_version.3
 #usr/share/man/man3/pcreapi.3
 #usr/share/man/man3/pcrebuild.3
 #usr/share/man/man3/pcrecallout.3
 #usr/share/man/man3/pcrecompat.3
 #usr/share/man/man3/pcrecpp.3
+#usr/share/man/man3/pcredemo.3
 #usr/share/man/man3/pcrejit.3
 #usr/share/man/man3/pcrelimits.3
 #usr/share/man/man3/pcrematching.3

diff --git a/lfs/pcre b/lfs/pcre
index 5aa40bd20d08d41253f4cd21326061dff376542f..f5c771ca81ea21ab838fb71b03cbbd67c36e6666 100644 (file)
--- a/lfs/pcre
+++ b/lfs/pcre
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 8.31
+VER        = 8.36
 
 THISAPP    = pcre-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = fab1bb3b91a4c35398263a5c1e0858c1
+$(DL_FILE)_MD5 = ff7b4bb14e355f04885cf18ff4125c98
 
 install : $(TARGET)
 
@@ -74,7 +74,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                --prefix=/usr \
                --disable-static \
                --enable-utf8 \
-               --enable-jit \
+               --disable-jit \
                --enable-unicode-properties
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install