Instill LDFLAGS respect into upstream Makefile. Closes bug #338169 by Diego Elio "Flameeyes" Pettenò.

Package-Manager: portage-2.1.9.19/cvs/Linux x86_64

4 files changed, 38 insertions, 14 deletions

diff --git a/app-emulation/dynamips/ChangeLog b/app-emulation/dynamips/ChangeLog
index fbd3d596889d..29001f6eb90c 100644
--- a/app-emulation/dynamips/ChangeLog
+++ b/app-emulation/dynamips/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/dynamips
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/dynamips/ChangeLog,v 1.2 2009/08/25 15:34:13 armin76 Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/dynamips/ChangeLog,v 1.3 2010/10/17 12:58:02 chainsaw Exp $
+
+*dynamips-0.2.8_rc2-r1 (17 Oct 2010)
+
+  17 Oct 2010; <chainsaw@gentoo.org> -dynamips-0.2.8_rc2.ebuild,
+  +dynamips-0.2.8_rc2-r1.ebuild, files/dynamips-0.2.8_rc2-makefile.patch:
+  Instill LDFLAGS respect into upstream Makefile. Closes bug #338169 by
+  Diego Elio "Flameeyes" Pettenò.
 
   25 Aug 2009; Raúl Porcel <armin76@gentoo.org> dynamips-0.2.8_rc2.ebuild:
   Add ~x86 wrt #281315
diff --git a/app-emulation/dynamips/Manifest b/app-emulation/dynamips/Manifest
index 5af9165ab61f..b49a086ebefe 100644
--- a/app-emulation/dynamips/Manifest
+++ b/app-emulation/dynamips/Manifest
@@ -1,5 +1,15 @@
-AUX dynamips-0.2.8_rc2-makefile.patch 1539 RMD160 f6ce6cbc7b5590d26268147d2d99d310e4f8ad32 SHA1 070a7cbedbadfde993f1087e0955c2ebfaabff64 SHA256 998a858436c7a7b2a4a76b34fae979885e2855b25ed44df1b113b923f7107edb
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX dynamips-0.2.8_rc2-makefile.patch 1773 RMD160 ec423523db33ecfb69091ec90ca3924d71e86f43 SHA1 f988a9990d187ad0231fb542523fcb5f0466b128 SHA256 77dfd81ecd31adc23130335fad9955a61256c4fb250793d47faf90aef707f230
 DIST dynamips-0.2.8-RC2.tar.gz 578935 RMD160 0447a4c0cf516bd2b63259881c7625e26d0d838f SHA1 349270690996a1e260b3eceb51ea90f94c25a59e SHA256 a8b377ce631119e285c401fdb7cb4d0bcc600a15508bdffcf337546957e252de
-EBUILD dynamips-0.2.8_rc2.ebuild 1201 RMD160 10cd654a588c8045bf1efbbf4d1446fcba35175b SHA1 5115909c532682c59f1007368e99dc4b2e61d2da SHA256 cb5035cd73c953921458243b11e53ea9c6e6e10a509163797bc029bd2d663ca6
-MISC ChangeLog 683 RMD160 5ca84788f3cad7539c61547837fc1f80583d818e SHA1 1b550c284c7c51730ed6be62692f085207ad8e65 SHA256 ba8aaf0c2fd861ed342844a00ea438cf7de93285fd38208d1a643be0858fad47
+EBUILD dynamips-0.2.8_rc2-r1.ebuild 1205 RMD160 43466906c210d7fe715d8272c66de35b2c9dafe6 SHA1 bf39e4bfa345f620d1bcc92f9bf70f4ce76aeec0 SHA256 fcf1f6aaa5a77f7d2927795a3faa737d120133f40081664980c8ca233f79ef0c
+MISC ChangeLog 969 RMD160 4d264d9c6f14931ed6404878eb94297c7d0e71bb SHA1 6e635b15d8a05c667d004267cd7825c6c1af2bd2 SHA256 c43c645a27f94b242961a21a26568e2528c39b25f7d88252ff89e7347eae4766
 MISC metadata.xml 250 RMD160 6bbdc9d6d979eae6d4ec2a7f5294ef09611d9dbc SHA1 765762962967f3eb41eb2f6a74dec6b80e3d0cbe SHA256 8f7792a007816fa31c4b25268b5cf224c15ceef5dfef8bd45c56c70295cdc4e9
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAky68uYACgkQp5vW4rUFj5rv8wCgjU+T58yzOdQo/CD1rgxowB62
+pJsAni+ZgiZzpNnLdKWdgdvo1ClfcfA2
+=t2m1
+-----END PGP SIGNATURE-----
diff --git a/app-emulation/dynamips/dynamips-0.2.8_rc2.ebuild b/app-emulation/dynamips/dynamips-0.2.8_rc2-r1.ebuild
index 4dd407603a04..1e81331ec5dc 100644
--- a/app-emulation/dynamips/dynamips-0.2.8_rc2.ebuild
+++ b/app-emulation/dynamips/dynamips-0.2.8_rc2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/dynamips/dynamips-0.2.8_rc2.ebuild,v 1.2 2009/08/25 15:34:13 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/dynamips/dynamips-0.2.8_rc2-r1.ebuild,v 1.1 2010/10/17 12:58:02 chainsaw Exp $
 
 inherit eutils
 
diff --git a/app-emulation/dynamips/files/dynamips-0.2.8_rc2-makefile.patch b/app-emulation/dynamips/files/dynamips-0.2.8_rc2-makefile.patch
index 3262515eacaf..77d42bef90bb 100644
--- a/app-emulation/dynamips/files/dynamips-0.2.8_rc2-makefile.patch
+++ b/app-emulation/dynamips/files/dynamips-0.2.8_rc2-makefile.patch
@@ -1,6 +1,6 @@
-diff -uNr dynamips-0.2.8-RC2.ORIG/Makefile dynamips-0.2.8-RC2/Makefile
---- dynamips-0.2.8-RC2.ORIG/Makefile	2009-08-07 17:24:11.000000000 +0100
-+++ dynamips-0.2.8-RC2/Makefile	2009-08-07 17:24:52.000000000 +0100
+diff -uNr dynamips-0.2.8-RC2.ORIG//Makefile dynamips-0.2.8-RC2/Makefile
+--- dynamips-0.2.8-RC2.ORIG//Makefile	2010-10-17 13:50:01.000000000 +0100
++++ dynamips-0.2.8-RC2/Makefile	2010-10-17 13:50:57.000000000 +0100
 @@ -3,7 +3,7 @@
  
  # Replace x86 by amd64 for a build on x86_64.
@@ -28,7 +28,7 @@ diff -uNr dynamips-0.2.8-RC2.ORIG/Makefile dynamips-0.2.8-RC2/Makefile
  	-DJIT_ARCH=\"$(DYNAMIPS_ARCH)\" -DJIT_CPU=CPU_$(DYNAMIPS_ARCH) \
  	-DMIPS64_ARCH_INC_FILE=$(MIPS64_ARCH_INC_FILE) \
  	-DPPC32_ARCH_INC_FILE=$(PPC32_ARCH_INC_FILE) \
-@@ -215,8 +215,7 @@
+@@ -215,10 +215,9 @@
  .PHONY: all
  all: $(PROG) nvram_export
  
@@ -36,9 +36,12 @@ diff -uNr dynamips-0.2.8-RC2.ORIG/Makefile dynamips-0.2.8-RC2/Makefile
 -	$(LEX_C) $(C_OBJS) $(A_OBJS)
 +$(PROG): $(LEX_C) $(C_OBJS) $(A_OBJS)
  	@echo "Linking $@"
- 	@$(CC) -o $@ $(C_OBJS) $(A_OBJS) $(LIBS)
+-	@$(CC) -o $@ $(C_OBJS) $(A_OBJS) $(LIBS)
++	@$(CC) -o $@ $(C_OBJS) $(A_OBJS) $(LIBS) $(LDFLAGS)
  
-@@ -246,6 +245,8 @@
+ udp_send$(BIN_EXT): udp_send.c net.c crc.c
+ 	@echo "Linking $@"
+@@ -246,9 +245,11 @@
  	@echo "Building assembly definitions header file"
  	@./asmdefs
  
@@ -46,4 +49,8 @@ diff -uNr dynamips-0.2.8-RC2.ORIG/Makefile dynamips-0.2.8-RC2/Makefile
 +
  nvram_export$(BIN_EXT): nvram_export.c
  	@echo "Linking $@"
- 	@$(CC) -Wall $(CFLAGS) -o $@ nvram_export.c
+-	@$(CC) -Wall $(CFLAGS) -o $@ nvram_export.c
++	@$(CC) -Wall $(CFLAGS) -o $@ nvram_export.c $(LDFLAGS)
+ 
+ install: $(PROG) nvram_export
+ 	@echo "Installing"