diff options
| author |   Harald van Dijk <truedfx@gentoo.org> | 2007-12-09 08:37:47 +0000 |
|---|---|---|
| committer | Harald van Dijk <truedfx@gentoo.org> | 2007-12-09 08:37:47 +0000 |
| commit | afc370b939fc6c7e9a95255a4ef9963b9537fdcf (patch) | |
| tree | 75d2751d23ef635a0d887d5deb9b2b5635cf975e /dev-lang | |
| parent | Fix a typo. (diff) | |
| download | gentoo-2-afc370b939fc6c7e9a95255a4ef9963b9537fdcf.tar.gz gentoo-2-afc370b939fc6c7e9a95255a4ef9963b9537fdcf.tar.bz2 gentoo-2-afc370b939fc6c7e9a95255a4ef9963b9537fdcf.zip | |
Restore part of Makefile so that non-x86 can build lazarus
(Portage version: 2.1.4_rc9)
Diffstat (limited to 'dev-lang')
| -rw-r--r-- | dev-lang/lazarus/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-lang/lazarus/files/lazarus-0.9.24-cputarget.patch | 14 | ||||
| -rw-r--r-- | dev-lang/lazarus/lazarus-0.9.24.ebuild | 4 |
3 files changed, 22 insertions, 2 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/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() { |