memory/jemalloc/0001-Dont-overwrite-VERSION-on-a-git-repository.patch

   1 diff --git a/configure b/configure
   2 --- a/configure
   3 +++ b/configure
   4 @@ -6662,28 +6662,6 @@ fi
   5
   6
   7
   8 -if test "x`git rev-parse --is-inside-work-tree 2>/dev/null`" = "xtrue" ; then
   9 -        rm -f "${srcroot}VERSION"
  10 -  for pattern in '[0-9].[0-9].[0-9]' '[0-9].[0-9].[0-9][0-9]' \
  11 -                 '[0-9].[0-9][0-9].[0-9]' '[0-9].[0-9][0-9].[0-9][0-9]' \
  12 -                 '[0-9][0-9].[0-9].[0-9]' '[0-9][0-9].[0-9].[0-9][0-9]' \
  13 -                 '[0-9][0-9].[0-9][0-9].[0-9]' \
  14 -                 '[0-9][0-9].[0-9][0-9].[0-9][0-9]'; do
  15 -    if test ! -e "${srcroot}VERSION" ; then
  16 -      git describe --long --abbrev=40 --match="${pattern}" > "${srcroot}VERSION.tmp" 2>/dev/null
  17 -      if test $? -eq 0 ; then
  18 -        mv "${srcroot}VERSION.tmp" "${srcroot}VERSION"
  19 -        break
  20 -      fi
  21 -    fi
  22 -  done
  23 -fi
  24 -rm -f "${srcroot}VERSION.tmp"
  25 -if test ! -e "${srcroot}VERSION" ; then
  26 -  { $as_echo "$as_me:${as_lineno-$LINENO}: result: Missing VERSION file, and unable to generate it; creating bogus VERSION" >&5
  27 -$as_echo "Missing VERSION file, and unable to generate it; creating bogus VERSION" >&6; }
  28 -  echo "0.0.0-0-g0000000000000000000000000000000000000000" > "${srcroot}VERSION"
  29 -fi
  30  jemalloc_version=`cat "${srcroot}VERSION"`
  31  jemalloc_version_major=`echo ${jemalloc_version} | tr ".g-" " " | awk '{print $1}'`
  32  jemalloc_version_minor=`echo ${jemalloc_version} | tr ".g-" " " | awk '{print $2}'`
  33 diff --git a/configure.ac b/configure.ac
  34 --- a/configure.ac
  35 +++ b/configure.ac
  36 @@ -1055,32 +1055,6 @@ dnl ============================================================================
  37  dnl jemalloc configuration.
  38  dnl
  39
  40 -dnl Set VERSION if source directory is inside a git repository.
  41 -if test "x`git rev-parse --is-inside-work-tree 2>/dev/null`" = "xtrue" ; then
  42 -  dnl Pattern globs aren't powerful enough to match both single- and
  43 -  dnl double-digit version numbers, so iterate over patterns to support up to
  44 -  dnl version 99.99.99 without any accidental matches.
  45 -  rm -f "${srcroot}VERSION"
  46 -  for pattern in ['[0-9].[0-9].[0-9]' '[0-9].[0-9].[0-9][0-9]' \
  47 -                 '[0-9].[0-9][0-9].[0-9]' '[0-9].[0-9][0-9].[0-9][0-9]' \
  48 -                 '[0-9][0-9].[0-9].[0-9]' '[0-9][0-9].[0-9].[0-9][0-9]' \
  49 -                 '[0-9][0-9].[0-9][0-9].[0-9]' \
  50 -                 '[0-9][0-9].[0-9][0-9].[0-9][0-9]']; do
  51 -    if test ! -e "${srcroot}VERSION" ; then
  52 -      git describe --long --abbrev=40 --match="${pattern}" > "${srcroot}VERSION.tmp" 2>/dev/null
  53 -      if test $? -eq 0 ; then
  54 -        mv "${srcroot}VERSION.tmp" "${srcroot}VERSION"
  55 -        break
  56 -      fi
  57 -    fi
  58 -  done
  59 -fi
  60 -rm -f "${srcroot}VERSION.tmp"
  61 -if test ! -e "${srcroot}VERSION" ; then
  62 -  AC_MSG_RESULT(
  63 -    [Missing VERSION file, and unable to generate it; creating bogus VERSION])
  64 -  echo "0.0.0-0-g0000000000000000000000000000000000000000" > "${srcroot}VERSION"
  65 -fi
  66  jemalloc_version=`cat "${srcroot}VERSION"`
  67  jemalloc_version_major=`echo ${jemalloc_version} | tr ".g-" " " | awk '{print [$]1}'`
  68  jemalloc_version_minor=`echo ${jemalloc_version} | tr ".g-" " " | awk '{print [$]2}'`