diff options
Diffstat (limited to 'lang/erlang14/files')
5 files changed, 12 insertions, 85 deletions
diff --git a/lang/erlang14/files/patch-erts-emulator-Makefile.in b/lang/erlang14/files/patch-erts-emulator-Makefile.in index 20d61548c764..9910f98f5f1c 100644 --- a/lang/erlang14/files/patch-erts-emulator-Makefile.in +++ b/lang/erlang14/files/patch-erts-emulator-Makefile.in @@ -3,13 +3,23 @@ $FreeBSD$ --- erts/emulator/Makefile.in.orig +++ erts/emulator/Makefile.in -@@ -265,7 +265,9 @@ +@@ -265,8 +265,10 @@ endif WITH_SCTP=@WITH_SCTP@ ifdef WITH_SCTP +ifneq ($(findstring freebsd,$(TARGET)),freebsd) LIBS += -lsctp -+endif endif ++endif ORG_THR_LIBS=@EMU_THR_LIBS@ + THR_LIB_NAME=@EMU_THR_LIB_NAME@ +@@ -544,7 +546,7 @@ + endif + + $(OBJDIR)/%.o: beam/%.c +- $(CC) $(subst -O2, $(GEN_OPT_FLGS), $(CFLAGS)) $(INCLUDES) -c $< -o $@ ++ $(CC) $(INCLUDES) $(subst -O2, $(GEN_OPT_FLGS), $(CFLAGS)) -c $< -o $@ + + else + diff --git a/lang/erlang14/files/patch-lib_dialyzer_src_Makefile b/lang/erlang14/files/patch-lib_dialyzer_src_Makefile deleted file mode 100644 index 43e0e8ebadce..000000000000 --- a/lang/erlang14/files/patch-lib_dialyzer_src_Makefile +++ /dev/null @@ -1,42 +0,0 @@ - -$FreeBSD$ - ---- lib/dialyzer/src/Makefile.orig -+++ lib/dialyzer/src/Makefile -@@ -68,8 +68,6 @@ - dialyzer_typesig \ - dialyzer_utils - --EXTRA_FILES= ../plt/dialyzer_init_plt ## automatically generated -- - HRL_FILES= dialyzer.hrl dialyzer_callgraph.hrl - ERL_FILES= $(MODULES:%=%.erl) - INSTALL_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR)) $(APP_TARGET) $(APPUP_TARGET) -@@ -92,13 +90,12 @@ - # Targets - # ---------------------------------------------------- - --debug opt: $(TARGET_FILES) $(DIALYZER_DIR)/plt/dialyzer_init_plt -+debug opt: $(TARGET_FILES) - - docs: - - clean: - rm -f $(TARGET_FILES) -- rm -f $(EXTRA_FILES) - rm -f core - - # ---------------------------------------------------- -@@ -153,11 +150,10 @@ - - release_spec: opt - $(INSTALL_DIR) $(RELSYSDIR)/src -- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(EXTRA_FILES) \ -+ $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) \ - $(RELSYSDIR)/src - $(INSTALL_DIR) $(RELSYSDIR)/ebin - $(INSTALL_DATA) $(INSTALL_FILES) $(RELSYSDIR)/ebin - $(INSTALL_DIR) $(RELSYSDIR)/plt -- $(INSTALL_DATA) ../plt/dialyzer_init_plt $(RELSYSDIR)/plt - - release_docs_spec: diff --git a/lang/erlang14/files/patch-lib_dialyzer_src_dialyzer__cl.erl b/lang/erlang14/files/patch-lib_dialyzer_src_dialyzer__cl.erl deleted file mode 100644 index 4c2e014af58e..000000000000 --- a/lang/erlang14/files/patch-lib_dialyzer_src_dialyzer__cl.erl +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- lib/dialyzer/src/dialyzer_cl.erl.orig -+++ lib/dialyzer/src/dialyzer_cl.erl -@@ -93,7 +93,7 @@ - check_if_installed() -> - case filename:basename(code:lib_dir(dialyzer)) of - "dialyzer" -> false; -- "dialyzer-" ++ _Version -> true -+ "dialyzer-" ++ _Version -> false - end. - - create_init_plt(MD5, Libs, InitPlt, IncludeDirs) -> diff --git a/lang/erlang14/files/patch-lib_dialyzer_src_dialyzer__cl__parse.erl b/lang/erlang14/files/patch-lib_dialyzer_src_dialyzer__cl__parse.erl deleted file mode 100644 index a02691d2d845..000000000000 --- a/lang/erlang14/files/patch-lib_dialyzer_src_dialyzer__cl__parse.erl +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- lib/dialyzer/src/dialyzer_cl_parse.erl.orig -+++ lib/dialyzer/src/dialyzer_cl_parse.erl -@@ -159,7 +159,7 @@ - throw({dialyzer_cl_parse_error, Msg}). - - init() -> -- InitPlt = filename:join([code:lib_dir(dialyzer), "plt","dialyzer_init_plt"]), -+ InitPlt = filename:join([os:getenv ("HOME"), ".dialyzer_init_plt"]), - put(dialyzer_init_plt, InitPlt), - put(dialyzer_only_check_init_plt, false), - put(dialyzer_options_gui, true), diff --git a/lang/erlang14/files/patch-lib_typer_src_typer__info.erl b/lang/erlang14/files/patch-lib_typer_src_typer__info.erl deleted file mode 100644 index 953e440d5980..000000000000 --- a/lang/erlang14/files/patch-lib_typer_src_typer__info.erl +++ /dev/null @@ -1,13 +0,0 @@ - -$FreeBSD$ - ---- lib/typer/src/typer_info.erl.orig -+++ lib/typer/src/typer_info.erl -@@ -123,6 +123,5 @@ - dialyzerObj=NewDialyzerObj}. - - get_dialyzer_plt() -> -- DialyzerDir = code:lib_dir(dialyzer), -- Dialyzer_Init_Plt = filename:join([DialyzerDir,"plt","dialyzer_init_plt"]), -+ Dialyzer_Init_Plt = filename:join([os:getenv ("HOME"), ".dialyzer_init_plt"]), - dialyzer_plt:from_file(typer_plt, Dialyzer_Init_Plt). |