diff options
| author | Lorry Tar Creator <lorry-tar-importer@baserock.org> | 2013-12-11 22:24:18 +0000 |
|---|---|---|
| committer | <> | 2014-07-24 09:30:59 +0000 |
| commit | 59e2936f588aa945e8dcd6c737523c299067e9d0 (patch) | |
| tree | 97e74980cc54baa19de5faa11f5a50a0121a48ea /patches/shell-version.patch | |
| download | mozjs24-59e2936f588aa945e8dcd6c737523c299067e9d0.tar.gz | |
Imported from /home/lorry/working-area/delta_mozilla_mozjs24/mozjs-24.2.0.tar.bz2.HEADmozjs-24.2.0master
Diffstat (limited to 'patches/shell-version.patch')
| -rw-r--r-- | patches/shell-version.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/patches/shell-version.patch b/patches/shell-version.patch new file mode 100644 index 0000000..04cbe26 --- /dev/null +++ b/patches/shell-version.patch @@ -0,0 +1,29 @@ +# HG changeset patch +# Parent 4732a0e5d22bc7e5c1f1ace7a182d537d9cc2c6a +Add major version to shell and js-config filenames. + +diff --git a/js/src/configure.in b/js/src/configure.in +--- a/js/src/configure.in ++++ b/js/src/configure.in +@@ -234,16 +234,13 @@ MOZJS_MINOR_VERSION=`echo $MOZILLA_VERSI + MOZJS_PATCH_VERSION=`echo $MOZILLA_VERSION | sed "s|^[0-9]*\.[0-9]*[^0-9]*||"` + IS_ALPHA=`echo $MOZILLA_VERSION | grep [ab]` + +-dnl XXX in a temporary bid to avoid developer anger at renaming files +-dnl XXX before "js" symlinks exist, don't change names. +-dnl +-dnl if test -n "$JS_STANDALONE"; then +-dnl JS_SHELL_NAME=js$MOZJS_MAJOR_VERSION +-dnl JS_CONFIG_NAME=js$MOZJS_MAJOR_VERSION-config +-dnl else ++if test -n "$JS_STANDALONE"; then ++JS_SHELL_NAME=js$MOZJS_MAJOR_VERSION ++JS_CONFIG_NAME=js$MOZJS_MAJOR_VERSION-config ++else + JS_SHELL_NAME=js + JS_CONFIG_NAME=js-config +-dnl fi ++fi + + changequote([,]) + if test -n "$IS_ALPHA"; then |