Skip to content

Commit c04b360

Browse files
committed
[GR-14956] Upgrade PCRE to 8.42.
PullRequest: fastr/1987
2 parents 959ccda + 5f69c4a commit c04b360

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

ci_common/common.hocon

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ logfiles : [
6161

6262
environmentLinux: {
6363
environment : {
64-
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"
65-
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"
64+
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"
65+
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"
6666
TZDIR: "/usr/share/zoneinfo"
6767
}
6868
}
@@ -84,7 +84,7 @@ packagesLinux : {
8484
"pip:ninja_syntax" : "==1.7.2"
8585
make : ">=3.83"
8686
gcc-build-essentials : "==4.9.1" # TODO: upgrade to 4.9.2
87-
pcre : ">=8.38"
87+
pcre : "==8.42"
8888
zlib : "==1.2.11"
8989
# these are needed to build GNU-R
9090
readline : "==6.3"
@@ -96,7 +96,7 @@ packagesDarwin : {
9696
"pip:astroid" : "==1.1.0"
9797
"pip:pylint" : "==1.1.0"
9898
"pip:ninja_syntax" : "==1.7.2"
99-
"pcre" : "==8.38"
99+
"pcre" : "==8.42"
100100
"homebrew/gcc" : "==4.9"
101101
}
102102

@@ -141,9 +141,9 @@ gateTestLinux : ${gateTestCommon} ${commonLinux}
141141

142142
gateTestDarwin : ${gateTestCommon} ${commonDarwin} {
143143
setup : [
144-
[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"]
144+
[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"]
145145
[set-export, MOD_LIB_PATH, [echo, "${LD_LIBRARY_PATH}", |, tr, "\:", "\\n", |, grep, lib/gcc, |, tail, "-1"]]
146-
[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"]
146+
[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"]
147147
]
148148
}
149149

0 commit comments

Comments
 (0)