diff options
| -rw-r--r-- | app-misc/flasm/ChangeLog | 9 | ||||
| -rw-r--r-- | app-misc/flasm/files/flasm-1.62-makefile.patch | 19 |
2 files changed, 22 insertions, 6 deletions
diff --git a/app-misc/flasm/ChangeLog b/app-misc/flasm/ChangeLog index e0cb531dc224..c2ed132c900c 100644 --- a/app-misc/flasm/ChangeLog +++ b/app-misc/flasm/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-misc/flasm -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/flasm/ChangeLog,v 1.8 2009/10/26 17:22:36 vostorga Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-misc/flasm/ChangeLog,v 1.9 2010/02/23 10:17:54 phajdan.jr Exp $ + + 23 Feb 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org> + files/flasm-1.62-makefile.patch: + Hopefully fix a parallel make issue, bug #275272 by Niall Daley + <bugs.gentoo.org@evilitdirector.com> *flasm-1.62 (26 Oct 2009) diff --git a/app-misc/flasm/files/flasm-1.62-makefile.patch b/app-misc/flasm/files/flasm-1.62-makefile.patch index 549653f8451e..ecc3d3e91ad7 100644 --- a/app-misc/flasm/files/flasm-1.62-makefile.patch +++ b/app-misc/flasm/files/flasm-1.62-makefile.patch @@ -1,5 +1,5 @@ ---- Makefile.old 2005-10-14 02:11:53.000000000 +0200 -+++ Makefile 2006-10-27 22:59:55.654125000 +0200 +--- Makefile.orig 2010-02-23 11:13:31.000000000 +0100 ++++ Makefile 2010-02-23 11:13:37.000000000 +0100 @@ -1,6 +1,4 @@ UNAME = $(shell uname)
-CC = gcc
@@ -16,12 +16,23 @@ endif
# executable should not depend on cygwin.dll
-@@ -26,7 +22,7 @@ +@@ -26,13 +22,15 @@ -rm -f ${OFILES} ${GARBAGE}
flasm: ${OFILES}
- ${CC} $(CFLAGS) -o flasm ${OFILES} ${LIBS}
+ ${CC} $(CFLAGS) $(LDFLAGS) -o flasm ${OFILES} ${LIBS}
- assembler.tab.c assembler.tab.h: assembler.y
+-assembler.tab.c assembler.tab.h: assembler.y
++assembler.tab.c: assembler.tab.h
++
++assembler.tab.h: assembler.y
bison --defines --debug assembler.y
+
+ lex.yy.c: assembler.flex assembler.tab.h
+ flex -i assembler.flex
+
+ keywords.c: keywords.gperf assembler.tab.h
+- gperf --language=ANSI-C -t -T -E -o -k 1,$$,2,5 -S8 keywords.gperf > keywords.c +\ No newline at end of file ++ gperf --language=ANSI-C -t -T -E -o -k 1,$$,2,5 -S8 keywords.gperf > keywords.c
|