summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTony Vroon <chainsaw@gentoo.org>2010-10-17 13:51:26 +0000
committerTony Vroon <chainsaw@gentoo.org>2010-10-17 13:51:26 +0000
commitfb100901993d985399ba4fefe630c2f15ddebcea (patch)
treeb3c094fa2069da48ac187cf475483abccce3404d /app-emulation/dynamips
parentInstill LDFLAGS respect into build system. Closes bug #339537 by Diego Elio "... (diff)
downloadgentoo-2-fb100901993d985399ba4fefe630c2f15ddebcea.tar.gz
gentoo-2-fb100901993d985399ba4fefe630c2f15ddebcea.tar.bz2
gentoo-2-fb100901993d985399ba4fefe630c2f15ddebcea.zip
Patch rediffed as per feedback by Samuli Suominen.
(Portage version: 2.1.9.19/cvs/Linux x86_64)
Diffstat (limited to 'app-emulation/dynamips')
-rw-r--r--app-emulation/dynamips/ChangeLog6
-rw-r--r--app-emulation/dynamips/files/dynamips-0.2.8_rc2-makefile.patch4
2 files changed, 7 insertions, 3 deletions
diff --git a/app-emulation/dynamips/ChangeLog b/app-emulation/dynamips/ChangeLog
index 29001f6eb90c..5b329f0859a9 100644
--- a/app-emulation/dynamips/ChangeLog
+++ b/app-emulation/dynamips/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-emulation/dynamips
# 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 $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/dynamips/ChangeLog,v 1.4 2010/10/17 13:51:26 chainsaw Exp $
+
+ 17 Oct 2010; <chainsaw@gentoo.org>
+ files/dynamips-0.2.8_rc2-makefile.patch:
+ Patch rediffed as per feedback by Samuli Suominen.
*dynamips-0.2.8_rc2-r1 (17 Oct 2010)
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 77d42bef90bb..1d19f4522a25 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
@@ -37,7 +37,7 @@ diff -uNr dynamips-0.2.8-RC2.ORIG//Makefile dynamips-0.2.8-RC2/Makefile
+$(PROG): $(LEX_C) $(C_OBJS) $(A_OBJS)
@echo "Linking $@"
- @$(CC) -o $@ $(C_OBJS) $(A_OBJS) $(LIBS)
-+ @$(CC) -o $@ $(C_OBJS) $(A_OBJS) $(LIBS) $(LDFLAGS)
++ @$(CC) $(LDFLAGS) -o $@ $(C_OBJS) $(A_OBJS) $(LIBS)
udp_send$(BIN_EXT): udp_send.c net.c crc.c
@echo "Linking $@"
@@ -50,7 +50,7 @@ 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 $(LDFLAGS)
++ @$(CC) $(LDFLAGS) -Wall $(CFLAGS) -o $@ nvram_export.c
install: $(PROG) nvram_export
@echo "Installing"