diff options
| author |   Paweł Hajdan <phajdan.jr@gentoo.org> | 2010-02-23 10:17:54 +0000 |
|---|---|---|
| committer | Paweł Hajdan <phajdan.jr@gentoo.org> | 2010-02-23 10:17:54 +0000 |
| commit | 69f4871187ba53d4682e864c56a7df9143800d06 (patch) | |
| tree | c6bb1905e6a7ed487aa4cca48bc90af6f998197d /app-misc | |
| parent | Automated update of use.local.desc (diff) | |
| download | historical-69f4871187ba53d4682e864c56a7df9143800d06.tar.gz historical-69f4871187ba53d4682e864c56a7df9143800d06.tar.bz2 historical-69f4871187ba53d4682e864c56a7df9143800d06.zip | |
Hopefully fix a parallel make issue, bug #275272 by Niall Daley <bugs.gentoo.org@evilitdirector.com>
Package-Manager: portage-2.1.7.16/cvs/Linux i686
Diffstat (limited to 'app-misc')
| -rw-r--r-- | app-misc/flasm/ChangeLog | 9 | ||||
| -rw-r--r-- | app-misc/flasm/Manifest | 4 | ||||
| -rw-r--r-- | app-misc/flasm/files/flasm-1.62-makefile.patch | 19 |
3 files changed, 24 insertions, 8 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/Manifest b/app-misc/flasm/Manifest index ac567a37ef1d..b3364634b69f 100644 --- a/app-misc/flasm/Manifest +++ b/app-misc/flasm/Manifest @@ -1,6 +1,6 @@ AUX flasm-1.62-bison-2.patch 16828 RMD160 ac7f87892bfc255c453238075a79c39206e3ce4c SHA1 ae2314cf8d8f2502d075a30c07344e882dad9d4e SHA256 86c5fdb60d7195610a9be73cd968292cb51dd3211086c00b9d6c02168c3f2574 -AUX flasm-1.62-makefile.patch 940 RMD160 78426b4742114f3461e639c4d300c77722c04994 SHA1 e05db6a8d6cde70a7e78a9dc7129d071108e731e SHA256 7e604e4dca11e42be74e9564d7b1e3d3861494553f45280d90ddd84ca38245c0 +AUX flasm-1.62-makefile.patch 1325 RMD160 bf8eabf00e3257326cf25a1371e97157e87d1e94 SHA1 dc500ed2314ee4f877304182c1e24bd1d5d9d251 SHA256 ae8ea0553e8ce78a27ac749a78070cedb96ea22b436e59236f2815a604490199 DIST flasm162src.zip 111920 RMD160 7076a6b1aa8312c7a2356e9ddf92501f3bdd0f6b SHA1 a85cc4db72561ada6429ead47f28618d08a89041 SHA256 d6d2b61a9f4c29f61a724c0c84b95e907c2af38f1346ae5799bd0dd9b5d9f3bf EBUILD flasm-1.62.ebuild 1194 RMD160 7c584055a807b099eef71f82531e8c3086e316cb SHA1 1e62b608fe06d46774847c6e89e68823ebd67b1c SHA256 d4207cd66526b2086538c2675b2cf4778591c2bbf668b70e58420dedec4fc5d6 -MISC ChangeLog 1462 RMD160 013b75ccc01c3cde0abe4ec67c2dae1cc9dc0196 SHA1 46c76c6b37b58eacd4ee8613bb2810c16d3e0a59 SHA256 61395e4cc55d8b0552fa62e0bcc76ed31ce92715e3228efd025e68bb23759766 +MISC ChangeLog 1660 RMD160 70ebff6ca388bf0a8ff2420abbf353af6a9a9431 SHA1 543312e1da2bc0417c3865749858fb510db101ff SHA256 4170a7ce4886ce677d6b01bce8a0d2f885378216f2291594cc88cedc50ddcb2f MISC metadata.xml 673 RMD160 6ed7451227aab4ad9575d258ee8f460213677a73 SHA1 b296ca6bc386493f5f695eabd9cd13b86aadb4ea SHA256 679faf4fe45e784e8b9eaa41d23c974fb0a9b88883ffcd337a6865a3c6885c42 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
|