1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-23 00:43:28 +00:00

files/patch-lib_compiler_src_beam__utils.erl:

Fix "Internal consistency check failed" compiler error.

Obtained from:  Bjorn Gustavsson <bgustavsson at gmail.com>

files/patch-lib_inets_src_http__client_http.erl:

The process would hang because {stream,{self,once}} is not recognized as an invalid option.

Obtained from:  Adam Kocoloski <adam.kocoloski at gmail.com>
This commit is contained in:
Jimmy Olgeni 2009-06-12 15:24:53 +00:00
parent a259370930
commit 7f9a84b15a
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=235652
6 changed files with 62 additions and 2 deletions

View File

@ -7,7 +7,7 @@
PORTNAME= erlang
PORTVERSION= r13b01
PORTREVISION= 2
PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= lang parallel java
MASTER_SITES= http://www.erlang.org/download/ \

View File

@ -0,0 +1,16 @@
$FreeBSD$
--- lib/compiler/src/beam_utils.erl.orig
+++ lib/compiler/src/beam_utils.erl
@@ -650,8 +650,8 @@
Regs2 = x_live([Src1,Src2], Regs1),
Regs = live_join_label(Fail, D, Regs2),
live_opt(Is, Regs, D, [I|Acc]);
-live_opt([{bs_append,Fail,Src1,_,_,_,Src2,_,Dst}=I|Is], Regs0, D, Acc) ->
- Regs1 = x_live([Src1,Src2], x_dead([Dst], Regs0)),
+live_opt([{bs_append,Fail,Src1,_,Live,_,Src2,_,Dst}=I|Is], _Regs0, D, Acc) ->
+ Regs1 = x_dead([Dst], x_live([Src1,Src2], live_call(Live))),
Regs = live_join_label(Fail, D, Regs1),
live_opt(Is, Regs, D, [I|Acc]);
live_opt([{bs_private_append,Fail,Src1,_,Src2,_,Dst}=I|Is], Regs0, D, Acc) ->

View File

@ -0,0 +1,14 @@
$FreeBSD$
--- lib/inets/src/http_client/http.erl.orig
+++ lib/inets/src/http_client/http.erl
@@ -293,6 +293,8 @@
case {Sync, Stream} of
{true, self} ->
{error, streaming_error};
+ {true, {self,once}} ->
+ {error, streaming_error};
_ ->
RecordHeaders = header_record(NewHeaders, #http_request_h{},
Host, Version),

View File

@ -7,7 +7,7 @@
PORTNAME= erlang
PORTVERSION= r13b01
PORTREVISION= 2
PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= lang parallel java
MASTER_SITES= http://www.erlang.org/download/ \

View File

@ -0,0 +1,16 @@
$FreeBSD$
--- lib/compiler/src/beam_utils.erl.orig
+++ lib/compiler/src/beam_utils.erl
@@ -650,8 +650,8 @@
Regs2 = x_live([Src1,Src2], Regs1),
Regs = live_join_label(Fail, D, Regs2),
live_opt(Is, Regs, D, [I|Acc]);
-live_opt([{bs_append,Fail,Src1,_,_,_,Src2,_,Dst}=I|Is], Regs0, D, Acc) ->
- Regs1 = x_live([Src1,Src2], x_dead([Dst], Regs0)),
+live_opt([{bs_append,Fail,Src1,_,Live,_,Src2,_,Dst}=I|Is], _Regs0, D, Acc) ->
+ Regs1 = x_dead([Dst], x_live([Src1,Src2], live_call(Live))),
Regs = live_join_label(Fail, D, Regs1),
live_opt(Is, Regs, D, [I|Acc]);
live_opt([{bs_private_append,Fail,Src1,_,Src2,_,Dst}=I|Is], Regs0, D, Acc) ->

View File

@ -0,0 +1,14 @@
$FreeBSD$
--- lib/inets/src/http_client/http.erl.orig
+++ lib/inets/src/http_client/http.erl
@@ -293,6 +293,8 @@
case {Sync, Stream} of
{true, self} ->
{error, streaming_error};
+ {true, {self,once}} ->
+ {error, streaming_error};
_ ->
RecordHeaders = header_record(NewHeaders, #http_request_h{},
Host, Version),