Gentoo Archives: gentoo-commits

From: "PaweA Hajdan (phajdan.jr)" <phajdan.jr@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-misc/flasm/files: flasm-1.62-makefile.patch
Date: Tue, 23 Feb 2010 10:17:58
Message-Id: E1Njrpx-0001XR-O5@stork.gentoo.org
1 phajdan.jr 10/02/23 10:17:53
2
3 Modified: flasm-1.62-makefile.patch
4 Log:
5 Hopefully fix a parallel make issue, bug #275272 by Niall Daley <bugs.gentoo.org@××××××××××××××.com>
6 (Portage version: 2.1.7.16/cvs/Linux i686)
7
8 Revision Changes Path
9 1.2 app-misc/flasm/files/flasm-1.62-makefile.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/flasm/files/flasm-1.62-makefile.patch?rev=1.2&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/flasm/files/flasm-1.62-makefile.patch?rev=1.2&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/flasm/files/flasm-1.62-makefile.patch?r1=1.1&r2=1.2
14
15 Index: flasm-1.62-makefile.patch
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/app-misc/flasm/files/flasm-1.62-makefile.patch,v
18 retrieving revision 1.1
19 retrieving revision 1.2
20 diff -u -r1.1 -r1.2
21 --- flasm-1.62-makefile.patch 26 Oct 2009 16:26:20 -0000 1.1
22 +++ flasm-1.62-makefile.patch 23 Feb 2010 10:17:53 -0000 1.2
23 @@ -1,5 +1,5 @@
24 ---- Makefile.old 2005-10-14 02:11:53.000000000 +0200
25 -+++ Makefile 2006-10-27 22:59:55.654125000 +0200
26 +--- Makefile.orig 2010-02-23 11:13:31.000000000 +0100
27 ++++ Makefile 2010-02-23 11:13:37.000000000 +0100
28 @@ -1,6 +1,4 @@
29 UNAME = $(shell uname)
30 -CC = gcc
31 @@ -16,12 +16,23 @@
32 endif
33
34 # executable should not depend on cygwin.dll
35 -@@ -26,7 +22,7 @@
36 +@@ -26,13 +22,15 @@
37 -rm -f ${OFILES} ${GARBAGE}
38
39 flasm: ${OFILES}
40 - ${CC} $(CFLAGS) -o flasm ${OFILES} ${LIBS}
41 + ${CC} $(CFLAGS) $(LDFLAGS) -o flasm ${OFILES} ${LIBS}
42
43 - assembler.tab.c assembler.tab.h: assembler.y
44 +-assembler.tab.c assembler.tab.h: assembler.y
45 ++assembler.tab.c: assembler.tab.h
46 ++
47 ++assembler.tab.h: assembler.y
48 bison --defines --debug assembler.y
49 +
50 + lex.yy.c: assembler.flex assembler.tab.h
51 + flex -i assembler.flex
52 +
53 + keywords.c: keywords.gperf assembler.tab.h
54 +- gperf --language=ANSI-C -t -T -E -o -k 1,$$,2,5 -S8 keywords.gperf > keywords.c
55 +\ No newline at end of file
56 ++ gperf --language=ANSI-C -t -T -E -o -k 1,$$,2,5 -S8 keywords.gperf > keywords.c