diff options
| author |   Petteri Räty <betelgeuse@gentoo.org> | 2010-05-02 11:58:44 +0000 |
|---|---|---|
| committer | Petteri Räty <betelgeuse@gentoo.org> | 2010-05-02 11:58:44 +0000 |
| commit | 219a4def2954e3bb6207d46dc5be5fa6755c1a46 (patch) | |
| tree | 8bb5404f785131e749a42ab4950f2ef2e8ce5629 /dev-java | |
| parent | keyword ~x86-fbsd (diff) | |
| download | gentoo-2-219a4def2954e3bb6207d46dc5be5fa6755c1a46.tar.gz gentoo-2-219a4def2954e3bb6207d46dc5be5fa6755c1a46.tar.bz2 gentoo-2-219a4def2954e3bb6207d46dc5be5fa6755c1a46.zip | |
Don't let the build system specify march and mtune so gcc 3.4 can be used. Fixes bug #304979.
(Portage version: 2.2_rc67/cvs/Linux i686)
Diffstat (limited to 'dev-java')
| -rw-r--r-- | dev-java/jffi/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-java/jffi/files/1.0.0-gcc-3.4.patch | 14 | ||||
| -rw-r--r-- | dev-java/jffi/jffi-1.0.0.ebuild | 3 |
3 files changed, 22 insertions, 2 deletions
diff --git a/dev-java/jffi/ChangeLog b/dev-java/jffi/ChangeLog index 673a32d4edc6..7cf2b83e5f3a 100644 --- a/dev-java/jffi/ChangeLog +++ b/dev-java/jffi/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-java/jffi # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jffi/ChangeLog,v 1.12 2010/04/11 09:25:50 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jffi/ChangeLog,v 1.13 2010/05/02 11:58:44 betelgeuse Exp $ + + 02 May 2010; Petteri Räty <betelgeuse@gentoo.org> jffi-1.0.0.ebuild, + +files/1.0.0-gcc-3.4.patch: + Don't let the build system specify march and mtune so gcc 3.4 can be used. + Fixes bug #304979. 11 Apr 2010; Petteri Räty <betelgeuse@gentoo.org> -jffi-0.3-r3.ebuild: Remove old unused slot. diff --git a/dev-java/jffi/files/1.0.0-gcc-3.4.patch b/dev-java/jffi/files/1.0.0-gcc-3.4.patch new file mode 100644 index 000000000000..fc2bd5cae10a --- /dev/null +++ b/dev-java/jffi/files/1.0.0-gcc-3.4.patch @@ -0,0 +1,14 @@ +diff --git a/jni/GNUmakefile b/jni/GNUmakefile +index 7a027af..eaba319 100755 +--- a/jni/GNUmakefile ++++ b/jni/GNUmakefile +@@ -188,9 +188,6 @@ endif + + ifeq ($(CPU), i386) + MODEL = 32 +- ifeq ($(findstring $(OS), openbsd darwin mingw32 win32),) +- CFLAGS += -march=i586 -mtune=generic +- endif + endif + + ifeq ($(CPU), amd64) diff --git a/dev-java/jffi/jffi-1.0.0.ebuild b/dev-java/jffi/jffi-1.0.0.ebuild index 69c001195804..af8f9cbf49f4 100644 --- a/dev-java/jffi/jffi-1.0.0.ebuild +++ b/dev-java/jffi/jffi-1.0.0.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/jffi/jffi-1.0.0.ebuild,v 1.2 2010/03/13 22:33:09 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jffi/jffi-1.0.0.ebuild,v 1.3 2010/05/02 11:58:44 betelgeuse Exp $ # Probably best to leave the CFLAGS as they are here. See... # http://weblogs.java.net/blog/kellyohair/archive/2006/01/compilation_of_1.html @@ -38,6 +38,7 @@ java_prepare() { rm -rf jni/libffi || die epatch "${FILESDIR}/${P}-makefile.patch" + epatch "${FILESDIR}/1.0.0-gcc-3.4.patch" # any better function for this, excluding get_system_arch in java-vm-2 which is incorrect to inherit ? local arch="" |