diff options
| author |   Michael Hanselmann <hansmi@gentoo.org> | 2005-02-19 12:20:19 +0000 |
|---|---|---|
| committer | Michael Hanselmann <hansmi@gentoo.org> | 2005-02-19 12:20:19 +0000 |
| commit | 87f84f44f3bded86df70eba18ac4a0b365dea3bd (patch) | |
| tree | 0cffdf38e09abdb68c57ead7ecff22550c183bbd /dev-lang/spidermonkey | |
| parent | fix to compile with all motif versions, mark stable (diff) | |
| download | gentoo-2-87f84f44f3bded86df70eba18ac4a0b365dea3bd.tar.gz gentoo-2-87f84f44f3bded86df70eba18ac4a0b365dea3bd.tar.bz2 gentoo-2-87f84f44f3bded86df70eba18ac4a0b365dea3bd.zip | |
Fixed bug 81473
(Portage version: 2.0.51-r15)
Diffstat (limited to 'dev-lang/spidermonkey')
5 files changed, 61 insertions, 9 deletions
diff --git a/dev-lang/spidermonkey/ChangeLog b/dev-lang/spidermonkey/ChangeLog index 6654f8720064..7d0aa879c0f1 100644 --- a/dev-lang/spidermonkey/ChangeLog +++ b/dev-lang/spidermonkey/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-lang/spidermonkey -# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/ChangeLog,v 1.4 2004/09/03 21:31:01 usata Exp $ +# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/ChangeLog,v 1.5 2005/02/19 12:20:18 hansmi Exp $ + + 19 Feb 2005; Michael Hanselmann <hansmi@gentoo.org> + +files/spidermonkey-1.5_rc6-va_copy-fix.patch, + spidermonkey-1.5_rc6-r1.ebuild: + Added patch from bug 81473. It fixes va_copy vs. VA_COPY. *spidermonkey-1.5_rc6-r1 (04 Sep 2004) diff --git a/dev-lang/spidermonkey/files/spidermonkey-1.5_rc6-va_copy-fix.patch b/dev-lang/spidermonkey/files/spidermonkey-1.5_rc6-va_copy-fix.patch new file mode 100644 index 000000000000..5dda900f60bf --- /dev/null +++ b/dev-lang/spidermonkey/files/spidermonkey-1.5_rc6-va_copy-fix.patch @@ -0,0 +1,38 @@ +--- config/Linux_All.mk.orig 2005-02-09 22:10:41.756776680 +0000 ++++ config/Linux_All.mk 2005-02-09 22:17:12.809327656 +0000 +@@ -86,7 +86,7 @@ + JS_EDITLINE = 1 + + ifeq ($(CPU_ARCH),x86_64) +-# Use VA_COPY() standard macro on x86-64 ++# Use va_copy() standard macro on x86-64 + # FIXME: better use it everywhere + OS_CFLAGS += -DHAVE_VA_COPY + endif +@@ -96,3 +96,15 @@ + # FIXME: better patch rules.mk & fdlibm/Makefile* + OS_CFLAGS += -DPIC -fPIC + endif ++ ++ifeq ($(CPU_ARCH),ppc) ++# Use va_copy() standard macro on ppc ++# FIXME: better use it everywhere ++OS_CFLAGS += -DHAVE_VA_COPY ++endif ++ ++ifeq ($(CPU_ARCH),ppc) ++# We need PIC code for shared libraries ++# FIXME: better patch rules.mk & fdlibm/Makefile* ++OS_CFLAGS += -DPIC -fPIC ++endif +--- jsprf.c.orig 2005-02-09 22:22:38.017888440 +0000 ++++ jsprf.c 2005-02-09 22:16:53.509261712 +0000 +@@ -55,7 +55,7 @@ + ** and requires array notation. + */ + #ifdef HAVE_VA_COPY +-#define VARARGS_ASSIGN(foo, bar) VA_COPY(foo,bar) ++#define VARARGS_ASSIGN(foo, bar) va_copy(foo,bar) + #elif defined(HAVE_VA_LIST_AS_ARRAY) + #define VARARGS_ASSIGN(foo, bar) foo[0] = bar[0] + #else diff --git a/dev-lang/spidermonkey/spidermonkey-1.5_rc5.ebuild b/dev-lang/spidermonkey/spidermonkey-1.5_rc5.ebuild index f0a7050c2d76..51937e6c34cf 100644 --- a/dev-lang/spidermonkey/spidermonkey-1.5_rc5.ebuild +++ b/dev-lang/spidermonkey/spidermonkey-1.5_rc5.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-1.5_rc5.ebuild,v 1.8 2004/07/14 13:51:29 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-1.5_rc5.ebuild,v 1.9 2005/02/19 12:20:18 hansmi Exp $ MY_PV="${PV/_/-}" DESCRIPTION="Stand-alone JavaScript C library" diff --git a/dev-lang/spidermonkey/spidermonkey-1.5_rc6-r1.ebuild b/dev-lang/spidermonkey/spidermonkey-1.5_rc6-r1.ebuild index 855cb0cbc451..856d87375c7f 100644 --- a/dev-lang/spidermonkey/spidermonkey-1.5_rc6-r1.ebuild +++ b/dev-lang/spidermonkey/spidermonkey-1.5_rc6-r1.ebuild @@ -1,6 +1,8 @@ -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-1.5_rc6-r1.ebuild,v 1.1 2004/09/03 21:31:01 usata Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-1.5_rc6-r1.ebuild,v 1.2 2005/02/19 12:20:18 hansmi Exp $ + +inherit eutils MY_PV="${PV/_/-}a" DESCRIPTION="Stand-alone JavaScript C library" @@ -9,13 +11,20 @@ SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/js/js-${MY_PV}.tar.gz" LICENSE="NPL-1.1" SLOT="0" -KEYWORDS="~x86" +KEYWORDS="~x86 ~ppc ~amd64" IUSE="" DEPEND="" S=${WORKDIR}/js/src/ +src_unpack() { + unpack ${A} + cd ${S} + + epatch ${FILESDIR}/${PN}-${PV}-va_copy-fix.patch || die 'Patching failed.' +} + src_compile() { cat >>Makefile.ref<<'EOF' diff --git a/dev-lang/spidermonkey/spidermonkey-1.5_rc6.ebuild b/dev-lang/spidermonkey/spidermonkey-1.5_rc6.ebuild index 64f1506a4c7b..a277afd5b94c 100644 --- a/dev-lang/spidermonkey/spidermonkey-1.5_rc6.ebuild +++ b/dev-lang/spidermonkey/spidermonkey-1.5_rc6.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-1.5_rc6.ebuild,v 1.1 2004/09/03 20:51:21 usata Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-1.5_rc6.ebuild,v 1.2 2005/02/19 12:20:18 hansmi Exp $ MY_PV="${PV/_/-}a" DESCRIPTION="Stand-alone JavaScript C library" |