diff options
Diffstat (limited to 'lang/erlang-runtime16/files')
12 files changed, 0 insertions, 237 deletions
diff --git a/lang/erlang-runtime16/files/patch-Makefile.in b/lang/erlang-runtime16/files/patch-Makefile.in deleted file mode 100644 index 8ebb6063d76d..000000000000 --- a/lang/erlang-runtime16/files/patch-Makefile.in +++ /dev/null @@ -1,20 +0,0 @@ ---- Makefile.in.orig -+++ Makefile.in -@@ -56,7 +56,7 @@ - libdir = @libdir@ - - # Where Erlang/OTP is located --libdir_suffix = /erlang -+libdir_suffix = /erlang16 - erlang_libdir = $(libdir)$(libdir_suffix) - erlang_bindir = $(erlang_libdir)/bin - -@@ -913,7 +913,7 @@ - # - # Order is important here, don't change it! - # --INST_DEP += install.dirs install.emulator install.libs install.Install install.bin -+INST_DEP += install.dirs install.emulator install.libs install.Install - - install: $(INST_DEP) - diff --git a/lang/erlang-runtime16/files/patch-erts_emulator_drivers_common_efile__drv.c b/lang/erlang-runtime16/files/patch-erts_emulator_drivers_common_efile__drv.c deleted file mode 100644 index bc3c37541f66..000000000000 --- a/lang/erlang-runtime16/files/patch-erts_emulator_drivers_common_efile__drv.c +++ /dev/null @@ -1,11 +0,0 @@ ---- erts/emulator/drivers/common/efile_drv.c.orig -+++ erts/emulator/drivers/common/efile_drv.c -@@ -1938,6 +1938,8 @@ - d->result_ok = 1; - if (d->c.sendfile.nbytes != 0) - d->c.sendfile.nbytes -= nbytes; -+ } else if (nbytes == 0 && d->c.sendfile.nbytes == 0) { -+ d->result_ok = 1; - } else - d->result_ok = 0; - } else { diff --git a/lang/erlang-runtime16/files/patch-erts_etc_unix_run__erl.c b/lang/erlang-runtime16/files/patch-erts_etc_unix_run__erl.c deleted file mode 100644 index 1a1306e79a21..000000000000 --- a/lang/erlang-runtime16/files/patch-erts_etc_unix_run__erl.c +++ /dev/null @@ -1,12 +0,0 @@ ---- erts/etc/unix/run_erl.c.orig -+++ erts/etc/unix/run_erl.c -@@ -69,9 +69,6 @@ - #ifdef HAVE_UTMP_H - # include <utmp.h> - #endif --#ifdef HAVE_UTIL_H --# include <util.h> --#endif - #ifdef HAVE_SYS_IOCTL_H - # include <sys/ioctl.h> - #endif diff --git a/lang/erlang-runtime16/files/patch-lib_crypto_c__src_Makefile.in b/lang/erlang-runtime16/files/patch-lib_crypto_c__src_Makefile.in deleted file mode 100644 index 65e1b759ad66..000000000000 --- a/lang/erlang-runtime16/files/patch-lib_crypto_c__src_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/crypto/c_src/Makefile.in.orig 2016-03-14 20:11:15 UTC -+++ lib/crypto/c_src/Makefile.in -@@ -90,7 +90,7 @@ endif - DYNAMIC_CRYPTO_LIB=@SSL_DYNAMIC_ONLY@ - - ifeq ($(DYNAMIC_CRYPTO_LIB),yes) --SSL_DED_LD_RUNTIME_LIBRARY_PATH = @SSL_DED_LD_RUNTIME_LIBRARY_PATH@ -+SSL_DED_LD_RUNTIME_LIBRARY_PATH = - CRYPTO_LINK_LIB=$(SSL_DED_LD_RUNTIME_LIBRARY_PATH) -L$(SSL_LIBDIR) -l$(SSL_CRYPTO_LIBNAME) - EXTRA_FLAGS = -DHAVE_DYNAMIC_CRYPTO_LIB - else diff --git a/lang/erlang-runtime16/files/patch-lib_crypto_priv_Makefile b/lang/erlang-runtime16/files/patch-lib_crypto_priv_Makefile deleted file mode 100644 index 26f2c38e360d..000000000000 --- a/lang/erlang-runtime16/files/patch-lib_crypto_priv_Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/crypto/priv/Makefile.orig 2016-03-14 20:11:15 UTC -+++ lib/crypto/priv/Makefile -@@ -61,7 +61,7 @@ OBJS = $(OBJDIR)/crypto.o - # ---------------------------------------------------- - - $(SO_NIFLIB): $(OBJS) -- $(SO_LD) $(SO_LDFLAGS) -L$(SO_SSL_LIBDIR) -Wl,-R$(SO_SSL_LIBDIR) \ -+ $(SO_LD) $(SO_LDFLAGS) -L$(SO_SSL_LIBDIR) \ - -o $@ $^ -lcrypto - - $(DLL_NIFLIB): $(OBJS) diff --git a/lang/erlang-runtime16/files/patch-lib_erl__interface_src_connect_ei__resolve.c b/lang/erlang-runtime16/files/patch-lib_erl__interface_src_connect_ei__resolve.c deleted file mode 100644 index a39b391e06f0..000000000000 --- a/lang/erlang-runtime16/files/patch-lib_erl__interface_src_connect_ei__resolve.c +++ /dev/null @@ -1,12 +0,0 @@ ---- lib/erl_interface/src/connect/ei_resolve.c.orig -+++ lib/erl_interface/src/connect/ei_resolve.c -@@ -621,7 +621,8 @@ - - return result; - #else -- return gethostbyname_r(name,hostp,buffer,buflen,h_errnop); -+ struct hostent *dummy; -+ return gethostbyname_r(name,hostp,buffer,buflen,&dummy,h_errnop); - #endif - #endif - #endif diff --git a/lang/erlang-runtime16/files/patch-lib_et_src_et__gs__contents__viewer.erl b/lang/erlang-runtime16/files/patch-lib_et_src_et__gs__contents__viewer.erl deleted file mode 100644 index 6497db89363c..000000000000 --- a/lang/erlang-runtime16/files/patch-lib_et_src_et__gs__contents__viewer.erl +++ /dev/null @@ -1,10 +0,0 @@ ---- lib/et/src/et_gs_contents_viewer.erl.orig 2010-03-11 16:24:41.000000000 +0800 -+++ lib/et/src/et_gs_contents_viewer.erl 2010-03-11 16:24:53.000000000 +0800 -@@ -347,7 +347,6 @@ handle_info({gs, _Obj, keypress, _, [Key - 'Caps_Lock' -> - {noreply, S}; - _ -> -- io:format("~p: ignored: ~p~n", [?MODULE, KeySym]), - {noreply, S} - end; - handle_info({gs, _Obj, configure, [], [W, H | _]}, S) -> diff --git a/lang/erlang-runtime16/files/patch-lib_et_src_et__gs__viewer.erl b/lang/erlang-runtime16/files/patch-lib_et_src_et__gs__viewer.erl deleted file mode 100644 index ee98410a1675..000000000000 --- a/lang/erlang-runtime16/files/patch-lib_et_src_et__gs__viewer.erl +++ /dev/null @@ -1,12 +0,0 @@ ---- lib/et/src/et_gs_viewer.erl.orig 2010-03-11 16:26:59.000000000 +0800 -+++ lib/et/src/et_gs_viewer.erl 2010-03-11 16:27:16.000000000 +0800 -@@ -855,8 +855,7 @@ close_all_others(S) -> - noreply(S). - - click_error(Click, S) -> -- gs:config(S#state.canvas, beep), -- io:format("~p: ignored: ~p~n", [?MODULE, Click]). -+ gs:config(S#state.canvas, beep). - - %%%---------------------------------------------------------------------- - %%% Clone viewer diff --git a/lang/erlang-runtime16/files/patch-lib_gs_src_tool__utils.erl b/lang/erlang-runtime16/files/patch-lib_gs_src_tool__utils.erl deleted file mode 100644 index 94d64aaf2a94..000000000000 --- a/lang/erlang-runtime16/files/patch-lib_gs_src_tool__utils.erl +++ /dev/null @@ -1,84 +0,0 @@ ---- lib/gs/src/tool_utils.erl.orig -+++ lib/gs/src/tool_utils.erl -@@ -27,6 +27,9 @@ - -export([file_dialog/1]). - -export([notify/2, confirm/2, confirm_yesno/2, request/2]). - -+%% Browser executable list (openURL command line protocol required) -+-define(BROWSERS, ["netscape", "mozilla", "MozillaFirebird", "opera", "firefox", "seamonkey"]). -+ - %%---------------------------------------------------------------------- - %% open_help(GS, File) - %% GS = gsobj() (GS root object returned by gs:start/0,1) -@@ -67,7 +70,7 @@ - {unix,Type} -> - case Type of - darwin -> "open " ++ File; -- _Else -> "netscape -remote \"openURL(file:" ++ File ++ ")\"" -+ _Else -> unix_url_command("file:" ++ File) - end; - {win32,_AnyType} -> - "start " ++ filename:nativename(File); -@@ -82,7 +85,7 @@ - {unix,Type} -> - case Type of - darwin -> "open " ++ File; -- _Else -> "netscape -remote \"openURL(file:" ++ File ++ ")\"" -+ _Else -> unix_url_command("file:" ++ File) - end; - {win32,_AnyType} -> - "netscape.exe -h " ++ regexp:gsub(File,"\\\\","/"); -@@ -342,3 +345,53 @@ - [Last]; - insert_newlines(Other) -> - Other. -+ -+%% find_browser(BrowserList) => string() | false -+%% BrowserList - [string()] -+%% Given a list of basenames, find the first available executable. -+ -+find_browser([]) -> -+ false; -+ -+find_browser([H | T]) -> -+ case os:find_executable(H) of -+ false -> -+ find_browser(T); -+ Browser -> -+ Browser -+ end. -+ -+%% unix_url_command(URL) => string() -+%% URL - string() -+%% Open an URL, using a browser which supports the openURL command -+%% line protocol. If no browser is found, the empty string will be -+%% returned. -+ -+unix_url_command(URL) -> -+ Template = "BROWSER -remote \"openURL(" ++ URL ++ ")\" || BROWSER " ++ URL ++ "&", -+ -+ case os:getenv("BROWSER") of -+ false -> -+ %% look for a compatible browser -+ case find_browser(?BROWSERS) of -+ false -> -+ ""; -+ Browser -> -+ case regexp:gsub(Template, "BROWSER", Browser) of -+ {ok, Command, 0} -> -+ %% Template does not contain "BROWSER" placeholder -+ ""; -+ {ok, Command, _} -> -+ Command -+ end -+ end; -+ -+ Value -> -+ case regexp:gsub(Template, "BROWSER", Value) of -+ {ok, Command2, 0} -> -+ %% no placeholder -+ ""; -+ {ok, Command2, _} -> -+ Command2 -+ end -+ end. diff --git a/lang/erlang-runtime16/files/patch-lib_stdlib_src_calendar.erl b/lang/erlang-runtime16/files/patch-lib_stdlib_src_calendar.erl deleted file mode 100644 index 0af0683acb27..000000000000 --- a/lang/erlang-runtime16/files/patch-lib_stdlib_src_calendar.erl +++ /dev/null @@ -1,26 +0,0 @@ ---- lib/stdlib/src/calendar.erl.orig -+++ lib/stdlib/src/calendar.erl -@@ -215,11 +215,19 @@ - - -spec local_time_to_universal_time_dst(t_datetime1970()) -> [t_datetime1970()]. - local_time_to_universal_time_dst(DateTime) -> -- UtDst = erlang:localtime_to_universaltime(DateTime, true), -- Ut = erlang:localtime_to_universaltime(DateTime, false), - %% Reverse check the universal times -- LtDst = erlang:universaltime_to_localtime(UtDst), -- Lt = erlang:universaltime_to_localtime(Ut), -+ {UtDst, LtDst} = -+ try -+ UtDst0 = erlang:localtime_to_universaltime(DateTime, true), -+ {UtDst0, erlang:universaltime_to_localtime(UtDst0)} -+ catch error:badarg -> {error, error} -+ end, -+ {Ut, Lt} = -+ try -+ Ut0 = erlang:localtime_to_universaltime(DateTime, false), -+ {Ut0, erlang:universaltime_to_localtime(Ut0)} -+ catch error:badarg -> {error, error} -+ end, - %% Return the valid universal times - case {LtDst,Lt} of - {DateTime,DateTime} when UtDst =/= Ut -> diff --git a/lang/erlang-runtime16/files/patch-lib_wx_c__src_wxe__impl.cpp b/lang/erlang-runtime16/files/patch-lib_wx_c__src_wxe__impl.cpp deleted file mode 100644 index 5b1e66586f2f..000000000000 --- a/lang/erlang-runtime16/files/patch-lib_wx_c__src_wxe__impl.cpp +++ /dev/null @@ -1,20 +0,0 @@ ---- lib/wx/c_src/wxe_impl.cpp.orig 2017-01-30 23:13:25 UTC -+++ lib/wx/c_src/wxe_impl.cpp -@@ -666,7 +666,7 @@ void * WxeApp::getPtr(char * bp, wxeMemE - throw wxe_badarg(index); - } - void * temp = memenv->ref2ptr[index]; -- if((index < memenv->next) && ((index == 0) || (temp > NULL))) -+ if((index < memenv->next) && ((index == 0) || (temp != NULL))) - return temp; - else { - throw wxe_badarg(index); -@@ -678,7 +678,7 @@ void WxeApp::registerPid(char * bp, ErlD - if(!memenv) - throw wxe_badarg(index); - void * temp = memenv->ref2ptr[index]; -- if((index < memenv->next) && ((index == 0) || (temp > NULL))) { -+ if((index < memenv->next) && ((index == 0) || (temp != NULL))) { - ptrMap::iterator it; - it = ptr2ref.find(temp); - if(it != ptr2ref.end()) { diff --git a/lang/erlang-runtime16/files/pkg-message.in b/lang/erlang-runtime16/files/pkg-message.in deleted file mode 100644 index 3564b8665b2a..000000000000 --- a/lang/erlang-runtime16/files/pkg-message.in +++ /dev/null @@ -1,8 +0,0 @@ -[ -{ type: install - message: <<EOM -To use this runtime port for development or testing, just prepend -its binary path ("%%LOCALBASE%%/lib/%%ERLANG_LIB%%/bin") to your PATH variable. -EOM -} -] |