Thanks. I committed this.

In February, Rean Griffith <rg2...@caa.columbia.edu> sent patch titled
"Generalize
nodejs build to support recent versions (6.9.5 LTS and 7.5.0 latest)" which
enabled even later versions. He ended up needed several different patch
scripts for different versions, but I suspect that this might not be
necessary after I added support for nearbyint(). I also had several other
reservations on that patch, which is why it wasn't committed.

Did you also try more recent versions and failed? Or did you really want to
run 6.10 in particular?



--
Nadav Har'El
n...@scylladb.com

On Mon, May 8, 2017 at 1:39 PM, Gregor Berginc <gregor.berg...@gmail.com>
wrote:

> This is the current Node.js LTS version. The same changes to the patch
> will also work for the current 4.x release (at the time of this commit,
> 4.8.3) which was previously not working because the patch was
> introducing unnecessary changes.
>
> Signed-off-by: Gregor Berginc <gregor.berg...@gmail.com>
> ---
>  node/Makefile |  2 +-
>  node/patch    | 16 ----------------
>  2 files changed, 1 insertion(+), 17 deletions(-)
>
> diff --git a/node/Makefile b/node/Makefile
> index 9674ecc..b80d9c9 100644
> --- a/node/Makefile
> +++ b/node/Makefile
> @@ -10,7 +10,7 @@ $(LIB_NODE):
>
>  # Support for OSv's combined kernel+module build system ('make
> modules=node'
>  # and 'make clean')
> -VERSION=4.1.1
> +VERSION=6.10.3
>  module:
>         if test ! -d node-$(VERSION); then ./GET $(VERSION); $(MAKE)
> NODE_VERSION=$(VERSION); fi
>         echo '/libnode.so: $${MODULE_DIR}/libnode-$(VERSION).so' >
> usr.manifest
> diff --git a/node/patch b/node/patch
> index 3774af0..d09a6d4 100755
> --- a/node/patch
> +++ b/node/patch
> @@ -23,22 +23,6 @@ ed -s common.gypi << EOF
>  w
>  EOF
>
> -ed -s deps/uv/src/unix/thread.c << EOF
> -/int uv_barrier_init/i
> -#endif
> -#if 1
> -.
> -w
> -EOF
> -
> -ed -s "$(find deps/uv -name uv-unix.h)" <<EOF
> -/#if defined(__APPLE/a
> -#endif
> -#if 1
> -.
> -w
> -EOF
> -
>  [ -f deps/v8/src/types.h ] && ed -s deps/v8/src/types.h <<EOF
>  ,s/nearbyint/rint/
>  w
> --
> 2.7.4
>
> --
> You received this message because you are subscribed to the Google Groups
> "OSv Development" group.
> To unsubscribe from this group and stop receiving emails from it, send an
> email to osv-dev+unsubscr...@googlegroups.com.
> For more options, visit https://groups.google.com/d/optout.
>

-- 
You received this message because you are subscribed to the Google Groups "OSv 
Development" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to osv-dev+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Reply via email to