Browse Source

Merge pull request #1155 from TechEmpower/1010

1010 Fixed a bug with Cowboy not working with GCC4
Alexander Schneider 10 years ago
parent
commit
aadcd7452f
2 changed files with 2 additions and 1 deletions
  1. 1 1
      frameworks/Erlang/cowboy/rebar.config
  2. 1 0
      frameworks/Erlang/cowboy/setup_erlang.py

+ 1 - 1
frameworks/Erlang/cowboy/rebar.config

@@ -1,6 +1,6 @@
 {deps,
  [
-  {jiffy, ".*", {git, "https://github.com/davisp/jiffy.git", {tag, "0.8.3"}}},
+  {jiffy, ".*", {git, "https://github.com/davisp/jiffy.git", {tag, "0.8.5"}}},
   {mimetypes, ".*", {git, "http://github.com/spawngrid/mimetypes.git", {branch, master}}},
   {emysql, ".*", {git, "https://github.com/Eonblast/Emysql.git"}},
   {cowboy, ".*", {git, "https://github.com/extend/cowboy.git", {tag, "0.8.3"}}}

+ 1 - 0
frameworks/Erlang/cowboy/setup_erlang.py

@@ -6,6 +6,7 @@ def start(args, logfile, errfile):
   setup_util.replace_text("cowboy/src/hello_world_app.erl", "\"benchmarkdbpass\", \".*\", 3306", "\"benchmarkdbpass\", \"" + args.database_host + "\", 3306")
 
   try:
+    subprocess.check_call("rm -rf deps/*", shell=True, cwd="cowboy", stderr=errfile, stdout=logfile)
     subprocess.check_call("./rebar get-deps", shell=True, cwd="cowboy", stderr=errfile, stdout=logfile)
     subprocess.check_call("./rebar compile", shell=True, cwd="cowboy", stderr=errfile, stdout=logfile)
     subprocess.check_call("erl -pa ebin deps/*/ebin +sbwt very_long +swt very_low -s hello_world -noshell -detached", shell=True, cwd="cowboy", stderr=errfile, stdout=logfile)