* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog mozconfig-3.eclass mozcoreconf-2.eclass
@ 2012-12-09 15:37 Ian Stakenvicius (axs)
0 siblings, 0 replies; 2+ messages in thread
From: Ian Stakenvicius (axs) @ 2012-12-09 15:37 UTC (permalink / raw
To: gentoo-commits
axs 12/12/09 15:37:12
Modified: ChangeLog mozconfig-3.eclass mozcoreconf-2.eclass
Log:
updated mozilla eclasses to match mozilla-overlay
Revision Changes Path
1.555 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.555&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.555&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.554&r2=1.555
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.554
retrieving revision 1.555
diff -u -r1.554 -r1.555
--- ChangeLog 8 Dec 2012 15:58:47 -0000 1.554
+++ ChangeLog 9 Dec 2012 15:37:12 -0000 1.555
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.554 2012/12/08 15:58:47 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.555 2012/12/09 15:37:12 axs Exp $
+
+ 09 Dec 2012; Ian Stakenvicius <axs@gentoo.org> mozcoreconf-2.eclass,
+ mozconfig-3.eclass:
+ updated mozilla eclasses to match mozilla-overlay
08 Dec 2012; Michael Palimaka <kensington@gentoo.org> cmake-utils.eclass:
Respect ASMFLAGS, wrt bug #432480. Permit ebuilds to define 'myctestargs'.
1.33 eclass/mozconfig-3.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mozconfig-3.eclass?rev=1.33&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mozconfig-3.eclass?rev=1.33&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mozconfig-3.eclass?r1=1.32&r2=1.33
Index: mozconfig-3.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mozconfig-3.eclass,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- mozconfig-3.eclass 12 Sep 2012 22:52:18 -0000 1.32
+++ mozconfig-3.eclass 9 Dec 2012 15:37:12 -0000 1.33
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mozconfig-3.eclass,v 1.32 2012/09/12 22:52:18 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mozconfig-3.eclass,v 1.33 2012/12/09 15:37:12 axs Exp $
#
# mozconfig.eclass: the new mozilla.eclass
@@ -41,28 +41,39 @@
fi
fi
- mozconfig_use_enable alsa ogg
- mozconfig_use_enable alsa wave
+ if ! $(mozversion_is_new_enough) ; then
+ mozconfig_use_enable alsa ogg
+ mozconfig_use_enable alsa wave
+ mozconfig_use_enable libnotify
+ mozconfig_use_enable debug debugger-info-modules
+ if has +ipc ${IUSE}; then
+ mozconfig_use_enable ipc
+ fi
+ if [[ ${PN} != thunderbird ]] ; then
+ mozconfig_annotate 'places' --enable-storage --enable-places --enable-places_bookmarks
+ mozconfig_annotate '' --enable-oji --enable-mathml
+ mozconfig_annotate 'broken' --disable-mochitest
+ fi
+ if use system-sqlite; then
+ mozconfig_annotate '' --with-sqlite-prefix="${EPREFIX}"/usr
+ fi
+ if use amd64 || use x86 || use arm || use sparc; then
+ mozconfig_annotate '' --enable-tracejit
+ fi
+ fi
+
mozconfig_use_enable dbus
mozconfig_use_enable debug
mozconfig_use_enable debug tests
- mozconfig_use_enable debug debugger-info-modules
- if has +ipc ${IUSE}; then
- mozconfig_use_enable ipc
- fi
- mozconfig_use_enable libnotify
mozconfig_use_enable startup-notification
mozconfig_use_enable system-sqlite
- if use system-sqlite; then
- mozconfig_annotate '' --with-sqlite-prefix="${EPREFIX}"/usr
- fi
mozconfig_use_enable wifi necko-wifi
- if [[ ${PN} == xulrunner ]] ; then
- mozconfig_annotate 'mozjs' --enable-shared-js
- fi
-
- if has +webm ${IUSE} && use webm; then
+ if $(mozversion_is_new_enough) ; then
+ mozconfig_annotate 'required' --enable-ogg
+ mozconfig_annotate 'required' --enable-wave
+ mozconfig_annotate 'required' --with-system-libvpx
+ elif has +webm ${IUSE} && use webm; then
if ! use alsa; then
echo "Enabling alsa support due to webm request"
mozconfig_annotate '+webm -alsa' --enable-ogg
@@ -78,8 +89,11 @@
mozconfig_annotate '' --disable-system-libvpx
fi
- if use amd64 || use x86 || use arm || use sparc; then
- mozconfig_annotate '' --enable-tracejit
+ # Disable webrtc for arches that it doesn't support, bug 444780
+ if $(mozversion_is_new_enough) ; then
+ if ! use x86 && ! use amd64 ; then
+ mozconfig_annotate '' --disable-webrtc
+ fi
fi
# These are enabled by default in all mozilla applications
@@ -92,9 +106,4 @@
mozconfig_annotate '' --disable-gnomeui
mozconfig_annotate '' --enable-gio
mozconfig_annotate '' --disable-crashreporter
- if [[ ${PN} != thunderbird ]] ; then
- mozconfig_annotate 'places' --enable-storage --enable-places --enable-places_bookmarks
- mozconfig_annotate '' --enable-oji --enable-mathml
- mozconfig_annotate 'broken' --disable-mochitest
- fi
}
1.24 eclass/mozcoreconf-2.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mozcoreconf-2.eclass?rev=1.24&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mozcoreconf-2.eclass?rev=1.24&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mozcoreconf-2.eclass?r1=1.23&r2=1.24
Index: mozcoreconf-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mozcoreconf-2.eclass,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- mozcoreconf-2.eclass 2 May 2012 18:31:42 -0000 1.23
+++ mozcoreconf-2.eclass 9 Dec 2012 15:37:12 -0000 1.24
@@ -1,11 +1,11 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mozcoreconf-2.eclass,v 1.23 2012/05/02 18:31:42 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mozcoreconf-2.eclass,v 1.24 2012/12/09 15:37:12 axs Exp $
#
# mozcoreconf.eclass : core options for mozilla
# inherit mozconfig-2 if you need USE flags
-inherit multilib flag-o-matic python
+inherit multilib flag-o-matic python versionator
IUSE="${IUSE} custom-cflags custom-optimization"
@@ -61,6 +61,23 @@
mozconfig_annotate "${minus:-+}$1" --enable-extensions=${minus}${2}
}
+mozversion_is_new_enough() {
+ case ${PN} in
+ firefox|thunderbird)
+ if [[ $(get_version_component_range 1) -ge 17 ]] ; then
+ return 0
+ fi
+ ;;
+ seamonkey)
+ if [[ $(get_version_component_range 1) -eq 2 ]] && [[ $(get_version_component_range 2) -ge 14 ]] ; then
+ return 0
+ fi
+ ;;
+ esac
+
+ return 1
+}
+
moz_pkgsetup() {
# Ensure we use C locale when building
export LANG="C"
@@ -76,6 +93,12 @@
export ALDFLAGS=${LDFLAGS}
python_set_active_version 2
+
+ if [[ $(gcc-major-version) -eq 3 ]]; then
+ ewarn "Unsupported compiler detected, DO NOT file bugs for"
+ ewarn "outdated compilers. Bugs opened with gcc-3 will be closed"
+ ewarn "invalid."
+ fi
}
mozconfig_init() {
@@ -135,6 +158,8 @@
mozconfig_annotate "from CFLAGS" --enable-optimize=-O0
elif [[ ${ARCH} == ppc ]] && has_version '>=sys-libs/glibc-2.8'; then
mozconfig_annotate "more than -O1 segfaults on ppc with glibc-2.8" --enable-optimize=-O1
+ elif is-flag -O3; then
+ mozconfig_annotate "from CFLAGS" --enable-optimize=-O3
elif is-flag -O1; then
mozconfig_annotate "from CFLAGS" --enable-optimize=-O1
elif is-flag -Os; then
@@ -170,36 +195,8 @@
ppc64)
append-flags -fPIC -mminimal-toc
;;
-
- ppc)
- # Fix to avoid gcc-3.3.x micompilation issues.
- if [[ $(gcc-major-version).$(gcc-minor-version) == 3.3 ]]; then
- append-flags -fno-strict-aliasing
- fi
- ;;
-
- x86)
- if [[ $(gcc-major-version) -eq 3 ]]; then
- # gcc-3 prior to 3.2.3 doesn't work well for pentium4
- # see bug 25332
- if [[ $(gcc-minor-version) -lt 2 ||
- ( $(gcc-minor-version) -eq 2 && $(gcc-micro-version) -lt 3 ) ]]
- then
- replace-flags -march=pentium4 -march=pentium3
- filter-flags -msse2
- fi
- fi
- ;;
esac
- if [[ $(gcc-major-version) -eq 3 ]]; then
- # Enable us to use flash, etc plugins compiled with gcc-2.95.3
- mozconfig_annotate "building with >=gcc-3" --enable-old-abi-compat-wrappers
-
- # Needed to build without warnings on gcc-3
- CXXFLAGS="${CXXFLAGS} -Wno-deprecated"
- fi
-
# Go a little faster; use less RAM
append-flags "$MAKEEDIT_FLAGS"
@@ -213,26 +210,29 @@
--with-system-jpeg \
--with-system-zlib \
--enable-pango \
- --enable-svg \
--enable-system-cairo
- # Requires libpng with apng support
- #--with-system-png \
+ if ! $(mozversion_is_new_enough) ; then
+ mozconfig annotate system-libs --enable-svg
+ fi
mozconfig_annotate disable_update_strip \
--disable-installer \
--disable-pedantic \
--disable-updater \
--disable-strip \
- --disable-strip-libs \
--disable-install-strip
-
-
+ if ! $(mozversion_is_new_enough) ; then
+ mozconfig_annotate disable_update_strip --disable-strip-libs
+ fi
if [[ ${PN} != seamonkey ]]; then
mozconfig_annotate basic_profile \
- --enable-single-profile \
- --disable-profilesharing \
--disable-profilelocking
+ if ! $(mozversion_is_new_enough) ; then
+ mozconfig_annotate basic_profile \
+ --enable-single-profile \
+ --disable-profilesharing
+ fi
fi
# Here is a strange one...
@@ -279,3 +279,4 @@
sed -i '/^ac_add_options --enable-extensions/d' .mozconfig
echo "ac_add_options --enable-extensions=${exts// /,}" >> .mozconfig
}
+
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog mozconfig-3.eclass mozcoreconf-2.eclass
@ 2013-03-24 19:08 Jory Pratt (anarchy)
0 siblings, 0 replies; 2+ messages in thread
From: Jory Pratt (anarchy) @ 2013-03-24 19:08 UTC (permalink / raw
To: gentoo-commits
anarchy 13/03/24 19:08:58
Modified: ChangeLog mozconfig-3.eclass mozcoreconf-2.eclass
Log:
Cleanup of obsolete options, address bug #446662,460592
Revision Changes Path
1.753 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.753&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.753&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.752&r2=1.753
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.752
retrieving revision 1.753
diff -u -r1.752 -r1.753
--- ChangeLog 23 Mar 2013 21:18:25 -0000 1.752
+++ ChangeLog 24 Mar 2013 19:08:58 -0000 1.753
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.752 2013/03/23 21:18:25 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.753 2013/03/24 19:08:58 anarchy Exp $
+
+ 24 Mar 2013; Jory A. Pratt <anarchy@gentoo.org> mozconfig-3.eclass mozcoreconf-2.eclass:
+ Cleanup of obsolete options, address bug #446662,460592
23 Mar 2013; Julian Ospald <hasufell@gentoo.org> unpacker.eclass:
add unpack_zip function to unpacker.eclass wrt #462612
1.35 eclass/mozconfig-3.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mozconfig-3.eclass?rev=1.35&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mozconfig-3.eclass?rev=1.35&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mozconfig-3.eclass?r1=1.34&r2=1.35
Index: mozconfig-3.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mozconfig-3.eclass,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- mozconfig-3.eclass 16 Jan 2013 23:57:37 -0000 1.34
+++ mozconfig-3.eclass 24 Mar 2013 19:08:58 -0000 1.35
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mozconfig-3.eclass,v 1.34 2013/01/16 23:57:37 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mozconfig-3.eclass,v 1.35 2013/03/24 19:08:58 anarchy Exp $
#
# mozconfig.eclass: the new mozilla.eclass
@@ -17,7 +17,6 @@
app-arch/unzip
>=app-text/hunspell-1.2
dev-libs/expat
- >=dev-libs/libIDL-0.8.0
>=dev-libs/libevent-1.4.7
>=x11-libs/cairo-1.8[X]
>=x11-libs/gtk+-2.8.6:2
1.28 eclass/mozcoreconf-2.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mozcoreconf-2.eclass?rev=1.28&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mozcoreconf-2.eclass?rev=1.28&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mozcoreconf-2.eclass?r1=1.27&r2=1.28
Index: mozcoreconf-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mozcoreconf-2.eclass,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- mozcoreconf-2.eclass 16 Jan 2013 19:02:10 -0000 1.27
+++ mozcoreconf-2.eclass 24 Mar 2013 19:08:58 -0000 1.28
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mozcoreconf-2.eclass,v 1.27 2013/01/16 19:02:10 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mozcoreconf-2.eclass,v 1.28 2013/03/24 19:08:58 anarchy Exp $
#
# mozcoreconf.eclass : core options for mozilla
# inherit mozconfig-2 if you need USE flags
@@ -14,7 +14,6 @@
RDEPEND="x11-libs/libXrender
x11-libs/libXt
- x11-libs/libXmu
>=sys-libs/zlib-1.1.4"
DEPEND="${RDEPEND}
@@ -95,6 +94,10 @@
export USE_PTHREADS=1
export ALDFLAGS=${LDFLAGS}
+ # nested configure scripts in mozilla products generate unrecognized options
+ # false positives when toplevel configure passes downwards.
+ export QA_CONFIGURE_OPTIONS=".*"
+
if [[ $(gcc-major-version) -eq 3 ]]; then
ewarn "Unsupported compiler detected, DO NOT file bugs for"
ewarn "outdated compilers. Bugs opened with gcc-3 will be closed"
@@ -108,11 +111,8 @@
declare enable_optimize pango_version myext x
declare XUL=$([[ ${PN} == xulrunner ]] && echo true || echo false)
declare FF=$([[ ${PN} == firefox ]] && echo true || echo false)
- declare IC=$([[ ${PN} == icecat ]] && echo true || echo false)
declare SM=$([[ ${PN} == seamonkey ]] && echo true || echo false)
declare TB=$([[ ${PN} == thunderbird ]] && echo true || echo false)
- declare EM=$([[ ${PN} == enigmail ]] && echo true || echo false)
-
####################################
#
@@ -128,9 +128,6 @@
*firefox)
cp browser/config/mozconfig .mozconfig \
|| die "cp browser/config/mozconfig failed" ;;
- *icecat)
- cp browser/config/mozconfig .mozconfig \
- || die "cp browser/config/mozconfig failed" ;;
seamonkey)
# Must create the initial mozconfig to enable application
: >.mozconfig || die "initial mozconfig creation failed"
@@ -139,9 +136,6 @@
# Must create the initial mozconfig to enable application
: >.mozconfig || die "initial mozconfig creation failed"
mozconfig_annotate "" --enable-application=mail ;;
- enigmail)
- cp mail/config/mozconfig .mozconfig \
- || die "cp mail/config/mozconfig failed" ;;
esac
####################################
@@ -254,14 +248,6 @@
! has_version ">=sys-libs/glibc-2.4" && mozconfig_annotate "we have old glibc" --disable-jemalloc
}
-makemake2() {
- for m in $(find ../ -name Makefile.in); do
- topdir=$(echo "$m" | sed -r 's:[^/]+:..:g')
- sed -e "s:@srcdir@:.:g" -e "s:@top_srcdir@:${topdir}:g" \
- < ${m} > ${m%.in} || die "sed ${m} failed"
- done
-}
-
# mozconfig_final: display a table describing all configuration options paired
# with reasons, then clean up extensions list
mozconfig_final() {
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-03-24 19:09 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-03-24 19:08 [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog mozconfig-3.eclass mozcoreconf-2.eclass Jory Pratt (anarchy)
-- strict thread matches above, loose matches on Subject: below --
2012-12-09 15:37 Ian Stakenvicius (axs)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox