gnu/packages/patches/mozjs38-version-detection.patch

   1 Taken from
   2 https://trac.wildfiregames.com/export/18656/ps/trunk/libraries/source/spidermonkey/FixVersionDetectionConfigure.diff.
   3
   4 Fixes a version detection issue in 0ad.  See
   5 https://lists.gnu.org/archive/html/guix-devel/2017-01/msg00625.html.
   6
   7 diff --git a/js/src/configure b/js/src/configure
   8 --- a/js/src/configure
   9 +++ b/js/src/configure
  10 @@ -1662,70 +1662,6 @@ esac
  11
  12  fi
  13
  14 -MOZILLA_VERSION=`$PYTHON $srcdir/python/mozbuild/mozbuild/milestone.py --topsrcdir $srcdir`
  15 -MOZILLA_UAVERSION=`$PYTHON $srcdir/python/mozbuild/mozbuild/milestone.py --topsrcdir $srcdir --uaversion`
  16 -MOZILLA_SYMBOLVERSION=`$PYTHON $srcdir/python/mozbuild/mozbuild/milestone.py --topsrcdir $srcdir --symbolversion`
  17 -
  18 -cat >> confdefs.pytmp <<EOF
  19 -    (''' MOZILLA_VERSION ''', r''' "$MOZILLA_VERSION" ''')
  20 -EOF
  21 -cat >> confdefs.h <<EOF
  22 -#define MOZILLA_VERSION "$MOZILLA_VERSION"
  23 -EOF
  24 -
  25 -cat >> confdefs.pytmp <<EOF
  26 -    (''' MOZILLA_VERSION_U ''', r''' $MOZILLA_VERSION ''')
  27 -EOF
  28 -cat >> confdefs.h <<EOF
  29 -#define MOZILLA_VERSION_U $MOZILLA_VERSION
  30 -EOF
  31 -
  32 -cat >> confdefs.pytmp <<EOF
  33 -    (''' MOZILLA_UAVERSION ''', r''' "$MOZILLA_UAVERSION" ''')
  34 -EOF
  35 -cat >> confdefs.h <<EOF
  36 -#define MOZILLA_UAVERSION "$MOZILLA_UAVERSION"
  37 -EOF
  38 -
  39 -
  40 -
  41 -# Separate version into components for use in shared object naming etc
  42 -
  43 -MOZJS_MAJOR_VERSION=`echo $MOZILLA_VERSION | sed "s|\(^[0-9]*\)\.[0-9]*.*|\1|"`
  44 -MOZJS_MINOR_VERSION=`echo $MOZILLA_VERSION | sed "s|^[0-9]*\.\([0-9]*\).*|\1|"`
  45 -MOZJS_PATCH_VERSION=`echo $MOZILLA_VERSION | sed "s|^[0-9]*\.[0-9]*[^0-9]*||"`
  46 -IS_ALPHA=`echo $MOZILLA_VERSION | grep '[ab]'`
  47 -
  48 -JS_SHELL_NAME=js
  49 -JS_CONFIG_NAME=js-config
  50 -
  51 -
  52 -if test -n "$IS_ALPHA"; then
  53 -
  54 -  MOZJS_ALPHA=`echo $MOZILLA_VERSION | sed "s|^[0-9]*\.[0-9\.]*\([^0-9]\).*|\1|"`
  55 -
  56 -fi
  57 -cat >> confdefs.pytmp <<EOF
  58 -    (''' MOZJS_MAJOR_VERSION ''', r''' $MOZJS_MAJOR_VERSION ''')
  59 -EOF
  60 -cat >> confdefs.h <<EOF
  61 -#define MOZJS_MAJOR_VERSION $MOZJS_MAJOR_VERSION
  62 -EOF
  63 -
  64 -cat >> confdefs.pytmp <<EOF
  65 -    (''' MOZJS_MINOR_VERSION ''', r''' $MOZJS_MINOR_VERSION ''')
  66 -EOF
  67 -cat >> confdefs.h <<EOF
  68 -#define MOZJS_MINOR_VERSION $MOZJS_MINOR_VERSION
  69 -EOF
  70 -
  71 -
  72 -
  73 -
  74 -
  75 -
  76 -
  77 -
  78
  79  AR_FLAGS='crs $@'
  80
  81 @@ -5731,6 +5565,71 @@ XCFLAGS="$X_CFLAGS"
  82
  83  fi # COMPILE_ENVIRONMENT
  84
  85 +MOZILLA_VERSION=`$PYTHON $srcdir/python/mozbuild/mozbuild/milestone.py --topsrcdir $srcdir`
  86 +MOZILLA_UAVERSION=`$PYTHON $srcdir/python/mozbuild/mozbuild/milestone.py --topsrcdir $srcdir --uaversion`
  87 +MOZILLA_SYMBOLVERSION=`$PYTHON $srcdir/python/mozbuild/mozbuild/milestone.py --topsrcdir $srcdir --symbolversion`
  88 +
  89 +cat >> confdefs.pytmp <<EOF
  90 +    (''' MOZILLA_VERSION ''', r''' "$MOZILLA_VERSION" ''')
  91 +EOF
  92 +cat >> confdefs.h <<EOF
  93 +#define MOZILLA_VERSION "$MOZILLA_VERSION"
  94 +EOF
  95 +
  96 +cat >> confdefs.pytmp <<EOF
  97 +    (''' MOZILLA_VERSION_U ''', r''' $MOZILLA_VERSION ''')
  98 +EOF
  99 +cat >> confdefs.h <<EOF
 100 +#define MOZILLA_VERSION_U $MOZILLA_VERSION
 101 +EOF
 102 +
 103 +cat >> confdefs.pytmp <<EOF
 104 +    (''' MOZILLA_UAVERSION ''', r''' "$MOZILLA_UAVERSION" ''')
 105 +EOF
 106 +cat >> confdefs.h <<EOF
 107 +#define MOZILLA_UAVERSION "$MOZILLA_UAVERSION"
 108 +EOF
 109 +
 110 +
 111 +
 112 +# Separate version into components for use in shared object naming etc
 113 +
 114 +MOZJS_MAJOR_VERSION=`echo $MOZILLA_VERSION | sed "s|\(^[0-9]*\)\.[0-9]*.*|\1|"`
 115 +MOZJS_MINOR_VERSION=`echo $MOZILLA_VERSION | sed "s|^[0-9]*\.\([0-9]*\).*|\1|"`
 116 +MOZJS_PATCH_VERSION=`echo $MOZILLA_VERSION | sed "s|^[0-9]*\.[0-9]*[^0-9]*||"`
 117 +IS_ALPHA=`echo $MOZILLA_VERSION | grep '[ab]'`
 118 +
 119 +JS_SHELL_NAME=js
 120 +JS_CONFIG_NAME=js-config
 121 +
 122 +
 123 +if test -n "$IS_ALPHA"; then
 124 +
 125 +  MOZJS_ALPHA=`echo $MOZILLA_VERSION | sed "s|^[0-9]*\.[0-9\.]*\([^0-9]\).*|\1|"`
 126 +
 127 +fi
 128 +cat >> confdefs.pytmp <<EOF
 129 +    (''' MOZJS_MAJOR_VERSION ''', r''' $MOZJS_MAJOR_VERSION ''')
 130 +EOF
 131 +cat >> confdefs.h <<EOF
 132 +#define MOZJS_MAJOR_VERSION $MOZJS_MAJOR_VERSION
 133 +EOF
 134 +
 135 +cat >> confdefs.pytmp <<EOF
 136 +    (''' MOZJS_MINOR_VERSION ''', r''' $MOZJS_MINOR_VERSION ''')
 137 +EOF
 138 +cat >> confdefs.h <<EOF
 139 +#define MOZJS_MINOR_VERSION $MOZJS_MINOR_VERSION
 140 +EOF
 141 +
 142 +
 143 +
 144 +
 145 +
 146 +
 147 +
 148 +
 149 +
 150  AS_BIN=$AS
 151  AR_LIST='$(AR) t'
 152  AR_EXTRACT='$(AR) x'
 153 @@ -16003,13 +15908,6 @@ sed 's/$/,/' >> $CONFIG_STATUS <<EOF
 154      (''' ANDROID_NDK ''', r''' $ANDROID_NDK ''')
 155      (''' ANDROID_TOOLCHAIN ''', r''' $ANDROID_TOOLCHAIN ''')
 156      (''' ANDROID_PLATFORM ''', r''' $ANDROID_PLATFORM ''')
 157 -    (''' MOZILLA_SYMBOLVERSION ''', r''' $MOZILLA_SYMBOLVERSION ''')
 158 -    (''' JS_SHELL_NAME ''', r''' $JS_SHELL_NAME ''')
 159 -    (''' JS_CONFIG_NAME ''', r''' $JS_CONFIG_NAME ''')
 160 -    (''' MOZJS_MAJOR_VERSION ''', r''' $MOZJS_MAJOR_VERSION ''')
 161 -    (''' MOZJS_MINOR_VERSION ''', r''' $MOZJS_MINOR_VERSION ''')
 162 -    (''' MOZJS_PATCH_VERSION ''', r''' $MOZJS_PATCH_VERSION ''')
 163 -    (''' MOZJS_ALPHA ''', r''' $MOZJS_ALPHA ''')
 164      (''' HOST_CC ''', r''' $HOST_CC ''')
 165      (''' HOST_CXX ''', r''' $HOST_CXX ''')
 166      (''' HOST_RANLIB ''', r''' $HOST_RANLIB ''')
 167 @@ -16061,6 +15959,13 @@ sed 's/$/,/' >> $CONFIG_STATUS <<EOF
 168      (''' X_PRE_LIBS ''', r''' $X_PRE_LIBS ''')
 169      (''' X_LIBS ''', r''' $X_LIBS ''')
 170      (''' X_EXTRA_LIBS ''', r''' $X_EXTRA_LIBS ''')
 171 +    (''' MOZILLA_SYMBOLVERSION ''', r''' $MOZILLA_SYMBOLVERSION ''')
 172 +    (''' JS_SHELL_NAME ''', r''' $JS_SHELL_NAME ''')
 173 +    (''' JS_CONFIG_NAME ''', r''' $JS_CONFIG_NAME ''')
 174 +    (''' MOZJS_MAJOR_VERSION ''', r''' $MOZJS_MAJOR_VERSION ''')
 175 +    (''' MOZJS_MINOR_VERSION ''', r''' $MOZJS_MINOR_VERSION ''')
 176 +    (''' MOZJS_PATCH_VERSION ''', r''' $MOZJS_PATCH_VERSION ''')
 177 +    (''' MOZJS_ALPHA ''', r''' $MOZJS_ALPHA ''')
 178      (''' SOLARIS_SUNPRO_CC ''', r''' $SOLARIS_SUNPRO_CC ''')
 179      (''' SOLARIS_SUNPRO_CXX ''', r''' $SOLARIS_SUNPRO_CXX ''')
 180      (''' MOZ_THUMB2 ''', r''' $MOZ_THUMB2 ''')