diff options
| author |   Christian Faulhammer <opfer@gentoo.org> | 2006-11-17 12:39:38 +0000 |
|---|---|---|
| committer | Christian Faulhammer <opfer@gentoo.org> | 2006-11-17 12:39:38 +0000 |
| commit | f7b01bf04e3280443b5cc4e11df6460c29a9717e (patch) | |
| tree | dba33cd16ff5fd32cbd6717e3c813ad485928373 /dev-lang | |
| parent | vdr-lcr-0.0.8 stabel on x86; cleanup old versions (diff) | |
| download | gentoo-2-f7b01bf04e3280443b5cc4e11df6460c29a9717e.tar.gz gentoo-2-f7b01bf04e3280443b5cc4e11df6460c29a9717e.tar.bz2 gentoo-2-f7b01bf04e3280443b5cc4e11df6460c29a9717e.zip | |
that patch needs to stay
(Portage version: 2.1.1-r1)
Diffstat (limited to 'dev-lang')
| -rw-r--r-- | dev-lang/erlang/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-lang/erlang/files/9c.patch | 55 |
2 files changed, 59 insertions, 1 deletions
diff --git a/dev-lang/erlang/ChangeLog b/dev-lang/erlang/ChangeLog index 5874870564e8..05e3f90ba8a4 100644 --- a/dev-lang/erlang/ChangeLog +++ b/dev-lang/erlang/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-lang/erlang # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/ChangeLog,v 1.39 2006/11/17 12:29:52 opfer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/ChangeLog,v 1.40 2006/11/17 12:39:38 opfer Exp $ + + 17 Nov 2006; Christian Faulhammer <opfer@gentoo.org> +files/9c.patch: + that patch needs to stay 17 Nov 2006; Christian Faulhammer <opfer@gentoo.org> -files/9c.patch, -erlang-8b.ebuild, -erlang-9c.ebuild, -erlang-9c-r1.ebuild, diff --git a/dev-lang/erlang/files/9c.patch b/dev-lang/erlang/files/9c.patch new file mode 100644 index 000000000000..61efafbeff2c --- /dev/null +++ b/dev-lang/erlang/files/9c.patch @@ -0,0 +1,55 @@ +diff -ru otp_src_R9B-1-orig/lib/kernel/src/inet_config.erl otp_src_R9B-1/lib/kernel/src/inet_config.erl +--- otp_src_R9B-1-orig/lib/kernel/src/inet_config.erl 2002-10-09 07:39:22.000000000 -0700 ++++ otp_src_R9B-1/lib/kernel/src/inet_config.erl 2003-07-03 17:43:37.000000000 -0700 +@@ -82,8 +82,13 @@ + 'bsd/os' -> + load_resolv(filename:join(Etc,"irs.conf"), host_conf_bsdos); + linux -> +- load_resolv(filename:join(Etc,"host.conf"),host_conf_linux), +- ++ case load_resolv(filename:join(Etc,"host.conf"),host_conf_linux) of ++ ok -> ++ ok; ++ _Other -> ++ load_resolv(filename:join(Etc,"nsswitch.conf"), nsswitch_conf) ++ end, ++ + % It may be the case that the domain name was not set + % because the hostname was short. But we can now look it + % up and get the long name and the domain name from it. +@@ -296,10 +301,12 @@ + case apply(inet_parse, Func, [File,{chars,Bin}]) of + {ok, Ls} -> inet_db:add_rc_list(Ls); + {error, Reason} -> +- error("parse error in file ~s: ~p", [File, Reason]) ++ error("parse error in file ~s: ~p", [File, Reason]), ++ {error, Reason} + end; + Error -> +- warning("file not found ~s~n", [File]) ++ warning("file not found ~s~n", [File]), ++ Error + end. + + %% +diff -ru otp_src_R9B-1-orig/lib/megaco/src/text/Makefile otp_src_R9B-1/lib/megaco/src/text/Makefile +--- otp_src_R9B-1-orig/lib/megaco/src/text/Makefile 2002-11-28 05:50:00.000000000 -0800 ++++ otp_src_R9B-1/lib/megaco/src/text/Makefile 2003-07-03 17:44:41.000000000 -0700 +@@ -48,10 +48,15 @@ + $(INTERNAL_YRL_FILES:%.yrl=%.erl) + + BEAM_TARGET_FILES = \ +- $(INTERNAL_YRL_FILES:%.yrl=$(EBIN)/%.$(EMULATOR)) \ + $(MODULES:%=$(EBIN)/%.$(EMULATOR)) + +-TARGET_FILES = $(ERL_TARGET_FILES) $(BEAM_TARGET_FILES) ++YRL_BEAM_TARGET_FILES = \ ++ $(INTERNAL_YRL_FILES:%.yrl=$(EBIN)/%.$(EMULATOR)) ++ ++ ++ ++TARGET_FILES = $(ERL_TARGET_FILES) $(BEAM_TARGET_FILES) $(YRL_BEAM_TARGETS) ++ + + + # ---------------------------------------------------- |