[58746] trunk/dports/lang/erlang
bfulgham at macports.org
bfulgham at macports.org
Sat Oct 3 20:46:36 PDT 2009
Revision: 58746
http://trac.macports.org/changeset/58746
Author: bfulgham at macports.org
Date: 2009-10-03 20:46:34 -0700 (Sat, 03 Oct 2009)
Log Message:
-----------
Update Erlang to R13B-2.
Closes #21809.
Modified Paths:
--------------
trunk/dports/lang/erlang/Portfile
trunk/dports/lang/erlang/files/patch-erts_emulator_Makefile.in
trunk/dports/lang/erlang/files/patch-erts_emulator_hipe_hipe_amd64_glue.S.diff
Removed Paths:
-------------
trunk/dports/lang/erlang/files/patch-decode_big.c.diff
trunk/dports/lang/erlang/files/patch-decode_fun.c.diff
Modified: trunk/dports/lang/erlang/Portfile
===================================================================
--- trunk/dports/lang/erlang/Portfile 2009-10-04 03:18:41 UTC (rev 58745)
+++ trunk/dports/lang/erlang/Portfile 2009-10-04 03:46:34 UTC (rev 58746)
@@ -2,7 +2,7 @@
PortSystem 1.0
name erlang
-version R13B01
+version R13B02
revision 1
categories lang erlang
maintainers bfulgham
@@ -37,37 +37,28 @@
otp_doc_html_${version}${extract.suffix}
checksums otp_src_${version}.tar.gz \
- md5 b3db581de6c13e1ec93d74e54a7b4231 \
- sha1 29d0e06dd351f31c70112454f8187e70ee75ca03 \
- rmd160 f40ed0d6837f187f889a49c841a6615714b5ae96 \
+ md5 d70bfba6935e52a7759168a35fbcabe7 \
+ sha1 747f2d7284e5e9983b003b31656bb3921e764f34 \
+ rmd160 bf616616e423e4cbdec1eef2f78593daa09bac21 \
otp_doc_man_${version}.tar.gz \
- md5 fa8f96159bd9a88aa2fb9e4d79d7affe \
- sha1 528a4a95e09e0422256c1bd9a818c37a6ece0a14 \
- rmd160 9cc398f8a648b6c0444831edd37b16ae88b18cb8 \
+ md5 975b2c8a1cc2fda017cb5cd3864e32ba \
+ sha1 ee6d511b0a5f992f507860ce554e988967777955 \
+ rmd160 67b64ffde6df84e7a8f1ffeff21a1bfc7bf2f701 \
otp_doc_html_${version}.tar.gz \
- md5 42cb55bbfa5dc071fd56034615072f7a \
- sha1 fdb2836af961745ded836f3dd465d3395c750cd5 \
- rmd160 e0504ca360b806977d6613fab0b7bcd7512a8333
+ md5 78fc0c139a0297e502a6008bd8166887 \
+ sha1 5562f460c37d36624147af681eebca29dab7ee36 \
+ rmd160 d4377abe16ae3558a4e3bd9196ff1553b0a8b889
pre-patch { file rename ${workpath}/otp_src_${version} ${workpath}/${name}-${version} }
-# http://www.erlang.org/pipermail/erlang-bugs/2008-October/001023.html
-# http://www.erlang.org/pipermail/erlang-bugs/2008-October/001024.html
# http://www.erlang.org/pipermail/erlang-bugs/2009-January/001171.html
patchfiles patch-toolbar.erl \
patch-erts_emulator_Makefile.in \
patch-erts_emulator_hipe_hipe_amd64_asm.m4.diff \
patch-erts_emulator_hipe_hipe_amd64_bifs.m4.diff \
- patch-erts_emulator_hipe_hipe_amd64_glue.S.diff \
+ patch-erts_emulator_hipe_hipe_amd64_glue.S.diff \
patch-erts_emulator_hipe_hipe_amd64.c.diff \
patch-erts_emulator_sys_unix_sys_float.c.diff \
- patch-lib_ssl_c_src_esock_openssl.c \
- patch-lib_ssl_c_src_Makefile.dist \
- patch-lib_ssl_c_src_Makefile.in \
- patch-decode_big.c.diff \
- patch-decode_fun.c.diff \
- patch-lib-erl_interface-src-connect-ei_connect.c.diff \
- patch-lib-erl_interface-include-ei.h.diff \
patch-erts_configure.diff \
patch-lib_wx_configure.in \
patch-lib_wx_configure
@@ -83,12 +74,6 @@
# 10.6 comes with wxWidgets and since it requires libsdl, which
# current doesn't compile (bug #20235), we can avoid it here.
depends_build-delete port:wxWidgets
-
- # On x86_64, the default pagezero_size is 4GB, thus making it
- # impossible to allocate a mmap between 0.5GB and 2GB, which is required
- # by hipe.
- # on i386, the default pagezero_size is 4KB which is what we'll set here.
- configure.ldflags-append -pagezero_size 0x400000
}
variant ssl description {Build SSL support} {
@@ -110,7 +95,7 @@
system "tar -C ${destroot}${prefix}/lib/erlang -zxvf ${distpath}/otp_doc_html_${version}${extract.suffix}"
system "tar -C ${destroot}${prefix}/lib/erlang -zxvf ${distpath}/otp_doc_man_${version}${extract.suffix}"
- set erts_dir erts-5.7.2
+ set erts_dir erts-5.7.3
reinplace s|${destroot}|| ${destroot}${prefix}/lib/erlang/bin/erl
reinplace s|${destroot}|| ${destroot}${prefix}/lib/erlang/bin/start
Deleted: trunk/dports/lang/erlang/files/patch-decode_big.c.diff
===================================================================
--- trunk/dports/lang/erlang/files/patch-decode_big.c.diff 2009-10-04 03:18:41 UTC (rev 58745)
+++ trunk/dports/lang/erlang/files/patch-decode_big.c.diff 2009-10-04 03:46:34 UTC (rev 58746)
@@ -1,13 +0,0 @@
---- lib/erl_interface/src/decode/decode_big.c.orig 2008-11-06 06:57:02.000000000 +0100
-+++ lib/erl_interface/src/decode/decode_big.c 2008-11-06 06:58:39.000000000 +0100
-@@ -51,7 +51,9 @@
- u = (unsigned char *) s;
- for (i = 0; i < b->arity; ++i) {
- dt[i] = u[i*2];
-- dt[i] |= ((unsigned short) u[(i*2)+1]) << 8;
-+ if ((i*2 + 1) < digit_bytes) {
-+ dt[i] |= ((unsigned short) u[(i*2)+1]) << 8;
-+ }
- }
- } else {
- s++; /* skip sign byte */
Deleted: trunk/dports/lang/erlang/files/patch-decode_fun.c.diff
===================================================================
--- trunk/dports/lang/erlang/files/patch-decode_fun.c.diff 2009-10-04 03:18:41 UTC (rev 58745)
+++ trunk/dports/lang/erlang/files/patch-decode_fun.c.diff 2009-10-04 03:46:34 UTC (rev 58746)
@@ -1,11 +0,0 @@
---- lib/erl_interface/src/decode/decode_fun.c.orig 2008-11-06 06:53:46.000000000 +0100
-+++ lib/erl_interface/src/decode/decode_fun.c 2008-11-06 06:54:09.000000000 +0100
-@@ -103,7 +103,7 @@
- memcpy(p->free_vars, s, n);
- }
- }
-- *index += s-s0;
-+ *index += n + s-s0;
- return 0;
- break;
- default:
Modified: trunk/dports/lang/erlang/files/patch-erts_emulator_Makefile.in
===================================================================
--- trunk/dports/lang/erlang/files/patch-erts_emulator_Makefile.in 2009-10-04 03:18:41 UTC (rev 58745)
+++ trunk/dports/lang/erlang/files/patch-erts_emulator_Makefile.in 2009-10-04 03:46:34 UTC (rev 58746)
@@ -1,6 +1,20 @@
---- erts/emulator/Makefile.in.orig 2008-06-11 23:28:03.000000000 -0700
-+++ erts/emulator/Makefile.in 2008-06-11 23:27:45.000000000 -0700
-@@ -101,7 +101,7 @@
+--- erts/emulator/Makefile.in.orig 2009-09-18 07:06:45.000000000 -0700
++++ erts/emulator/Makefile.in 2009-10-03 20:09:16.000000000 -0700
+@@ -36,7 +36,12 @@
+ M4FLAGS=
+ CREATE_DIRS=
+
+-LDFLAGS=@LDFLAGS@
++# On x86_64, the default pagezero_size is 4GB, thus making it
++# impossible to allocate an mmap between 0.5GB and 2GB, which
++# is required by hipe.
++# On i386, the default pagezero_size is 4KB which is what we'll
++# set here.
++LDFLAGS=@LDFLAGS@ -pagezero_size 0x400000
+
+ ifeq ($(TYPE),debug)
+ PURIFY =
+@@ -110,7 +115,7 @@
override TYPE=opt
PURIFY =
TYPEMARKER =
Modified: trunk/dports/lang/erlang/files/patch-erts_emulator_hipe_hipe_amd64_glue.S.diff
===================================================================
--- trunk/dports/lang/erlang/files/patch-erts_emulator_hipe_hipe_amd64_glue.S.diff 2009-10-04 03:18:41 UTC (rev 58745)
+++ trunk/dports/lang/erlang/files/patch-erts_emulator_hipe_hipe_amd64_glue.S.diff 2009-10-04 03:46:34 UTC (rev 58746)
@@ -1,5 +1,5 @@
---- erts/emulator/hipe/hipe_amd64_glue.S 2009-03-12 13:16:07.000000000 +0100
-+++ erts/emulator/hipe/hipe_amd64_glue.S 2009-09-02 18:31:07.000000000 +0200
+--- erts/emulator/hipe/hipe_amd64_glue.S.orig 2009-09-26 20:41:55.000000000 -0700
++++ erts/emulator/hipe/hipe_amd64_glue.S 2009-09-26 20:58:41.000000000 -0700
@@ -56,16 +56,16 @@
/* switch to native stack */ \
SWITCH_C_TO_ERLANG
@@ -226,20 +226,22 @@
addq $(16-8), %rsp
movl $0, P_NARITY(P) # Note: narity is a 32-bit field
ret
-@@ -356,9 +356,9 @@
+@@ -356,10 +356,10 @@
* exceptional condition.
* The stack/heap registers were just read from P.
*/
+- .global nbif_0_simple_exception
- .global nbif_1_simple_exception
- .global nbif_2_simple_exception
- .global nbif_3_simple_exception
++ GLOBAL(nbif_0_simple_exception)
+ GLOBAL(nbif_1_simple_exception)
+ GLOBAL(nbif_2_simple_exception)
+ GLOBAL(nbif_3_simple_exception)
.align 4
- nbif_1_simple_exception:
- movl $1, %eax
-@@ -384,7 +384,7 @@
+ nbif_0_simple_exception:
+ xorl %eax, %eax
+@@ -389,7 +389,7 @@
/* find and prepare to invoke the handler */
SWITCH_ERLANG_TO_C_QUICK # The cached state is clean and need not be saved.
movq P, %rdi
@@ -248,16 +250,7 @@
SWITCH_C_TO_ERLANG # %rsp updated by hipe_find_handler()
/* now invoke the handler */
jmp *P_NCALLEE(P) # set by hipe_find_handler()
-@@ -394,7 +394,7 @@
- * - the BIF's arity is in %rax
- * - the native heap/stack/reds registers are saved in P
- */
-- .global nbif_0_trap_exception
-+ GLOBAL(nbif_0_trap_exception)
- .align 4
- nbif_0_trap_exception:
- xorl %eax, %eax
-@@ -407,15 +407,15 @@
+@@ -408,15 +408,15 @@
* nbif_stack_trap_ra: trap return address for maintaining
* the gray/white stack boundary
*/
@@ -265,7 +258,7 @@
+ GLOBAL(ASYM(nbif_stack_trap_ra))
.align 4
-nbif_stack_trap_ra: # a return address, not a function
-+ASYM(nbif_stack_trap_ra): # a return address, not a function
++ASYM(nbif_stack_trap_ra): # a return address, not a function
# This only handles a single return value.
# If we have more, we need to save them in the PCB.
movq %rax, TEMP_RV # save retval
@@ -276,14 +269,14 @@
movq %rax, %rdx # original RA
SWITCH_C_TO_ERLANG_QUICK
movq TEMP_RV, %rax # restore retval
-@@ -424,15 +424,15 @@
+@@ -425,15 +425,15 @@
/*
* nbif_inc_stack_0
*/
- .global nbif_inc_stack_0
++ GLOBAL(ASYM(nbif_inc_stack_0))
.align 4
-nbif_inc_stack_0:
-+ GLOBAL(ASYM(nbif_inc_stack_0))
+ASYM(nbif_inc_stack_0):
SWITCH_ERLANG_TO_C_QUICK
STORE_ARG_REGS
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20091003/a5859a8f/attachment.html>
More information about the macports-changes
mailing list