diff options
author | antirez <antirez@gmail.com> | 2015-10-07 09:17:06 +0200 |
---|---|---|
committer | antirez <antirez@gmail.com> | 2015-10-07 09:17:06 +0200 |
commit | 3f38b51ad785ab98f6721ddb2adcfc0a6cf7a76b (patch) | |
tree | 98558772d738137112060d946be82582927fc589 /deps/jemalloc | |
parent | a9951b1b6a326532163e0fe4ee1a26e972258a1e (diff) | |
download | redis-3f38b51ad785ab98f6721ddb2adcfc0a6cf7a76b.tar.gz |
Jemalloc configure script fixed to work nested.
Now way to make unmodified Jemalloc configure to work when the jemalloc
source tree is inside a subdirectory of a different git repository.
Problem signaled here:
http://www.canonware.com/pipermail/jemalloc-discuss/2015-October/001174.html
Diffstat (limited to 'deps/jemalloc')
-rwxr-xr-x | deps/jemalloc/configure | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/deps/jemalloc/configure b/deps/jemalloc/configure index 4feae0b4b..8c56c92a1 100755 --- a/deps/jemalloc/configure +++ b/deps/jemalloc/configure @@ -6965,24 +6965,6 @@ else fi - -if test "x`test ! \"${srcroot}\" && cd \"${srcroot}\"; git rev-parse --is-inside-work-tree 2>/dev/null`" = "xtrue" ; then - rm -f "${objroot}VERSION" - for pattern in '[0-9].[0-9].[0-9]' '[0-9].[0-9].[0-9][0-9]' \ - '[0-9].[0-9][0-9].[0-9]' '[0-9].[0-9][0-9].[0-9][0-9]' \ - '[0-9][0-9].[0-9].[0-9]' '[0-9][0-9].[0-9].[0-9][0-9]' \ - '[0-9][0-9].[0-9][0-9].[0-9]' \ - '[0-9][0-9].[0-9][0-9].[0-9][0-9]'; do - if test ! -e "${objroot}VERSION" ; then - (test ! "${srcroot}" && cd "${srcroot}"; git describe --long --abbrev=40 --match="${pattern}") > "${objroot}VERSION.tmp" 2>/dev/null - if test $? -eq 0 ; then - mv "${objroot}VERSION.tmp" "${objroot}VERSION" - break - fi - fi - done -fi -rm -f "${objroot}VERSION.tmp" if test ! -e "${objroot}VERSION" ; then if test ! -e "${srcroot}VERSION" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: Missing VERSION file, and unable to generate it; creating bogus VERSION" >&5 |