Restore part of Makefile so that non-x86 can build lazarus

Package-Manager: portage-2.1.4_rc9

4 files changed, 37 insertions, 13 deletions

diff --git a/dev-lang/lazarus/ChangeLog b/dev-lang/lazarus/ChangeLog
index 36f0b4c1718e..f45979e8dc92 100644
--- a/dev-lang/lazarus/ChangeLog
+++ b/dev-lang/lazarus/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/lazarus
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/lazarus/ChangeLog,v 1.18 2007/12/08 00:11:23 truedfx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lazarus/ChangeLog,v 1.19 2007/12/09 08:37:46 truedfx Exp $
+
+  09 Dec 2007; Harald van Dijk <truedfx@gentoo.org>
+  +files/lazarus-0.9.24-cputarget.patch, lazarus-0.9.24.ebuild:
+  Restore part of Makefile so that non-x86 can build lazarus
 
 *lazarus-0.9.24 (08 Dec 2007)
 
diff --git a/dev-lang/lazarus/Manifest b/dev-lang/lazarus/Manifest
index 5a2c2991bd9a..b6f61f318cdd 100644
--- a/dev-lang/lazarus/Manifest
+++ b/dev-lang/lazarus/Manifest
@@ -5,20 +5,24 @@ AUX lazarus-0.9.20-fpcsrc.patch 333 RMD160 2afa08d4a5e11c38dd3e6b6907c117b00c5b5
 MD5 728fbd094be35bcec4b8e9b83eea9b6a files/lazarus-0.9.20-fpcsrc.patch 333
 RMD160 2afa08d4a5e11c38dd3e6b6907c117b00c5b523f files/lazarus-0.9.20-fpcsrc.patch 333
 SHA256 2ebf6b5a9a5ff2746339c2b6bfe4149c663803fa4dfe98408240b33cdf1f544c files/lazarus-0.9.20-fpcsrc.patch 333
+AUX lazarus-0.9.24-cputarget.patch 488 RMD160 b2ef423c2bc3a161508d95b2d8f5f6b183411c76 SHA1 a48f86f31204de80dddd25ff2928a73e040fab22 SHA256 957a295f8b7f85ea1bbb71b71f9ed2de1f413f6b0f75621aaac4b9aa25e4ffd3
+MD5 f99f7eeb8fd7b756a29ae30bf5f5fc28 files/lazarus-0.9.24-cputarget.patch 488
+RMD160 b2ef423c2bc3a161508d95b2d8f5f6b183411c76 files/lazarus-0.9.24-cputarget.patch 488
+SHA256 957a295f8b7f85ea1bbb71b71f9ed2de1f413f6b0f75621aaac4b9aa25e4ffd3 files/lazarus-0.9.24-cputarget.patch 488
 DIST lazarus-0.9.22-0.tar.gz 9264538 RMD160 cd78903b564b84f23a8f403a7324b616a23de116 SHA1 a150d387ac716f7ebd5697bd576c818c0f1a72b7 SHA256 9454e7383ad654fffba2adfc5749662dc3e5d4d7b064c25f8863260819b654f6
 DIST lazarus-0.9.24-0.tar.gz 11037130 RMD160 3f815d228397443d347d2c32a71c52b3d617d632 SHA1 11f239df774f401ac260e1f6f1c115839dff4ddd SHA256 4720c8d633c8e3d18750452278d135450c7c942ff591c10cd7d9afc6bc0f724e
 EBUILD lazarus-0.9.22-r1.ebuild 2446 RMD160 920310be83ff70238532c69d3782f0fa4883fed0 SHA1 a8260493aad1c69e61c849d65d350ebf3088c304 SHA256 db42c182ed62b6724f251663f1b6444c3c5a28e7b59a3004f31d83601ad736c4
 MD5 c8a979a47aa9134c29f36b2b826dbc8c lazarus-0.9.22-r1.ebuild 2446
 RMD160 920310be83ff70238532c69d3782f0fa4883fed0 lazarus-0.9.22-r1.ebuild 2446
 SHA256 db42c182ed62b6724f251663f1b6444c3c5a28e7b59a3004f31d83601ad736c4 lazarus-0.9.22-r1.ebuild 2446
-EBUILD lazarus-0.9.24.ebuild 2510 RMD160 5d3739944cc9a970ca6bdc26a7018d5f38e9b5dd SHA1 1a0babce467844fcee706d52b3edaa2bb63b5797 SHA256 a4eeb27e5fb4978764fa53a0b28aaca17d5f967bbdde84d62a4d96f58b984bdd
-MD5 536b7f24f8af149085258535b2dc1821 lazarus-0.9.24.ebuild 2510
-RMD160 5d3739944cc9a970ca6bdc26a7018d5f38e9b5dd lazarus-0.9.24.ebuild 2510
-SHA256 a4eeb27e5fb4978764fa53a0b28aaca17d5f967bbdde84d62a4d96f58b984bdd lazarus-0.9.24.ebuild 2510
-MISC ChangeLog 3067 RMD160 f46398bf40f99c162b270a2d9ec288e917b90bb9 SHA1 0bec64ba24da2f77f1708fb1b3b4b758704b8f3c SHA256 06c4fa06ec63ea4983c95eee1635016543982c1d3774b2111512da348a1b90f9
-MD5 b6fc510a495d02c8cae4fa7896678e15 ChangeLog 3067
-RMD160 f46398bf40f99c162b270a2d9ec288e917b90bb9 ChangeLog 3067
-SHA256 06c4fa06ec63ea4983c95eee1635016543982c1d3774b2111512da348a1b90f9 ChangeLog 3067
+EBUILD lazarus-0.9.24.ebuild 2554 RMD160 e99b625ee00f68a4a57c4ac66e26c319930ff3d9 SHA1 e81e848340dc4bb88d46bc4d7f8eb65d0d60aa15 SHA256 bf6af68bcc9f2564f88c302798653410ce9f321bbd92a63388483e3827f92804
+MD5 3483828b811eb8edb43b0aa13294b79d lazarus-0.9.24.ebuild 2554
+RMD160 e99b625ee00f68a4a57c4ac66e26c319930ff3d9 lazarus-0.9.24.ebuild 2554
+SHA256 bf6af68bcc9f2564f88c302798653410ce9f321bbd92a63388483e3827f92804 lazarus-0.9.24.ebuild 2554
+MISC ChangeLog 3245 RMD160 2a942362c14128d6d72bc69547176accc737ab58 SHA1 05011c30215e7da4afdbb418cd27c18fe929cf7c SHA256 b7dac7f72d72aa861fb35b7b1f1c41ac4e50b67f96eae36889acf45bf0067676
+MD5 fb5ce47194950be6c575f43ea06bb033 ChangeLog 3245
+RMD160 2a942362c14128d6d72bc69547176accc737ab58 ChangeLog 3245
+SHA256 b7dac7f72d72aa861fb35b7b1f1c41ac4e50b67f96eae36889acf45bf0067676 ChangeLog 3245
 MISC metadata.xml 281 RMD160 423ab877620b713044c2d08753af1fa18a3adce4 SHA1 c861318fcfa3725a45dd0deb55fbfc26a49245b6 SHA256 d0d50fc65f6bc2ce65700e4ea995148f15c4e7a0eca5d0f86e3f4b9a73a4aae6
 MD5 8773813255798a06aad7b06e083a1a55 metadata.xml 281
 RMD160 423ab877620b713044c2d08753af1fa18a3adce4 metadata.xml 281
@@ -32,7 +36,7 @@ SHA256 5314afad741020603f9fcc75b1170d8453ed9d92adbcfd2c553ee3fa2554ba6f files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHWeF6wnQyISwouHwRAkCyAJ4sdIT4PNcoHxY4Kv1LXLCbgXAfSACfUhqX
-EX8jdwGF833/qh0bJ6sHEwU=
-=FsAT
+iD8DBQFHW6miwnQyISwouHwRArBZAJwKiAOPgngDtJzM+UeV8mf/qtcsWACgsjyu
+SZmO+fSqpk7ElSJXPHyUQhk=
+=qyqO
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/lazarus/files/lazarus-0.9.24-cputarget.patch b/dev-lang/lazarus/files/lazarus-0.9.24-cputarget.patch
new file mode 100644
index 000000000000..81507408c1a0
--- /dev/null
+++ b/dev-lang/lazarus/files/lazarus-0.9.24-cputarget.patch
@@ -0,0 +1,14 @@
+
+  Bug #201666: CPU_TARGET is not yet set when looking for fpc, so don't use it
+
+--- lazarus/Makefile
++++ lazarus/Makefile
+@@ -107,7 +107,7 @@
+ FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH))))
+ ifneq ($(FPCPROG),)
+ FPCPROG:=$(firstword $(FPCPROG))
+-FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB)
++FPC:=$(shell $(FPCPROG) -PB)
+ ifneq ($(findstring Error,$(FPC)),)
+ override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH)))))
+ endif
diff --git a/dev-lang/lazarus/lazarus-0.9.24.ebuild b/dev-lang/lazarus/lazarus-0.9.24.ebuild
index 0fdc94133313..7fcbf91ce8f0 100644
--- a/dev-lang/lazarus/lazarus-0.9.24.ebuild
+++ b/dev-lang/lazarus/lazarus-0.9.24.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/lazarus/lazarus-0.9.24.ebuild,v 1.1 2007/12/08 00:11:23 truedfx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lazarus/lazarus-0.9.24.ebuild,v 1.2 2007/12/09 08:37:46 truedfx Exp $
 
 inherit eutils
 
@@ -50,6 +50,8 @@ src_unpack() {
 
 	cd "${S}"
 	epatch "${T}"/fpcsrc.patch
+
+	epatch "${FILESDIR}"/${P}-cputarget.patch
 }
 
 src_compile() {