Projects
Kolab:Winterfell
erlang-js
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 2
View file
erlang-js.spec
Changed
@@ -19,14 +19,25 @@ VCS: scm:git:https://github.com/%{upstream}/%{realname}.git %endif Source0: https://github.com/%{upstream}/%{realname}/archive/%{version}/%{realname}-%{version}.tar.gz + # Fedora-specific Patch1: erlang-js-0001-Fix-building-of-linked-in-driver.patch + # Fedora-specific Patch2: erlang-js-0002-build-fix-for-js-1.8.5.patch + # Fedora-specific Patch3: erlang-js-0003-Use-mochiweb-instead-of-a-bundled-copies.patch + # Fedora-specific Patch4: erlang-js-0004-Replace-deprecated-driver_output_term-with-erl_drv_o.patch + +# Upstream format-patch develop/1.3.0 +Patch0006: erlang-js-0006-Fix-R18-erlang-now-deprecation-warning.patch + +# From https://github.com/basho/erlang_js/pull/58 +Patch58: erlang-js-1.3.0-otp-18.3-compat.patch + BuildRequires: erlang-rebar BuildRequires: erlang-rpm-macros >= 0.1.4 BuildRequires: erlang-mochiweb @@ -53,6 +64,9 @@ %patch3 -p1 -b .use_globally_available_mochiweb %patch4 -p1 -b .fix_deprecated +%patch0006 -p1 + +%patch58 -p1 %build rebar compile -vv
View file
erlang-js-0006-Fix-R18-erlang-now-deprecation-warning.patch
Added
@@ -0,0 +1,28 @@ +From 6d3a416cdf6d5652e30622362b278178158267b3 Mon Sep 17 00:00:00 2001 +From: Hynek Vychodil <vychodil.hynek@gmail.com> +Date: Fri, 19 Feb 2016 21:11:14 +0100 +Subject: [PATCH 3/3] Fix R18 erlang:now() deprecation warning + +--- + src/js_benchmark.erl | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/src/js_benchmark.erl b/src/js_benchmark.erl +index 5b92553..9df663d 100644 +--- a/src/js_benchmark.erl ++++ b/src/js_benchmark.erl +@@ -38,9 +38,8 @@ run() -> + %% @private + time_calls(Ctx, Count) -> + io:format("Starting: ~p~n", [Count]), +- Start = erlang:now(), +- do_calls(Ctx, Count), +- timer:now_diff(erlang:now(), Start) / Count. ++ {Elapsed, _} = timer:tc(fun do_calls/2, [Ctx, Count]), ++ Elapsed / Count. + + %% @private + do_calls(_Ctx, 0) -> +-- +2.7.4 +
View file
erlang-js-1.3.0-otp-18.3-compat.patch
Added
@@ -0,0 +1,26 @@ +diff --git a/c_src/driver_comm.c b/c_src/driver_comm.c +index 3876b61..a35d12a 100644 +--- a/c_src/driver_comm.c ++++ b/c_src/driver_comm.c +@@ -55,7 +55,7 @@ char *read_string(char **data) { + void *ejs_alloc(ErlDrvSizeT size) { + void *p = driver_alloc(size); + if (p == NULL) { +- erl_exit(1, "erlang_js: Can't allocate %lu bytes of memory\n", size); ++ erts_exit(1, "erlang_js: Can't allocate %lu bytes of memory\n", size); + } + return p; + } +diff --git a/c_src/driver_comm.h b/c_src/driver_comm.h +index 9f04d16..f5456a5 100644 +--- a/c_src/driver_comm.h ++++ b/c_src/driver_comm.h +@@ -30,7 +30,7 @@ char *read_string(char **data); + + /* Wrapper around driver_alloc() that checks */ + /* for OOM. */ +-void erl_exit(int n, char*, ...); ++void erts_exit(int n, char*, ...); + void *ejs_alloc(ErlDrvSizeT size); + + #endif
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.