Ticket #34785: erlang_R15B01.diff

File erlang_R15B01.diff, 7.7 KB (added by ci42, 12 years ago)

  • files/patch-erts_configure.diff

     
    11--- erts/configure.orig 2010-02-22 20:02:57.000000000 +0100
    22+++ erts/configure      2010-03-09 13:02:25.000000000 +0100
    3 @@ -22636,7 +22636,7 @@
     3@@ -34187,7 +34187,7 @@
    44 #include <machine/fpu.h>
    55 #endif
    66 #if !(defined(__OpenBSD__) && defined(__x86_64__))

  • files/patch-disable_wx.diff

     
    11--- lib/configure.orig  2010-12-08 02:07:22.000000000 +1100
    22+++ lib/configure       2011-06-18 22:20:13.000000000 +1000
    3 @@ -277,7 +277,6 @@
     3@@ -278,7 +278,6 @@
    44 ac_subdirs_all="$ac_subdirs_all gs/."
    55 ac_subdirs_all="$ac_subdirs_all megaco/."
    66 ac_subdirs_all="$ac_subdirs_all odbc/."
    … …  
    88 ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS subdirs LIBOBJS LTLIBOBJS'
    99 ac_subst_files=''
    1010 
    11 @@ -1285,9 +1284,6 @@
     11@@ -1289,9 +1289,6 @@
    1212     test ! -f odbc/configure ||
    1313 
    1414 subdirs="$subdirs odbc/."
    … …  
    2020 fi
    2121--- lib/Makefile.orig   2010-12-08 02:07:22.000000000 +1100
    2222+++ lib/Makefile        2011-06-18 22:20:41.000000000 +1000
    23 @@ -55,7 +55,7 @@
    24      ifdef BUILD_ALL
    25        ifeq ($(findstring win32,$(TARGET)),win32) # BUILD_ALL on win32
    26          OTHER_SUB_DIRECTORIES +=                       \
    27 -          snmp otp_mibs appmon erl_interface asn1 jinterface gs wx inets ic \
    28 +          snmp otp_mibs appmon erl_interface asn1 jinterface gs inets ic \
    29            mnesia crypto orber os_mon parsetools syntax_tools pman \
    30            public_key ssl toolbar tv observer debugger reltool odbc runtime_tools \
    31            cosTransactions cosEvent cosTime cosNotification cosProperty \
    32 @@ -65,7 +65,7 @@
    33          OTHER_SUB_DIRECTORIES += hipe
    34        else # BUILD_ALL on unix
    35          OTHER_SUB_DIRECTORIES += \
    36 -          snmp otp_mibs appmon erl_interface asn1 jinterface wx debugger reltool gs inets \
    37 +          snmp otp_mibs appmon erl_interface asn1 jinterface debugger reltool gs inets \
     23@@ -24,7 +24,7 @@
     24 ifdef BUILD_ALL
     25   OTHER_SUB_DIRECTORIES += \
     26           snmp otp_mibs appmon erl_interface asn1 jinterface \
     27-          wx debugger reltool gs inets \
     28+          debugger reltool gs inets \
    3829           ic mnesia crypto orber os_mon parsetools syntax_tools \
    3930           pman public_key ssl toolbar tv observer odbc \
    40            runtime_tools cosTransactions cosEvent cosTime cosNotification \
     31           diameter \

  • files/patch-toolbar.erl.diff

     
    11--- lib/toolbar/src/toolbar.erl.sav     2006-05-22 17:04:22.000000000 -0400
    22+++ lib/toolbar/src/toolbar.erl 2006-05-22 17:05:07.000000000 -0400
    3 @@ -36,7 +36,7 @@
     3@@ -38,7 +38,7 @@
    44 -export([create_tool_file/0,add_gs_contribs/0]).
    55 
    66 %
    … …  
    99 
    1010 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
    1111 
    12 @@ -234,7 +234,7 @@
     12@@ -236,7 +236,7 @@
    1313                about_help ->
    1414                    WinObj = toolbar_graphics:get_window(Window),
    1515                    Text = ["Help text is on HTML format",

  • files/patch-erts_emulator_sys_unix_ddll.c.diff

     
    11--- erts/emulator/sys/unix/erl_unix_sys_ddll.c.orig     2009-11-04 16:37:36.000000000 +0100
    22+++ erts/emulator/sys/unix/erl_unix_sys_ddll.c  2009-11-04 16:38:28.000000000 +0100
    3 @@ -49,6 +49,12 @@
     3@@ -58,6 +58,12 @@
    44 static int num_errcodes = 0;
    55 static int num_errcodes_allocated = 0;
    66 

  • files/patch-erts_emulator_Makefile.in.diff

     
    11--- erts/emulator/Makefile.in.orig      2009-09-18 07:06:45.000000000 -0700
    22+++ erts/emulator/Makefile.in   2009-10-03 20:09:16.000000000 -0700
    3 @@ -36,7 +36,12 @@
     3@@ -44,7 +44,12 @@
    44 M4FLAGS=
    55 CREATE_DIRS=
    66 
    … …  
    1111+# On i386, the default pagezero_size is 4KB which is what we'll
    1212+# set here.
    1313+LDFLAGS=@LDFLAGS@ -pagezero_size 0x400000
     14 ARFLAGS=rc
    1415 
    1516 ifeq ($(TYPE),debug)
    16  PURIFY =
    17 @@ -110,7 +115,7 @@
     17@@ -115,7 +120,7 @@
    1818 override TYPE=opt
    1919 PURIFY =
    2020 TYPEMARKER =

  • Portfile

     
    44PortSystem      1.0
    55
    66name            erlang
    7 version         R15B
    8 revision        1
     7version         R15B01
    98categories      lang erlang
    109maintainers     bfulgham
    1110platforms       darwin
    … …  
    3130homepage        http://www.erlang.org/
    3231master_sites    http://www.erlang.org/download/ \
    3332                http://www.erlang.org/download/patches/:patches
    34 # The following line works around Erlang's stealth upgrade of the HTML tarball
    35 dist_subdir     ${name}/${version}_1
    3633
    3734# Parallel build doesn't work as per R13B01
    3835use_parallel_build  no
    … …  
    4340                otp_doc_man_${version}${extract.suffix}                \
    4441                otp_doc_html_${version}${extract.suffix}
    4542
    46 checksums           otp_src_R15B.tar.gz \
    47                     rmd160  022ed91978e85f5a446a90825aa686dd608061a9 \
    48                     sha256  5bc34fc34fc890f84bae7ff1f7c81fbec2c9aa28a0ef51a57d7a8192204d8aa2 \
    49                     otp_doc_man_R15B.tar.gz \
    50                     rmd160  ba9352d78462a3ec3461ea955ae46b96cad95400 \
    51                     sha256  1839cc4cab3120401989e0e1d7ad6872a59e2fd9d3cd82f05ca8c4ebef18eb6b \
    52                     otp_doc_html_R15B.tar.gz \
    53                     rmd160  79606286c3708a56dbc9e54efb60f184fe36c809 \
    54                     sha256  40504ad983b450a2c6f7611b3be88ebd6349079764520cca050e9c8f6e79dc93
     43checksums           otp_src_${version}.tar.gz \
     44                    rmd160  98eeceb24ebc5f805d79ac0075b3eec7d537e823 \
     45                    sha256  f94f7de7328af3c0cdc42089c1a4ecd03bf98ec680f47eb5e6cddc50261cabde \
     46                    otp_doc_man_${version}.tar.gz \
     47                    rmd160  57e25006fc250d364bb7e7fe0e607b703bea8202 \
     48                    sha256  5032bcb992369543139136896ba67b4f8fa58fd3d223941a01a39063b221212c \
     49                    otp_doc_html_${version}.tar.gz \
     50                    rmd160  bf5eb7b1e3259f752196e563ba7500b7cee35b65 \
     51                    sha256  0b6eb18855b451882ff5be07d3c25b497b256ead14d6be98791bf056b958a8e7
    5552
    5653pre-patch       { file rename ${workpath}/otp_src_${version} ${workpath}/${name}-${version} }
    5754
    … …  
    8481        system "tar -C ${destroot}${prefix}/lib/erlang -zxvf ${distpath}/otp_doc_html_${version}${extract.suffix}"
    8582        system "tar -C ${destroot}${prefix}/lib/erlang -zxvf ${distpath}/otp_doc_man_${version}${extract.suffix}"
    8683 
    87         set erts_dir   erts-5.9
    88         set erl_interface_dir   erl_interface-3.7.6
    89         set wx_dir wx-0.99.1
     84        set erts_dir   erts-5.9.1
     85        set erl_interface_dir   erl_interface-3.7.7
     86        set wx_dir wx-0.99.2
    9087
    9188        reinplace s|${destroot}|| ${destroot}${prefix}/lib/erlang/bin/erl
    9289        reinplace s|${destroot}|| ${destroot}${prefix}/lib/erlang/bin/start