summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJory A. Pratt <anarchy@gentoo.org>2011-05-09 22:42:07 (GMT)
committerJory A. Pratt <anarchy@gentoo.org>2011-05-09 22:42:07 (GMT)
commit216b50b3890544506ba2fb97decc960a1d49418e (patch)
treead4b47858cb3e155d81653eccfecaf633def1eeb
parentMerge branch 'master' of git+ssh://git.overlays.gentoo.org/proj/mozilla (diff)
downloadmozilla-216b50b3890544506ba2fb97decc960a1d49418e.zip
mozilla-216b50b3890544506ba2fb97decc960a1d49418e.tar.gz
mozilla-216b50b3890544506ba2fb97decc960a1d49418e.tar.bz2
rework yasm dep, addres avx breakage by filtering
-rw-r--r--net-libs/xulrunner/Manifest2
-rw-r--r--net-libs/xulrunner/xulrunner-2.0.1.ebuild11
2 files changed, 10 insertions, 3 deletions
diff --git a/net-libs/xulrunner/Manifest b/net-libs/xulrunner/Manifest
index 69cf142..76cd591 100644
--- a/net-libs/xulrunner/Manifest
+++ b/net-libs/xulrunner/Manifest
@@ -1,4 +1,4 @@
AUX xulrunner-default-prefs.js 709 RMD160 a4d062f75c17552545267ec3fe2f6b54073dafbd SHA1 580128e9edf8021fdbbca2c91abf63cb83bab2c7 SHA256 e6850b0a22f7d3889b49ec4a79a3c4d3d077edd98c8f0ffdc26e30bc70bb4b09
DIST firefox-4.0.1.source.tar.bz2 65980273 RMD160 63faaae78b56db407a34454986361212382c838e SHA1 c89bc5106266aa0097a7be15be84555bd2649f03 SHA256 cf3a39877facc229a67760915341fe95095cca647faab3a7adcb70046105199c
DIST xulrunner-2.0-patches-1.7.tar.bz2 64696 RMD160 8fc16a28f0de53c7109d5fc937e7eea66d1aae83 SHA1 3492ef5d0ec01a91d1e82a1a4ce1695f3db9d7a9 SHA256 16283e5a4c4a6d4aee1324d8354a01aee524df63662068b6fe2c1f66db8866df
-EBUILD xulrunner-2.0.1.ebuild 5545 RMD160 a26e7841c1d466c7b039331fc788000c54077f26 SHA1 4b0b2baef1efaa7ad135b6de43e74385c62586e6 SHA256 37bc8e5295981634a9dc872ddf82bfde6f5122f4bb87f06901cce276bab9eecb
+EBUILD xulrunner-2.0.1.ebuild 5726 RMD160 06bdb8f6029a81570adbbd6e5339be2563336c98 SHA1 f1f4cdbdb9422843faf8d35d0cc9379052156d56 SHA256 5a88c47c78008fd38fddacb7291b19ff0ab5314e147ba3e840dffa5fc4f0ded0
diff --git a/net-libs/xulrunner/xulrunner-2.0.1.ebuild b/net-libs/xulrunner/xulrunner-2.0.1.ebuild
index 7eb392e..3e5fe5c 100644
--- a/net-libs/xulrunner/xulrunner-2.0.1.ebuild
+++ b/net-libs/xulrunner/xulrunner-2.0.1.ebuild
@@ -28,6 +28,8 @@ REL_URI="http://releases.mozilla.org/pub/mozilla.org/firefox/releases"
# More URIs appended below...
SRC_URI="http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.bz2"
+ASM_DEPEND=">=dev-lang/yasm-1.1.0"
+
RDEPEND="
>=sys-devel/binutils-2.16.1
>=dev-libs/nss-3.12.9
@@ -38,12 +40,14 @@ RDEPEND="
media-libs/libpng[apng]
system-sqlite? ( >=dev-db/sqlite-3.7.4[fts3,secure-delete,unlock-notify,debug=] )
webm? ( media-libs/libvpx
- media-libs/alsa-lib )
+ media-libs/alsa-lib
+ media-libs/mesa )
!www-plugins/weave"
DEPEND="${RDEPEND}
dev-util/pkgconfig
- dev-lang/yasm"
+ amd64? ( ${ASM_DEPEND} )
+ x86? ( ${ASM_DEPEND} ) "
if [[ ${PV} =~ alpha|beta ]]; then
# hg snapshot tarball
@@ -136,6 +140,9 @@ src_configure() {
append-flags -fno-stack-protector
fi
+ # Ensure we do not fail on i{3,5,7} processors that support -mavx
+ append-flags -mno-avx
+
####################################
#
# Configure and build