revision bump to make all modules respect LDFLAGS, patch provided by Davide Pesavento <davidepesa AT gmail DOT com> in bug 263129

(Portage version: 2.1.6.7/cvs/Linux i686)

3 files changed, 110 insertions, 3 deletions

diff --git a/dev-lang/erlang/ChangeLog b/dev-lang/erlang/ChangeLog
index fbfa9f2d7463..1f45a1f5b81e 100644
--- a/dev-lang/erlang/ChangeLog
+++ b/dev-lang/erlang/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-lang/erlang
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/ChangeLog,v 1.156 2009/04/07 10:46:09 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/ChangeLog,v 1.157 2009/04/08 23:11:56 fauli Exp $
+
+*erlang-13.1-r1 (08 Apr 2009)
+
+  08 Apr 2009; Christian Faulhammer <fauli@gentoo.org>
+  +files/erlang-13.1-LDFLAGS.patch, -erlang-13.1.ebuild,
+  +erlang-13.1-r1.ebuild:
+  revision bump to make all modules respect LDFLAGS, patch provided by
+  Davide Pesavento <davidepesa AT gmail DOT com> in bug 263129
 
 *erlang-13.1 (07 Apr 2009)
 
diff --git a/dev-lang/erlang/erlang-13.1.ebuild b/dev-lang/erlang/erlang-13.1-r1.ebuild
index 696efbcff906..908d379fdfdf 100644
--- a/dev-lang/erlang/erlang-13.1.ebuild
+++ b/dev-lang/erlang/erlang-13.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-13.1.ebuild,v 1.1 2009/04/07 10:46:09 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-13.1-r1.ebuild,v 1.1 2009/04/08 23:11:56 fauli Exp $
 
 EAPI=2
 
@@ -50,6 +50,7 @@ src_prepare() {
 		sed -i 's: wx : :' lib/Makefile
 		rm -rf lib/wx
 	fi
+	epatch "${FILESDIR}"/${P}-LDFLAGS.patch # bug 263129
 	if use hipe; then
 		ewarn
 		ewarn "You enabled High performance Erlang. Be aware that this extension"
@@ -58,7 +59,6 @@ src_prepare() {
 		ewarn
 	fi
 	eautoreconf
-
 }
 
 src_configure() {
diff --git a/dev-lang/erlang/files/erlang-13.1-LDFLAGS.patch b/dev-lang/erlang/files/erlang-13.1-LDFLAGS.patch
new file mode 100644
index 000000000000..b3e537e4650e
--- /dev/null
+++ b/dev-lang/erlang/files/erlang-13.1-LDFLAGS.patch
@@ -0,0 +1,99 @@
+diff -Naur otp_src_R13A~orig/erts/emulator/Makefile.in otp_src_R13A/erts/emulator/Makefile.in
+--- otp_src_R13A~orig/erts/emulator/Makefile.in	2009-04-04 14:25:34.000000000 +0200
++++ otp_src_R13A/erts/emulator/Makefile.in	2009-04-04 16:53:23.000000000 +0200
+@@ -256,6 +256,7 @@
+ else
+ CS_CFLAGS = $(CS_CFLAGS_)
+ endif
++CS_LDFLAGS = $(LDFLAGS)
+ CS_LIBS = -L../lib/internal/$(TARGET) -lerts_internal @ERTS_INTERNAL_X_LIBS@
+ 
+ LIBS	+= @TERMCAP_LIB@ -L../lib/internal/$(TARGET) @ERTS_INTERNAL_X_LIBS@
+@@ -654,8 +655,8 @@
+ CS_SRC = sys/$(ERLANG_OSTYPE)/erl_child_setup.c
+ 
+ $(BINDIR)/$(CS_EXECUTABLE): $(CS_SRC)
+-	$(CS_PURIFY) $(CC) -o $(BINDIR)/$(CS_EXECUTABLE) \
+-	$(CS_CFLAGS) $(COMMON_INCLUDES) $(CS_SRC) $(CS_LIBS)
++	$(CS_PURIFY) $(CC) $(CS_LDFLAGS) -o $(BINDIR)/$(CS_EXECUTABLE) \
++		$(CS_CFLAGS) $(COMMON_INCLUDES) $(CS_SRC) $(CS_LIBS)
+ 
+ $(OBJDIR)/%.elib.o: beam/%.c
+ 	$(CC) $(ELIB_FLAGS) $(subst -O2, $(GEN_OPT_FLGS), $(CFLAGS)) $(INCLUDES) -c $< -o $@
+diff -Naur otp_src_R13A~orig/lib/asn1/c_src/Makefile.in otp_src_R13A/lib/asn1/c_src/Makefile.in
+--- otp_src_R13A~orig/lib/asn1/c_src/Makefile.in	2009-04-04 14:25:15.000000000 +0200
++++ otp_src_R13A/lib/asn1/c_src/Makefile.in	2009-04-04 17:48:14.000000000 +0200
+@@ -60,7 +60,7 @@
+ DRIVER_INCLUDES = -I$(ERL_TOP)/erts/emulator/beam \
+ 	-I$(ERL_TOP)/erts/emulator/sys/$(ERLANG_OSTYPE)
+ CFLAGS = $(DRIVER_INCLUDES) $(EI_INCLUDES) @DED_CFLAGS@
+-LDFLAGS = @DED_LDFLAGS@
++LDFLAGS += @DED_LDFLAGS@
+ 
+ LD_INCL_EI = -L$(EI_LIBDIR)
+ 
+diff -Naur otp_src_R13A~orig/lib/crypto/c_src/Makefile.in otp_src_R13A/lib/crypto/c_src/Makefile.in
+--- otp_src_R13A~orig/lib/crypto/c_src/Makefile.in	2009-04-04 14:25:16.000000000 +0200
++++ otp_src_R13A/lib/crypto/c_src/Makefile.in	2009-04-04 17:48:32.000000000 +0200
+@@ -33,7 +33,7 @@
+ LD = @DED_LD@
+ SHELL = /bin/sh
+ LIBS = @LIBS@
+-LDFLAGS = @DED_LDFLAGS@
++LDFLAGS += @DED_LDFLAGS@
+ CFLAGS = @DED_CFLAGS@
+ ERLANG_OSTYPE = @ERLANG_OSTYPE@
+ TARGET = @host@
+diff -Naur otp_src_R13A~orig/lib/erl_interface/src/Makefile.in otp_src_R13A/lib/erl_interface/src/Makefile.in
+--- otp_src_R13A~orig/lib/erl_interface/src/Makefile.in	2009-04-04 14:25:16.000000000 +0200
++++ otp_src_R13A/lib/erl_interface/src/Makefile.in	2009-04-04 16:41:46.000000000 +0200
+@@ -715,11 +715,11 @@
+ else
+ ifdef THR_DEFS
+ $(ERL_CALL): $(ERLCALL) ../include/ei.h $(MT_EILIB)
+-	$(PURIFY) $(CC) $(PROG_CFLAGS) $(THR_DEFS) -o $@ $(ERLCALL) \
++	$(PURIFY) $(CC) $(PROG_CFLAGS) $(THR_DEFS) $(LDFLAGS) -o $@ $(ERLCALL) \
+ 		-L$(OBJDIR) -lei $(THR_LIBS) $(LIBS)
+ else
+ $(ERL_CALL): $(ERLCALL) ../include/ei.h $(ST_EILIB)
+-	$(PURIFY) $(CC) $(PROG_CFLAGS) -o $@ $(ERLCALL) \
++	$(PURIFY) $(CC) $(PROG_CFLAGS) $(LDFLAGS) -o $@ $(ERLCALL) \
+ 		-L$(OBJDIR) -lei $(LIBS)
+ endif
+ endif
+diff -Naur otp_src_R13A~orig/lib/megaco/src/flex/Makefile.in otp_src_R13A/lib/megaco/src/flex/Makefile.in
+--- otp_src_R13A~orig/lib/megaco/src/flex/Makefile.in	2009-04-04 14:25:16.000000000 +0200
++++ otp_src_R13A/lib/megaco/src/flex/Makefile.in	2009-04-04 17:57:24.000000000 +0200
+@@ -48,7 +48,7 @@
+ CC      = @CC@
+ CFLAGS_MT = $(CFLAGS) -D_THREAD_SAFE -D_REENTRANT
+ LD      = @DED_LD@
+-LDFLAGS = @DED_LDFLAGS@
++LDFLAGS += @DED_LDFLAGS@
+ LEX     = @LEX@
+ LEXLIB  = @LEXLIB@
+ PERL    = @PERL@
+diff -Naur otp_src_R13A~orig/lib/runtime_tools/c_src/Makefile.in otp_src_R13A/lib/runtime_tools/c_src/Makefile.in
+--- otp_src_R13A~orig/lib/runtime_tools/c_src/Makefile.in	2009-04-04 14:25:34.000000000 +0200
++++ otp_src_R13A/lib/runtime_tools/c_src/Makefile.in	2009-04-04 16:23:59.000000000 +0200
+@@ -35,7 +35,7 @@
+ LD = @DED_LD@
+ SHELL = /bin/sh
+ LIBS = @LIBS@
+-LDFLAGS = @DED_LDFLAGS@
++LDFLAGS += @DED_LDFLAGS@
+ ERLANG_OSTYPE = @ERLANG_OSTYPE@
+ 
+ SYSINCLUDE = 	-I$(ERL_TOP)/erts/emulator/beam \
+diff -Naur otp_src_R13A~orig/lib/ssl/c_src/Makefile.in otp_src_R13A/lib/ssl/c_src/Makefile.in
+--- otp_src_R13A~orig/lib/ssl/c_src/Makefile.in	2009-04-04 14:25:15.000000000 +0200
++++ otp_src_R13A/lib/ssl/c_src/Makefile.in	2009-04-04 16:33:37.000000000 +0200
+@@ -163,7 +163,7 @@
+ 
+ # Unix
+ $(BINDIR)/ssl_esock: $(OBJS)
+-	$(CC) $(CC_R_OPT) $(PLAIN_CFLAGS) -o $@ $^ $(LIBS) $(SSL_LINK_LIB)
++	$(CC) $(CC_R_OPT) $(PLAIN_CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) $(SSL_LINK_LIB)
+ 
+ # Win32/Cygwin
+ $(BINDIR)/ssl_esock.exe: $(OBJS)