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

Package-Manager: portage-2.1.6.7/cvs/Linux i686

4 files changed, 116 insertions, 8 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/Manifest b/dev-lang/erlang/Manifest
index a64070755843..aa14fa2a4c05 100644
--- a/dev-lang/erlang/Manifest
+++ b/dev-lang/erlang/Manifest
@@ -4,6 +4,7 @@ Hash: SHA1
 AUX 50erlang-gentoo.el 134 RMD160 a453ad18f47d20e5ea5ecd1f4e4054d00eab5c35 SHA1 7c17979f533654ef05bbfcc8ae30554e7843923b SHA256 97e1da82cae31a554134d7370739520e4c67b2544e5a13f887651a62e710b4d4
 AUX erlang-12.2.5-amd64_segfault.patch 4459 RMD160 55c66d43421817abf51bca36b0a60be2294897c1 SHA1 e6533ed6316913791ea8abacb3b5b06bc88f2c0f SHA256 d19008728fe7d61be44f708face9adb6530934531c9911a9fdf108447054f11c
 AUX erlang-12.2.5-remove_execstack.patch 3819 RMD160 a52ffd31864b0acec958f5ab4dbc81f9a64ad82c SHA1 185da98fd9da97673ee908eb69390dda7a52241b SHA256 4389cd3c56712d7b07d36f94d4c58063844912082ca431ed1c06f13d668609d1
+AUX erlang-13.1-LDFLAGS.patch 4225 RMD160 179e642bf50dc6b63a2a11a22469a5762b82fcdb SHA1 db75e3b04cd7c1c62d89f8defa2ff029b6539128 SHA256 da4276d10a5d8814774000702aac74fe2e2e0f060d72a2ce43f2defbca52cdf4
 DIST otp_doc_html_R12B-5.tar.gz 5713089 RMD160 b460906043171b27735332ec90c45e38d888869a SHA1 0bd369d02051e01bac58c9b8665bd3538e116f51 SHA256 db131a347217ab434ca4c483abb61dc01989e0db43e1fe6982c3067f60cf91d7
 DIST otp_doc_html_R13A.tar.gz 6246368 RMD160 873b30cd8c5f2617c62aba0314197c54097a27cf SHA1 fb3ed9c0d619d8bbd70af5c6b0e4e90c49771e0d SHA256 07ece729ac923b4e9dc6369d97b0c1f38b3ff43f71de01b0ec0a8d01427d2c83
 DIST otp_doc_man_R12B-5.tar.gz 822321 RMD160 e28d555d0a86fc69e0ee091864828c8eaa58d2be SHA1 ae7036bd2afc9d1fca97f0de2eca84f56656def8 SHA256 f7acb458b72ffa8f9b1f45501bed85d3d9fb691c601f3f6997856c501e2f0659
@@ -11,13 +12,13 @@ DIST otp_doc_man_R13A.tar.gz 950006 RMD160 c082bda26b85cd6bd2ede8dd2c538e2ef50bb
 DIST otp_src_R12B-5.tar.gz 47470402 RMD160 7265ae8ebd045ec5b977148a7c9b995eb7ef2d2d SHA1 6c45509acf70d35d5def2cbefd86ada093c1ac3a SHA256 6ec3f344dd626bd83494fcad66db98a03f930a039b2a1499313d1a5a57aadda7
 DIST otp_src_R13A.tar.gz 54258791 RMD160 42ba3c4815fa702d19281f1d42faaec72a75c703 SHA1 9fa0db27611559d697fe269c3fb9a405ae24d147 SHA256 d95f059eb2fdc98d2b604482abb1738e81fc95a7172defb563fabe2d364a1e0b
 EBUILD erlang-12.2.5-r1.ebuild 4728 RMD160 5bb846f9de161a53caf5ac78a188f54a12bf1c85 SHA1 4be4ad30a4f839271dc88b50d9bdce736cf81857 SHA256 3b7d8b98d10c28fd2021bdae6fefa1cf1fcb8e8dfa375808fb1a68529d6ca4c0
-EBUILD erlang-13.1.ebuild 4461 RMD160 59c31b455f4842d3c08f734e09916aac1f6ecf36 SHA1 a29051d1a9bdd7ea1a0fdb114cecb45b4bb2c14e SHA256 e62352393037d4f29fb008a8cad07f94399f53a06b2909619841a42503af3606
-MISC ChangeLog 25599 RMD160 b2ad2e3db747e7aea9b204000a0c36429e5f7add SHA1 9622c44748c4858d83011bfddc8122dd33ecdfbb SHA256 143d5ce497286746039943897535349e8168d768311677c8e186e864521f62be
+EBUILD erlang-13.1-r1.ebuild 4517 RMD160 8d90d0290e56adaf24a88213fe7219378cba265e SHA1 0f3d42bbb94e6511b3f91e465ca2d77ef393f02a SHA256 2bd95ed1e9fd802fc2b50cb2a3ad1ace0c45e320e919533cfffd3a1099e2f284
+MISC ChangeLog 25903 RMD160 f6410d40391aafcb2f775e5fca334033b61b803f SHA1 81e306e8d1f2ecfee2cad3c06f35eba782d96bfd SHA256 680696b5687812e2e95492a9ddf2c17537282fb695d82ae5a586fe7de587e1b0
 MISC metadata.xml 693 RMD160 6c8d43bd35549421b055b468c45f1f2e5d39357d SHA1 7c778bbc7faf1dfdc11a6155e1c525e42d63ebb5 SHA256 ee0ac0699562802a5191deaef78770c25a342875a3b363ea95a0b92da6f107e3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.10 (GNU/Linux)
 
-iEYEARECAAYFAknbLxgACgkQNQqtfCuFneOJfACbB2dx9DdyC8dMC/5oJ4WopM3K
-K3AAoIMQaBS11CDt6ucG5sOR4Yv7M5Ig
-=h+EJ
+iEYEARECAAYFAkndL2oACgkQNQqtfCuFneOWNgCfcQJDorFq6WTjSXW8q/4ES9Yk
+TRAAnikS07ChNDO9Gv9c+jxuXNSn/w0w
+=dtvK
 -----END PGP SIGNATURE-----
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)