diff options
| author |   Vlastimil Babka <caster@gentoo.org> | 2010-11-27 00:51:07 +0000 |
|---|---|---|
| committer | Vlastimil Babka <caster@gentoo.org> | 2010-11-27 00:51:07 +0000 |
| commit | f9ce8acc0455360d39fc9d54c401f99b152c1418 (patch) | |
| tree | f2c0b2ad3ba8eaa645cb561457130ddd6ba61ad6 /dev-java/swt | |
| parent | Respect env AR/LD #311589 by Thomas Sachau. (diff) | |
| download | gentoo-2-f9ce8acc0455360d39fc9d54c401f99b152c1418.tar.gz gentoo-2-f9ce8acc0455360d39fc9d54c401f99b152c1418.tar.bz2 gentoo-2-f9ce8acc0455360d39fc9d54c401f99b152c1418.zip | |
Restrict xulrunner dep also for 3.5.2. Hopefully fix ppc64, #344309.
(Portage version: 2.2.0_alpha5/cvs/Linux x86_64)
Diffstat (limited to 'dev-java/swt')
| -rw-r--r-- | dev-java/swt/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-java/swt/swt-3.5.2.ebuild | 6 | ||||
| -rw-r--r-- | dev-java/swt/swt-3.6.1.ebuild | 4 | ||||
| -rw-r--r-- | dev-java/swt/swt-3.6.ebuild | 4 |
4 files changed, 12 insertions, 8 deletions
diff --git a/dev-java/swt/ChangeLog b/dev-java/swt/ChangeLog index bf5c7c85f1d7..63d24229ad3e 100644 --- a/dev-java/swt/ChangeLog +++ b/dev-java/swt/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/swt # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/ChangeLog,v 1.129 2010/11/26 23:47:42 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/ChangeLog,v 1.130 2010/11/27 00:51:07 caster Exp $ + + 27 Nov 2010; Vlastimil Babka <caster@gentoo.org> swt-3.5.2.ebuild, + swt-3.6.ebuild, swt-3.6.1.ebuild: + Restrict xulrunner dep also for 3.5.2. Hopefully fix ppc64, #344309. *swt-3.6.1 (26 Nov 2010) diff --git a/dev-java/swt/swt-3.5.2.ebuild b/dev-java/swt/swt-3.5.2.ebuild index 02582f74b6a6..120ed172a703 100644 --- a/dev-java/swt/swt-3.5.2.ebuild +++ b/dev-java/swt/swt-3.5.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/swt-3.5.2.ebuild,v 1.3 2010/04/13 18:24:31 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/swt-3.5.2.ebuild,v 1.4 2010/11/27 00:51:07 caster Exp $ EAPI=2 @@ -42,7 +42,7 @@ COMMON=">=dev-libs/glib-2.6 =gnome-base/gnome-vfs-2* =gnome-base/libgnomeui-2* ) - xulrunner? ( net-libs/xulrunner:1.9 ) + xulrunner? ( =net-libs/xulrunner-1.9* ) opengl? ( virtual/opengl virtual/glu @@ -114,7 +114,7 @@ src_compile() { fi # Fix the pointer size for AMD64 - [[ ${ARCH} == "amd64" || ${ARCH} == "ppc64" ]] && export SWT_PTR_CFLAGS=-DSWT_PTR_SIZE_64 + [[ ${ARCH} == "amd64" || ${ARCH} == "ppc64" ]] && export SWT_PTR_CFLAGS=-DJNI64 local platform="linux" diff --git a/dev-java/swt/swt-3.6.1.ebuild b/dev-java/swt/swt-3.6.1.ebuild index b9a1c1f1f299..8114aeffc9ad 100644 --- a/dev-java/swt/swt-3.6.1.ebuild +++ b/dev-java/swt/swt-3.6.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/swt-3.6.1.ebuild,v 1.1 2010/11/26 23:47:42 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/swt-3.6.1.ebuild,v 1.2 2010/11/27 00:51:07 caster Exp $ EAPI=2 @@ -114,7 +114,7 @@ src_compile() { fi # Fix the pointer size for AMD64 - [[ ${ARCH} == "amd64" || ${ARCH} == "ppc64" ]] && export SWT_PTR_CFLAGS=-DSWT_PTR_SIZE_64 + [[ ${ARCH} == "amd64" || ${ARCH} == "ppc64" ]] && export SWT_PTR_CFLAGS=-DJNI64 local platform="linux" diff --git a/dev-java/swt/swt-3.6.ebuild b/dev-java/swt/swt-3.6.ebuild index af6059d3a44a..f2ba793bf00b 100644 --- a/dev-java/swt/swt-3.6.ebuild +++ b/dev-java/swt/swt-3.6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/swt-3.6.ebuild,v 1.2 2010/11/26 23:47:42 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/swt-3.6.ebuild,v 1.3 2010/11/27 00:51:07 caster Exp $ EAPI=2 @@ -114,7 +114,7 @@ src_compile() { fi # Fix the pointer size for AMD64 - [[ ${ARCH} == "amd64" || ${ARCH} == "ppc64" ]] && export SWT_PTR_CFLAGS=-DSWT_PTR_SIZE_64 + [[ ${ARCH} == "amd64" || ${ARCH} == "ppc64" ]] && export SWT_PTR_CFLAGS=-DJNI64 local platform="linux" |