diff options
| author |   Christian Faulhammer <opfer@gentoo.org> | 2008-05-24 14:11:07 +0000 |
|---|---|---|
| committer | Christian Faulhammer <opfer@gentoo.org> | 2008-05-24 14:11:07 +0000 |
| commit | 8e7d175ac457193a39c6206dd96d5af4e7daded7 (patch) | |
| tree | 4706470aa9a98c2d5005dea5af05e04d82326b9a /dev-lang | |
| parent | Remove dependency to sys-devel/flex for bug #221335 (diff) | |
| download | gentoo-2-8e7d175ac457193a39c6206dd96d5af4e7daded7.tar.gz gentoo-2-8e7d175ac457193a39c6206dd96d5af4e7daded7.tar.bz2 gentoo-2-8e7d175ac457193a39c6206dd96d5af4e7daded7.zip | |
patch had DOS encoding which might fail on some systems, reported by Артем Навроцкий <artnav AT mail DOT ru> by mail
(Portage version: 2.1.4.4)
Diffstat (limited to 'dev-lang')
| -rw-r--r-- | dev-lang/erlang/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-lang/erlang/files/erlang-11.2.5-odbc-support-amd64.patch | 34 |
2 files changed, 23 insertions, 18 deletions
diff --git a/dev-lang/erlang/ChangeLog b/dev-lang/erlang/ChangeLog index be419c5bd325..76b358fe8c3f 100644 --- a/dev-lang/erlang/ChangeLog +++ b/dev-lang/erlang/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-lang/erlang # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/ChangeLog,v 1.113 2008/04/29 15:35:19 opfer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/ChangeLog,v 1.114 2008/05/24 14:11:06 opfer Exp $ + + 24 May 2008; Christian Faulhammer <opfer@gentoo.org> + files/erlang-11.2.5-odbc-support-amd64.patch: + patch had DOS encoding which might fail on some systems, reported by + Артем Навроцкий <artnav AT mail DOT ru> by mail 29 Apr 2008; Christian Faulhammer <opfer@gentoo.org> erlang-12.2.2.ebuild: make previous patch really work by regenerating needed files, pointed out by diff --git a/dev-lang/erlang/files/erlang-11.2.5-odbc-support-amd64.patch b/dev-lang/erlang/files/erlang-11.2.5-odbc-support-amd64.patch index 3a71c32bc04c..243448744401 100644 --- a/dev-lang/erlang/files/erlang-11.2.5-odbc-support-amd64.patch +++ b/dev-lang/erlang/files/erlang-11.2.5-odbc-support-amd64.patch @@ -1,17 +1,17 @@ -diff -urN otp_src_R11B-5/lib/odbc/c_src/Makefile.in otp_src_R11B-5.odbc/lib/odbc/c_src/Makefile.in
---- otp_src_R11B-5/lib/odbc/c_src/Makefile.in 2006-05-03 11:18:45.000000000 +0300
-+++ otp_src_R11B-5.odbc/lib/odbc/c_src/Makefile.in 2007-11-07 00:24:36.000000000 +0200
-@@ -57,11 +57,11 @@
- WIN32_TARGET = $(WIN_BIN_DIR)/odbcserver.exe
- EXE_TARGET = $(WIN32_TARGET)
- else
--ifneq ($(BITS64),yes)
-+#ifneq ($(BITS64),yes)
- EI_LIB = -lerl_interface -lei
- UNIX_TARGET = $(BIN_DIR)/odbcserver
- EXE_TARGET = $(UNIX_TARGET)
--endif
-+#endif
- endif
-
- C_FILES = odbcserver.c
+diff -urN otp_src_R11B-5/lib/odbc/c_src/Makefile.in otp_src_R11B-5.odbc/lib/odbc/c_src/Makefile.in +--- otp_src_R11B-5/lib/odbc/c_src/Makefile.in 2006-05-03 11:18:45.000000000 +0300 ++++ otp_src_R11B-5/lib/odbc/c_src/Makefile.in 2007-11-07 00:24:36.000000000 +0200 +@@ -57,11 +57,11 @@ + WIN32_TARGET = $(WIN_BIN_DIR)/odbcserver.exe + EXE_TARGET = $(WIN32_TARGET) + else +-ifneq ($(BITS64),yes) ++#ifneq ($(BITS64),yes) + EI_LIB = -lerl_interface -lei + UNIX_TARGET = $(BIN_DIR)/odbcserver + EXE_TARGET = $(UNIX_TARGET) +-endif ++#endif + endif + + C_FILES = odbcserver.c |