Ticket #34785: erlang_R15B01.diff
File erlang_R15B01.diff, 7.7 KB (added by ci42, 12 years ago) |
---|
-
files/patch-erts_configure.diff
1 1 --- erts/configure.orig 2010-02-22 20:02:57.000000000 +0100 2 2 +++ erts/configure 2010-03-09 13:02:25.000000000 +0100 3 @@ - 22636,7 +22636,7 @@3 @@ -34187,7 +34187,7 @@ 4 4 #include <machine/fpu.h> 5 5 #endif 6 6 #if !(defined(__OpenBSD__) && defined(__x86_64__)) -
files/patch-disable_wx.diff
1 1 --- lib/configure.orig 2010-12-08 02:07:22.000000000 +1100 2 2 +++ lib/configure 2011-06-18 22:20:13.000000000 +1000 3 @@ -27 7,7 +277,6 @@3 @@ -278,7 +278,6 @@ 4 4 ac_subdirs_all="$ac_subdirs_all gs/." 5 5 ac_subdirs_all="$ac_subdirs_all megaco/." 6 6 ac_subdirs_all="$ac_subdirs_all odbc/." … … 8 8 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' 9 9 ac_subst_files='' 10 10 11 @@ -128 5,9 +1284,6 @@11 @@ -1289,9 +1289,6 @@ 12 12 test ! -f odbc/configure || 13 13 14 14 subdirs="$subdirs odbc/." … … 20 20 fi 21 21 --- lib/Makefile.orig 2010-12-08 02:07:22.000000000 +1100 22 22 +++ 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 \ 38 29 ic mnesia crypto orber os_mon parsetools syntax_tools \ 39 30 pman public_key ssl toolbar tv observer odbc \ 40 runtime_tools cosTransactions cosEvent cosTime cosNotification\31 diameter \ -
files/patch-toolbar.erl.diff
1 1 --- lib/toolbar/src/toolbar.erl.sav 2006-05-22 17:04:22.000000000 -0400 2 2 +++ lib/toolbar/src/toolbar.erl 2006-05-22 17:05:07.000000000 -0400 3 @@ -3 6,7 +36,7 @@3 @@ -38,7 +38,7 @@ 4 4 -export([create_tool_file/0,add_gs_contribs/0]). 5 5 6 6 % … … 9 9 10 10 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% 11 11 12 @@ -23 4,7 +234,7 @@12 @@ -236,7 +236,7 @@ 13 13 about_help -> 14 14 WinObj = toolbar_graphics:get_window(Window), 15 15 Text = ["Help text is on HTML format", -
files/patch-erts_emulator_sys_unix_ddll.c.diff
1 1 --- erts/emulator/sys/unix/erl_unix_sys_ddll.c.orig 2009-11-04 16:37:36.000000000 +0100 2 2 +++ 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 @@ 4 4 static int num_errcodes = 0; 5 5 static int num_errcodes_allocated = 0; 6 6 -
files/patch-erts_emulator_Makefile.in.diff
1 1 --- erts/emulator/Makefile.in.orig 2009-09-18 07:06:45.000000000 -0700 2 2 +++ erts/emulator/Makefile.in 2009-10-03 20:09:16.000000000 -0700 3 @@ - 36,7 +36,12 @@3 @@ -44,7 +44,12 @@ 4 4 M4FLAGS= 5 5 CREATE_DIRS= 6 6 … … 11 11 +# On i386, the default pagezero_size is 4KB which is what we'll 12 12 +# set here. 13 13 +LDFLAGS=@LDFLAGS@ -pagezero_size 0x400000 14 ARFLAGS=rc 14 15 15 16 ifeq ($(TYPE),debug) 16 PURIFY = 17 @@ -110,7 +115,7 @@ 17 @@ -115,7 +120,7 @@ 18 18 override TYPE=opt 19 19 PURIFY = 20 20 TYPEMARKER = -
Portfile
4 4 PortSystem 1.0 5 5 6 6 name erlang 7 version R15B 8 revision 1 7 version R15B01 9 8 categories lang erlang 10 9 maintainers bfulgham 11 10 platforms darwin … … 31 30 homepage http://www.erlang.org/ 32 31 master_sites http://www.erlang.org/download/ \ 33 32 http://www.erlang.org/download/patches/:patches 34 # The following line works around Erlang's stealth upgrade of the HTML tarball35 dist_subdir ${name}/${version}_136 33 37 34 # Parallel build doesn't work as per R13B01 38 35 use_parallel_build no … … 43 40 otp_doc_man_${version}${extract.suffix} \ 44 41 otp_doc_html_${version}${extract.suffix} 45 42 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 40504ad983b450a2c6f7611b3be88ebd6349079764520cca050e9c8f6e79dc9343 checksums 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 55 52 56 53 pre-patch { file rename ${workpath}/otp_src_${version} ${workpath}/${name}-${version} } 57 54 … … 84 81 system "tar -C ${destroot}${prefix}/lib/erlang -zxvf ${distpath}/otp_doc_html_${version}${extract.suffix}" 85 82 system "tar -C ${destroot}${prefix}/lib/erlang -zxvf ${distpath}/otp_doc_man_${version}${extract.suffix}" 86 83 87 set erts_dir erts-5.9 88 set erl_interface_dir erl_interface-3.7. 689 set wx_dir wx-0.99. 184 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 90 87 91 88 reinplace s|${destroot}|| ${destroot}${prefix}/lib/erlang/bin/erl 92 89 reinplace s|${destroot}|| ${destroot}${prefix}/lib/erlang/bin/start