diff options
| author |   Jory Pratt <anarchy@gentoo.org> | 2012-11-25 13:09:41 +0000 |
|---|---|---|
| committer | Jory Pratt <anarchy@gentoo.org> | 2012-11-25 13:09:41 +0000 |
| commit | a026b6c9ebd10cdbead5774082824f79b33694d2 (patch) | |
| tree | 5c47dcdefcb47f0c7262eb336d796f4ce276e8fc /dev-lang | |
| parent | Stable for amd64, wrt bug #444462 (diff) | |
| download | gentoo-2-a026b6c9ebd10cdbead5774082824f79b33694d2.tar.gz gentoo-2-a026b6c9ebd10cdbead5774082824f79b33694d2.tar.bz2 gentoo-2-a026b6c9ebd10cdbead5774082824f79b33694d2.zip | |
Fix bug 441928
(Portage version: 2.1.11.31/cvs/Linux x86_64, signed Manifest commit with key 0x9019241D)
Diffstat (limited to 'dev-lang')
4 files changed, 33 insertions, 4 deletions
diff --git a/dev-lang/spidermonkey/ChangeLog b/dev-lang/spidermonkey/ChangeLog index d31881ace856..65872d16f29e 100644 --- a/dev-lang/spidermonkey/ChangeLog +++ b/dev-lang/spidermonkey/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-lang/spidermonkey # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/ChangeLog,v 1.92 2012/11/17 10:44:38 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/ChangeLog,v 1.93 2012/11/25 13:09:41 anarchy Exp $ + + 25 Nov 2012; <anarchy@gentoo.org> spidermonkey-1.8.5-r1.ebuild, + spidermonkey-1.8.5-r2.ebuild, + +files/spidermonkey-1.8.5-perf_event-check.patch: + Fix bug 441928 17 Nov 2012; Samuli Suominen <ssuominen@gentoo.org> spidermonkey-1.8.5-r2.ebuild: diff --git a/dev-lang/spidermonkey/files/spidermonkey-1.8.5-perf_event-check.patch b/dev-lang/spidermonkey/files/spidermonkey-1.8.5-perf_event-check.patch new file mode 100644 index 000000000000..66475b6c34c4 --- /dev/null +++ b/dev-lang/spidermonkey/files/spidermonkey-1.8.5-perf_event-check.patch @@ -0,0 +1,21 @@ +--- a/js/src/configure.in 2012-11-01 19:42:20.130330321 +0100 ++++ b/js/src/configure.in 2012-11-01 20:34:03.561351492 +0100 +@@ -3477,7 +3477,16 @@ + esac + + dnl Performance measurement headers. +-AC_CHECK_HEADER(linux/perf_event.h, HAVE_LINUX_PERF_EVENT_H=1) ++AC_CHECK_HEADER(linux/perf_event.h, ++ [AC_CACHE_CHECK(for perf_event_open system call,ac_cv_perf_event_open, ++ [AC_TRY_COMPILE([#include <sys/syscall.h>],[return sizeof(__NR_perf_event_open);], ++ ac_cv_perf_event_open=yes, ++ ac_cv_perf_event_open=no)])]) ++if test "$ac_cv_perf_event_open" = "yes"; then ++ HAVE_LINUX_PERF_EVENT_H=1 ++else ++ HAVE_LINUX_PERF_EVENT_H= ++fi + AC_SUBST(HAVE_LINUX_PERF_EVENT_H) + + dnl Checks for libraries. + diff --git a/dev-lang/spidermonkey/spidermonkey-1.8.5-r1.ebuild b/dev-lang/spidermonkey/spidermonkey-1.8.5-r1.ebuild index 9e06b67a8dd4..c9d31ec10d5b 100644 --- a/dev-lang/spidermonkey/spidermonkey-1.8.5-r1.ebuild +++ b/dev-lang/spidermonkey/spidermonkey-1.8.5-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-1.8.5-r1.ebuild,v 1.19 2012/11/09 21:10:58 axs Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-1.8.5-r1.ebuild,v 1.20 2012/11/25 13:09:41 anarchy Exp $ EAPI="3" WANT_AUTOCONF="2.1" @@ -44,7 +44,8 @@ src_prepare() { epatch "${FILESDIR}/${P}-arm_respect_cflags-3.patch" # https://bugs.gentoo.org/show_bug.cgi?id=438746 epatch "${FILESDIR}"/${PN}-1.8.7-freebsd-pthreads.patch - + # https://bugs.gentoo.org/show_bug.cgi?id=441928 + epatch "${FILESDIR}"/${PN}-1.8.5-perf_event-check.patch epatch_user diff --git a/dev-lang/spidermonkey/spidermonkey-1.8.5-r2.ebuild b/dev-lang/spidermonkey/spidermonkey-1.8.5-r2.ebuild index 2cf0d83f0d39..553ceb98bef9 100644 --- a/dev-lang/spidermonkey/spidermonkey-1.8.5-r2.ebuild +++ b/dev-lang/spidermonkey/spidermonkey-1.8.5-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-1.8.5-r2.ebuild,v 1.4 2012/11/17 10:44:38 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-1.8.5-r2.ebuild,v 1.5 2012/11/25 13:09:41 anarchy Exp $ EAPI="5" WANT_AUTOCONF="2.1" @@ -44,6 +44,8 @@ src_prepare() { epatch "${FILESDIR}/${P}-arm_respect_cflags-3.patch" # https://bugs.gentoo.org/show_bug.cgi?id=438746 epatch "${FILESDIR}"/${PN}-1.8.7-freebsd-pthreads.patch + # https://bugs.gentoo.org/show_bug.cgi?id=441928 + epatch "${FILESDIR}"/${PN}-1.8.5-perf_event-check.patch epatch_user |