Add patch from Thomas Jürges to compile with numcpus=1 or USE=no-opts (bug #542848)

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

4 files changed, 58 insertions, 6 deletions

diff --git a/games-board/crafty/ChangeLog b/games-board/crafty/ChangeLog
index eaaecb742314..3c5dfbb513d2 100644
--- a/games-board/crafty/ChangeLog
+++ b/games-board/crafty/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-board/crafty
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/crafty/ChangeLog,v 1.63 2014/12/31 17:11:28 mr_bones_ Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/crafty/ChangeLog,v 1.64 2015/05/16 00:05:10 mr_bones_ Exp $
+
+  16 May 2015; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/crafty-24.1-numcpus.patch, crafty-24.1.ebuild:
+  Add patch from Thomas Jürges to compile with numcpus=1 or USE=no-opts (bug
+  #542848)
 
   31 Dec 2014; Michael Sterrett <mr_bones_@gentoo.org> -crafty-23.4.ebuild,
   -files/crafty-23.4-64bits.patch:
diff --git a/games-board/crafty/Manifest b/games-board/crafty/Manifest
index cd9378a3a578..f92ec2051265 100644
--- a/games-board/crafty/Manifest
+++ b/games-board/crafty/Manifest
@@ -1,5 +1,6 @@
+AUX crafty-24.1-numcpus.patch 1564 SHA256 ef6451bf80d98e74eb4ce76fc91b3afbde7b41d28033b4c3c1d6926ede7c65c2 SHA512 303942f906b0ddedd1f2d2ab2c6808877c793dbc58d5f866c1af9823509fe08085d81cb3ed44f9663fa56aadc6b96a0fa4fbfde0b5ff9f53f1a235185faa2cbf WHIRLPOOL c171ffd383cf9621761b9985dfe3e31795335ef81a8ca7a1cf9c503b230f4ce6ce71ba8c20d8746ebb47d858dd1d8fc154745490e71f570944518ce8447d54cd
 DIST crafty-24.1.zip 442680 SHA256 a29d25d9a26a5a958f07a075d1f76f52c12d287ad16ee7aadb224a0dfee40659 SHA512 4d8088aeb683d69e3ea5e01194eb0dc9b957049823c7f8a1f28686e601f9f270b829319083a8b8170016bfda36a42c592a94b4429d7c4f35a6351fd469f16124 WHIRLPOOL c98726bfd1cb042273105525b13c8bd85e99ce9591292be6e63981bb1b08d8447a53eaf5bb476135cc1221516d18005517e7c6096096f35fbd1e32d1735f1a85
 DIST crafty.doc.ascii 79678 SHA256 be291c0f4c7e7d64404ec58b9e92c2455c4342d3c96c721ba21a80fce8332e83 SHA512 562698c3954e53f05c009025291bdb748baaa08616437796a08b42198057cff9f9efa7a8caf41574e71dafe60f4c132dc9497ad5ed9a83b8f071d1c31c8583b8 WHIRLPOOL 8786cafa5afd98b6878467701ff19206f220b20fd3f575f51f17a052de709d7f5572632dd56876d34a412d4628a6c4eb984ec6e6f148a3418ff16617d7670845
-EBUILD crafty-24.1.ebuild 2531 SHA256 556fa793423d5823eab8bb3ac027a97d02519fa3a78cebcb5f4163001e35785f SHA512 ef67e09de7790ab8f7c9d41f45e65f6c7700eaf489cddbffa870bc89f61839248f767a9ac2f09c96c9bf5e250361647d847ded8bff739b3ee628f0bbde51260f WHIRLPOOL 9df617f45b801cba2788921a3814fcc26475aaed157fcf543686bbd6ca3bead7d9625561e0454954cc568a528a42f7e0f7f10923c0ed3006b81654d58e397964
-MISC ChangeLog 8035 SHA256 c04c65acdaa65f09d164fee67f69b85d8e04313db72b78613dc3e62f14e80019 SHA512 d1cf0359a2b61bb7a6f6a189e1dbc522e5600c434a55801b59d1daa9860f898a81295fe86e75b9f4081c5d92e94f7a52510ca5100bbf51e19577198ecd804ecc WHIRLPOOL 34070d540bd55557523715c30cbc89fa1f9f73b2fab84932f3541c42edb3e93568c8e3e4a50d4a7b930e364e2c65e32fe1c16c291f6f5222f0e727daf76bd70d
+EBUILD crafty-24.1.ebuild 2596 SHA256 b2dd534c3fd4405ce88801396e66d747a30cfaf32028aabcb077bf39ab2e94ab SHA512 f20d01d981661335c0ed6d2f7019e99bfb8a5a0e20b8567420f7bbb599ad32a750b8f869d2a0ff8f88aedb5923b5e67ed3e73bff2c90654fe943e4f5f9d70bba WHIRLPOOL ef0dc9996942f61ac5005cbb98bd91853c0d7e56f202ad5d9d68b32bd0dc52092646c3304ff5a5e4b86fa05107b54919ef67288a1f4d7b5324f772f24f3f983c
+MISC ChangeLog 8236 SHA256 1b931f85790ece8302635b510bd44b715971d695a2629526cd570e5eb50e01ca SHA512 d27f40dc73f43303e3196db4d483a9ef721cba918c5a34a364acfe71ae1a03c71dc81ebd519c8b5d869a7d038acef9fdb6fe4ae4512147e9ae9ae5ee8b6dfce9 WHIRLPOOL 920eec73c10dc5c699e0de7ebba4e411adc53022d2f1901170770161f83c2dc7e9cc87f47925bdc5f5e4d2c4302509511d06dd2b86d6fcf826509cf97e9b288b
 MISC metadata.xml 249 SHA256 49f221ca292eb58886695b31631b28f38321f3fd6dfd265bba9991b093d68dec SHA512 eb748485c491ffc953879496bfd0170b091a7c7653eb19fe2317d439b51bc0b5e6cc89d2b81778e8a8468e04a0b4914159fc8ed5c54d956fcaedf20adfe43a7c WHIRLPOOL 745bf5f9fb3b7458b7744fbb7a0392f9eebb9b08976e9d0252f409540a800110428ea470d6475c12c4375f5c8bab5c342de7854431ac8b67e2401b24caa13cf5
diff --git a/games-board/crafty/crafty-24.1.ebuild b/games-board/crafty/crafty-24.1.ebuild
index 7fe1f18cfd1b..37524731541d 100644
--- a/games-board/crafty/crafty-24.1.ebuild
+++ b/games-board/crafty/crafty-24.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/crafty/crafty-24.1.ebuild,v 1.4 2014/12/31 16:16:30 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/crafty/crafty-24.1.ebuild,v 1.5 2015/05/16 00:05:10 mr_bones_ Exp $
 
 EAPI=5
 inherit flag-o-matic toolchain-funcs eutils games
@@ -25,9 +25,11 @@ src_prepare() {
 	sed -i \
 		-e '/-o crafty/s/CC/CXX/' \
 		-e 's:CXFLAGS:CXXFLAGS:g' \
+		-e 's:-j ::g' \
 		Makefile || die
 	sed -i \
 		-e "s:\"crafty.hlp\":\"${GAMES_DATADIR}/${PN}/crafty.hlp\":" option.c || die
+	epatch "${FILESDIR}"/${P}-numcpus.patch
 }
 
 src_compile() {
diff --git a/games-board/crafty/files/crafty-24.1-numcpus.patch b/games-board/crafty/files/crafty-24.1-numcpus.patch
new file mode 100644
index 000000000000..14365cede2a0
--- /dev/null
+++ b/games-board/crafty/files/crafty-24.1-numcpus.patch
@@ -0,0 +1,44 @@
+diff -ru crafty-24.1.org/lock.h crafty-24.1/lock.h
+--- crafty-24.1.org/lock.h	2015-03-10 16:24:09.064539177 +0100
++++ crafty-24.1/lock.h	2015-03-10 17:45:37.675995497 +0100
+@@ -42,6 +42,7 @@
+  *                                                                             *
+  *******************************************************************************
+  */
++#    if defined(__i386__) || defined(__amd64__)
+ static void __inline__ LockX86(volatile int *lock) {
+   int dummy;
+   asm __volatile__(
+@@ -71,17 +72,26 @@
+       :"memory");
+ }
+ 
+-#    define LockInit(p)           (p=0)
+-#    define LockFree(p)           (p=0)
+-#    define Unlock(p)             (UnlockX86(&p))
+-#    define Lock(p)               (LockX86(&p))
+-#    define lock_t                volatile int
+-#  endif
++#      define LockInit(p)           (p=0)
++#      define LockFree(p)           (p=0)
++#      define Unlock(p)             (UnlockX86(&p))
++#      define Lock(p)               (LockX86(&p))
++#      define lock_t                volatile int
++#    else /* Not building for x86 or amd64 platforms */
++#      define LockInit(p)
++#      define LockFree(p)
++#      define Lock(p)
++#      define Unlock(p)
++#      define Pause()
++#      define lock_t volatile int
++#    endif /* x86 && amd64 platforms or rest of the world. */
++#  endif                          /*  SMP code */
+ #else
+ #  define LockInit(p)
+ #  define LockFree(p)
+ #  define Lock(p)
+ #  define Unlock(p)
++#  define Pause()
+ #  define lock_t volatile int
+ #endif                          /*  SMP code */
+ /* *INDENT-ON* */