mirror of
https://github.com/jemalloc/jemalloc.git
synced 2026-08-25 08:33:38 +03:00
Improve the portability of grep patterns in configure.ac. Closes #2777.
The configure.ac script uses backslash plus in its grep patterns to match one or more occurrences. This is a GNU grep extension to the Basic Regular Expressions syntax that fails on systems with a more traditional grep. This changes fixes grep patterns that use backslash plus to use a star instead.
This commit is contained in:
parent
65ac0e2799
commit
c8cce48aef
1 changed files with 2 additions and 2 deletions
|
|
@ -652,7 +652,7 @@ AC_ARG_WITH([version],
|
||||||
[AS_HELP_STRING([--with-version=<major>.<minor>.<bugfix>-<nrev>-g<gid>],
|
[AS_HELP_STRING([--with-version=<major>.<minor>.<bugfix>-<nrev>-g<gid>],
|
||||||
[Version string])],
|
[Version string])],
|
||||||
[
|
[
|
||||||
echo "${with_version}" | grep ['^[0-9]\+\.[0-9]\+\.[0-9]\+-[0-9]\+-g[0-9a-f]\+$'] 2>&1 1>/dev/null
|
echo "${with_version}" | grep ['^[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*-[0-9][0-9]*-g[0-9a-f][0-9a-f]*$'] 2>&1 1>/dev/null
|
||||||
if test $? -eq 0 ; then
|
if test $? -eq 0 ; then
|
||||||
echo "$with_version" > "${objroot}VERSION"
|
echo "$with_version" > "${objroot}VERSION"
|
||||||
else
|
else
|
||||||
|
|
@ -2059,7 +2059,7 @@ if test "x${je_cv_lg_hugepage}" = "x" ; then
|
||||||
dnl Hugepagesize: 2048 kB
|
dnl Hugepagesize: 2048 kB
|
||||||
if test -e "/proc/meminfo" ; then
|
if test -e "/proc/meminfo" ; then
|
||||||
hpsk=[`cat /proc/meminfo 2>/dev/null | \
|
hpsk=[`cat /proc/meminfo 2>/dev/null | \
|
||||||
grep -e '^Hugepagesize:[[:space:]]\+[0-9]\+[[:space:]]kB$' | \
|
grep '^Hugepagesize:[[:space:]][[:space:]]*[0-9][0-9]*[[:space:]]kB$' | \
|
||||||
awk '{print $2}'`]
|
awk '{print $2}'`]
|
||||||
if test "x${hpsk}" != "x" ; then
|
if test "x${hpsk}" != "x" ; then
|
||||||
je_cv_lg_hugepage=10
|
je_cv_lg_hugepage=10
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue