[GR-14956] Upgrade PCRE to 8.42.

PullRequest: fastr/1987
oracle · Apr 4, 2019 · c04b360 · c04b360
2 parents 959ccda + 5f69c4a
commit c04b360
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/ci_common/common.hocon b/ci_common/common.hocon
@@ -61,8 +61,8 @@ logfiles : [
 
 environmentLinux: {
   environment : {
-    PKG_INCLUDE_FLAGS_OVERRIDE : "-I/cm/shared/apps/zlib/1.2.11/include -I/cm/shared/apps/bzip2/1.0.6/include -I/cm/shared/apps/xz/5.2.2/include -I/cm/shared/apps/pcre/8.38/include -I/cm/shared/apps/curl/7.50.1/include"
-    PKG_LDFLAGS_OVERRIDE : "-L/cm/shared/apps/zlib/1.2.11/lib -L/cm/shared/apps/bzip2/1.0.6/lib -L/cm/shared/apps/xz/5.2.2/lib -L/cm/shared/apps/pcre/8.38/lib -L/cm/shared/apps/curl/7.50.1/lib -L/cm/shared/apps/gcc/4.9.1/lib64"
+    PKG_INCLUDE_FLAGS_OVERRIDE : "-I/cm/shared/apps/zlib/1.2.11/include -I/cm/shared/apps/bzip2/1.0.6/include -I/cm/shared/apps/xz/5.2.2/include -I/cm/shared/apps/pcre/8.42/include -I/cm/shared/apps/curl/7.50.1/include"
+    PKG_LDFLAGS_OVERRIDE : "-L/cm/shared/apps/zlib/1.2.11/lib -L/cm/shared/apps/bzip2/1.0.6/lib -L/cm/shared/apps/xz/5.2.2/lib -L/cm/shared/apps/pcre/8.42/lib -L/cm/shared/apps/curl/7.50.1/lib -L/cm/shared/apps/gcc/4.9.1/lib64"
     TZDIR: "/usr/share/zoneinfo"
   }
 }
@@ -84,7 +84,7 @@ packagesLinux : {
     "pip:ninja_syntax" : "==1.7.2"
     make : ">=3.83"
     gcc-build-essentials : "==4.9.1" # TODO: upgrade to 4.9.2
-    pcre : ">=8.38"
+    pcre : "==8.42"
     zlib : "==1.2.11"
     # these are needed to build GNU-R
     readline : "==6.3"
@@ -96,7 +96,7 @@ packagesDarwin : {
   "pip:astroid" : "==1.1.0"
   "pip:pylint" : "==1.1.0"
   "pip:ninja_syntax" : "==1.7.2"
-  "pcre" : "==8.38"
+  "pcre" : "==8.42"
   "homebrew/gcc" : "==4.9"
 }
 
@@ -141,9 +141,9 @@ gateTestLinux : ${gateTestCommon} ${commonLinux}
 
 gateTestDarwin : ${gateTestCommon} ${commonDarwin} {
   setup : [
-    [set-export, PKG_INCLUDE_FLAGS_OVERRIDE, "-I/cm/shared/apps/pcre/8.38/include -I/cm/shared/apps/bzip2/1.0.6/include -I/cm/shared/apps/xz/5.2.2/include -I/cm/shared/apps/curl/7.50.1/include"]
+    [set-export, PKG_INCLUDE_FLAGS_OVERRIDE, "-I/cm/shared/apps/pcre/8.42/include -I/cm/shared/apps/bzip2/1.0.6/include -I/cm/shared/apps/xz/5.2.2/include -I/cm/shared/apps/curl/7.50.1/include"]
     [set-export, MOD_LIB_PATH, [echo, "${LD_LIBRARY_PATH}", |, tr, "\:", "\\n", |, grep, lib/gcc, |, tail, "-1"]]
-    [set-export, PKG_LDFLAGS_OVERRIDE, "-L/cm/shared/apps/bzip2/1.0.6/lib -L/cm/shared/apps/xz/5.2.2/lib -L/cm/shared/apps/pcre/8.38/lib -L/cm/shared/apps/curl/7.50.1/lib -L${MOD_LIB_PATH} -L/usr/lib"]
+    [set-export, PKG_LDFLAGS_OVERRIDE, "-L/cm/shared/apps/bzip2/1.0.6/lib -L/cm/shared/apps/xz/5.2.2/lib -L/cm/shared/apps/pcre/8.42/lib -L/cm/shared/apps/curl/7.50.1/lib -L${MOD_LIB_PATH} -L/usr/lib"]
   ]
 }