diff options
| author |   Alin Năstac <mrness@gentoo.org> | 2007-01-27 12:50:36 +0000 |
|---|---|---|
| committer | Alin Năstac <mrness@gentoo.org> | 2007-01-27 12:50:36 +0000 |
| commit | 051f3739313cf81dedec19b8ba68bfde0722550a (patch) | |
| tree | 62036c79c547dd772049589f32d3830d5df5dd9e /dev-util | |
| parent | remove mozilla depending version (diff) | |
| download | gentoo-2-051f3739313cf81dedec19b8ba68bfde0722550a.tar.gz gentoo-2-051f3739313cf81dedec19b8ba68bfde0722550a.tar.bz2 gentoo-2-051f3739313cf81dedec19b8ba68bfde0722550a.zip | |
~amd64 (#163567)
(Portage version: 2.1.1-r2)
Diffstat (limited to 'dev-util')
| -rw-r--r-- | dev-util/nsis/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-util/nsis/files/nsis-2.23-32bit.patch | 12 | ||||
| -rw-r--r-- | dev-util/nsis/nsis-2.23.ebuild | 6 |
3 files changed, 21 insertions, 3 deletions
diff --git a/dev-util/nsis/ChangeLog b/dev-util/nsis/ChangeLog index c5d2b507078a..56d52b551f32 100644 --- a/dev-util/nsis/ChangeLog +++ b/dev-util/nsis/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-util/nsis # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/nsis/ChangeLog,v 1.4 2007/01/15 13:25:41 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/nsis/ChangeLog,v 1.5 2007/01/27 12:50:36 mrness Exp $ + + 27 Jan 2007; Alin Năstac <mrness@gentoo.org> + +files/nsis-2.23-32bit.patch, nsis-2.23.ebuild: + Add ~amd64 keyword, thanks to Roie Marianer <roie@int2001.co.il> (#163567). *nsis-2.23 (15 Jan 2007) diff --git a/dev-util/nsis/files/nsis-2.23-32bit.patch b/dev-util/nsis/files/nsis-2.23-32bit.patch new file mode 100644 index 000000000000..24e942b7347f --- /dev/null +++ b/dev-util/nsis/files/nsis-2.23-32bit.patch @@ -0,0 +1,12 @@ +diff -Nru nsis-2.23-src.orig/SCons/Config/gnu nsis-2.23-src/SCons/Config/gnu +--- nsis-2.23-src.orig/SCons/Config/gnu 2007-01-27 14:20:12.000000000 +0200 ++++ nsis-2.23-src/SCons/Config/gnu 2007-01-27 14:21:56.000000000 +0200 +@@ -56,6 +56,8 @@ +
+ if defenv['DEBUG']:
+ defenv.Append(CCFLAGS = '-g')
++defenv.Append(CCFLAGS = '-m32') # 32-bit host ++defenv.Append(LINKFLAGS = '-m32') # 32-bit host +
+ ### stub environment
+
diff --git a/dev-util/nsis/nsis-2.23.ebuild b/dev-util/nsis/nsis-2.23.ebuild index 83e77d8827f3..3944a8f49fa5 100644 --- a/dev-util/nsis/nsis-2.23.ebuild +++ b/dev-util/nsis/nsis-2.23.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-util/nsis/nsis-2.23.ebuild,v 1.1 2007/01/15 12:39:37 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/nsis/nsis-2.23.ebuild,v 1.2 2007/01/27 12:50:36 mrness Exp $ inherit eutils @@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.bz2" LICENSE="as-is" SLOT="0" -KEYWORDS="~x86" +KEYWORDS="~amd64 ~x86" IUSE="" DEPEND=">=dev-util/scons-0.96.93" @@ -31,6 +31,8 @@ src_unpack() { cd "${S}" epatch "${FILESDIR}"/${P}-config.patch + #makensis code is not portable on 64-bit arches so we compile 32-bit executables + use amd64 && epatch "${FILESDIR}"/${P}-32bit.patch } src_compile() { |