Date: Sat, 23 Jun 2012 13:14:24 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r792 - in branches/experimental: Mk mail/thunderbird mail/thunderbird/files www/firefox www/firefox-nightly www/firefox/files www/seamonkey www/seamonkey/files Message-ID: <201206231314.q5NDEOLt050876@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Sat Jun 23 13:14:24 2012
New Revision: 792
Log:
use objdir build
Deleted:
branches/experimental/mail/thunderbird/files/patch-bugzilla-736961
branches/experimental/www/firefox/files/patch-bugzilla-736961
branches/experimental/www/seamonkey/files/patch-bugzilla-736961
branches/experimental/www/seamonkey/files/patch-mozilla-config-gcc-stl-wrapper.template.h
Modified:
branches/experimental/Mk/bsd.gecko.mk
branches/experimental/mail/thunderbird/Makefile
branches/experimental/www/firefox-nightly/Makefile
branches/experimental/www/firefox/Makefile
branches/experimental/www/seamonkey/Makefile
Modified: branches/experimental/Mk/bsd.gecko.mk
==============================================================================
--- branches/experimental/Mk/bsd.gecko.mk Sat Jun 23 13:13:23 2012 (r791)
+++ branches/experimental/Mk/bsd.gecko.mk Sat Jun 23 13:14:24 2012 (r792)
@@ -739,6 +739,15 @@
MOZ_OPTIONS+= --disable-v1-string-abi
.endif
+.if defined(GNU_CONFIGURE) && defined(OBJDIR_BUILD)
+CONFIGURE_SCRIPT=../configure
+
+MOZ_OBJDIR= ${WRKSRC}/obj-${CONFIGURE_TARGET}
+CONFIGURE_WRKSRC=${MOZ_OBJDIR}
+BUILD_WRKSRC= ${MOZ_OBJDIR}
+INSTALL_WRKSRC= ${MOZ_OBJDIR}
+.endif
+
.else # bsd.port.post.mk
post-patch: gecko-post-patch gecko-moz-pis-patch
@@ -826,6 +835,13 @@
@${MOZCONFIG_SED} < ${FILESDIR}/${moz} > ${WRKDIR}/${moz}
.endfor
+pre-configure: gecko-pre-configure
+
+gecko-pre-configure:
+.if defined(GNU_CONFIGURE) && defined(OBJDIR_BUILD)
+ ${MKDIR} ${MOZ_OBJDIR}
+.endif
+
post-configure: gecko-post-configure
gecko-post-configure:
Modified: branches/experimental/mail/thunderbird/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird/Makefile Sat Jun 23 13:13:23 2012 (r791)
+++ branches/experimental/mail/thunderbird/Makefile Sat Jun 23 13:14:24 2012 (r792)
@@ -35,6 +35,7 @@
CONFIGURE_ENV= LOCALBASE=${LOCALBASE}
MAKE_ENV= PTHREAD_LDFLAGS="${PTHREAD_LIBS}"
GNU_CONFIGURE= yes
+OBJDIR_BUILD= yes
USE_BZIP2= yes
USE_GMAKE= yes
USE_GL= gl
Deleted: branches/experimental/mail/thunderbird/files/patch-bugzilla-736961
==============================================================================
--- branches/experimental/mail/thunderbird/files/patch-bugzilla-736961 Sat Jun 23 13:14:24 2012 (r791)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,111 +0,0 @@
---- mozilla/config/rules.mk.orig Wed May 2 05:16:35 2012
-+++ mozilla/config/rules.mk Fri May 11 08:42:50 2012
-@@ -1479,7 +1487,7 @@ $(XPIDL_GEN_DIR)/%.h: %.idl $(XPIDL_DEPS) $(XPIDL_GEN_
- $(PYTHON_PATH) \
- -I$(topsrcdir)/other-licenses/ply \
- -I$(topsrcdir)/xpcom/idl-parser \
-- $(topsrcdir)/xpcom/idl-parser/header.py --cachedir=$(DEPTH)/xpcom/idl-parser $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@
-+ $(topsrcdir)/xpcom/idl-parser/header.py --cachedir=$(DEPTH)/xpcom/idl-parser/cache $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@
- @if test -n "$(findstring $*.h, $(EXPORTS))"; \
- then echo "*** WARNING: file $*.h generated from $*.idl overrides $(srcdir)/$*.h"; else true; fi
-
-@@ -1492,7 +1500,7 @@ $(XPIDL_GEN_DIR)/%.xpt: %.idl $(XPIDL_DEPS) $(XPIDL_GE
- -I$(topsrcdir)/other-licenses/ply \
- -I$(topsrcdir)/xpcom/idl-parser \
- -I$(topsrcdir)/xpcom/typelib/xpt/tools \
-- $(topsrcdir)/xpcom/idl-parser/typelib.py --cachedir=$(DEPTH)/xpcom/idl-parser $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@
-+ $(topsrcdir)/xpcom/idl-parser/typelib.py --cachedir=$(DEPTH)/xpcom/idl-parser/cache $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@
-
- # no need to link together if XPIDLSRCS contains only XPIDL_MODULE
- ifneq ($(XPIDL_MODULE).idl,$(strip $(XPIDLSRCS)))
---- mozilla/js/src/config/rules.mk.orig Fri May 11 08:42:57 2012
-+++ mozilla/js/src/config/rules.mk Fri May 11 08:43:15 2012
-@@ -1479,7 +1479,7 @@ $(XPIDL_GEN_DIR)/%.h: %.idl $(XPIDL_DEPS) $(XPIDL_GEN_
- $(PYTHON_PATH) \
- -I$(topsrcdir)/other-licenses/ply \
- -I$(topsrcdir)/xpcom/idl-parser \
-- $(topsrcdir)/xpcom/idl-parser/header.py --cachedir=$(DEPTH)/xpcom/idl-parser $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@
-+ $(topsrcdir)/xpcom/idl-parser/header.py --cachedir=$(DEPTH)/xpcom/idl-parser/cache $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@
- @if test -n "$(findstring $*.h, $(EXPORTS))"; \
- then echo "*** WARNING: file $*.h generated from $*.idl overrides $(srcdir)/$*.h"; else true; fi
-
-@@ -1492,7 +1492,7 @@ $(XPIDL_GEN_DIR)/%.xpt: %.idl $(XPIDL_DEPS) $(XPIDL_GE
- -I$(topsrcdir)/other-licenses/ply \
- -I$(topsrcdir)/xpcom/idl-parser \
- -I$(topsrcdir)/xpcom/typelib/xpt/tools \
-- $(topsrcdir)/xpcom/idl-parser/typelib.py --cachedir=$(DEPTH)/xpcom/idl-parser $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@
-+ $(topsrcdir)/xpcom/idl-parser/typelib.py --cachedir=$(DEPTH)/xpcom/idl-parser/cache $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@
-
- # no need to link together if XPIDLSRCS contains only XPIDL_MODULE
- ifneq ($(XPIDL_MODULE).idl,$(strip $(XPIDLSRCS)))
---- mozilla/js/xpconnect/src/Makefile.in.orig Fri May 11 08:43:27 2012
-+++ mozilla/js/xpconnect/src/Makefile.in Fri May 11 08:44:03 2012
-@@ -151,7 +151,7 @@ dom_quickstubs.cpp: $(srcdir)/dom_quickstubs.qsconf \
- -I$(topsrcdir)/xpcom/idl-parser \
- $(srcdir)/qsgen.py \
- --idlpath=$(DEPTH)/dist/idl \
-- --cachedir=$(DEPTH)/xpcom/idl-parser \
-+ --cachedir=$(DEPTH)/xpcom/idl-parser/cache \
- --header-output dom_quickstubs.h \
- --stub-output dom_quickstubs.cpp \
- --makedepend-output $(MDDEPDIR)/dom_qsgen.pp \
-@@ -172,7 +172,7 @@ dombindings_gen.h: $(srcdir)/dombindings.conf \
- -I$(topsrcdir)/xpcom/idl-parser \
- $(srcdir)/dombindingsgen.py \
- --idlpath=$(DEPTH)/dist/idl \
-- --cachedir=$(DEPTH)/xpcom/idl-parser \
-+ --cachedir=$(DEPTH)/xpcom/idl-parser/cache \
- --header-output dombindings_gen.h \
- $(srcdir)/dombindings.conf
-
-@@ -189,7 +189,7 @@ dombindings_gen.cpp: $(srcdir)/dombindings.conf \
- -I$(topsrcdir)/xpcom/idl-parser \
- $(srcdir)/dombindingsgen.py \
- --idlpath=$(DEPTH)/dist/idl \
-- --cachedir=$(DEPTH)/xpcom/idl-parser \
-+ --cachedir=$(DEPTH)/xpcom/idl-parser/cache \
- --stub-output dombindings_gen.cpp \
- --makedepend-output $(MDDEPDIR)/dombindingsgen.pp \
- $(srcdir)/dombindings.conf
-@@ -208,7 +208,7 @@ DictionaryHelpers.h: $(srcdir)/dictionary_helper_gen.c
- -I$(topsrcdir)/xpcom/idl-parser \
- $(srcdir)/dictionary_helper_gen.py \
- -I $(DEPTH)/dist/idl \
-- --cachedir=$(DEPTH)/xpcom/idl-parser \
-+ --cachedir=$(DEPTH)/xpcom/idl-parser/cache \
- --header-output DictionaryHelpers.h \
- $(srcdir)/dictionary_helper_gen.conf
-
-@@ -223,7 +223,7 @@ DictionaryHelpers.cpp: $(srcdir)/dictionary_helper_gen
- -I$(topsrcdir)/xpcom/idl-parser \
- $(srcdir)/dictionary_helper_gen.py \
- -I $(DEPTH)/dist/idl \
-- --cachedir=$(DEPTH)/xpcom/idl-parser \
-+ --cachedir=$(DEPTH)/xpcom/idl-parser/cache \
- --header-output DictionaryHelpers.h \
- --stub-output DictionaryHelpers.cpp \
- --makedepend-output $(MDDEPDIR)/dictionary_helper_gen.pp \
---- mozilla/xpcom/idl-parser/Makefile.in.orig Fri May 11 08:44:10 2012
-+++ mozilla/xpcom/idl-parser/Makefile.in Fri May 11 08:44:29 2012
-@@ -61,7 +61,7 @@ export:: $(PARSER_SRCS) $(PLY_PROGS)
- $(PYTHON_PATH) \
- -I$(topsrcdir)/other-licenses/ply \
- -I$(topsrcdir)/xpcom/idl-parser \
-- $(topsrcdir)/xpcom/idl-parser/header.py --cachedir=. --regen
-+ $(topsrcdir)/xpcom/idl-parser/header.py --cachedir=$(DEPTH)/xpcom/idl-parser/cache --regen
-
- check::
- $(PYTHON_PATH) \
---- mozilla/xpcom/typelib/xpidl/Makefile.in.orig Fri May 11 08:44:51 2012
-+++ mozilla/xpcom/typelib/xpidl/Makefile.in Fri May 11 08:45:09 2012
-@@ -48,8 +48,8 @@ SDK_BINARY = \
- $(topsrcdir)/xpcom/idl-parser/xpidl.py \
- $(topsrcdir)/xpcom/idl-parser/header.py \
- $(topsrcdir)/xpcom/idl-parser/typelib.py \
-- $(DEPTH)/xpcom/idl-parser/xpidllex.py \
-- $(DEPTH)/xpcom/idl-parser/xpidlyacc.py \
-+ $(DEPTH)/xpcom/idl-parser/cache/xpidllex.py \
-+ $(DEPTH)/xpcom/idl-parser/cache/xpidlyacc.py \
- $(NULL)
-
- ifndef MOZ_SYSTEM_PLY
Modified: branches/experimental/www/firefox-nightly/Makefile
==============================================================================
--- branches/experimental/www/firefox-nightly/Makefile Sat Jun 23 13:13:23 2012 (r791)
+++ branches/experimental/www/firefox-nightly/Makefile Sat Jun 23 13:14:24 2012 (r792)
@@ -59,6 +59,10 @@
HGREV= 97387:93439ef24979
+.if ${USE_MOZILLA:M-nss}
+OBJDIR_BUILD= yes
+.endif
+
.include <bsd.port.pre.mk>
.if empty(CXX:M*clang++*) && ${OSVERSION} > 900000
Modified: branches/experimental/www/firefox/Makefile
==============================================================================
--- branches/experimental/www/firefox/Makefile Sat Jun 23 13:13:23 2012 (r791)
+++ branches/experimental/www/firefox/Makefile Sat Jun 23 13:14:24 2012 (r792)
@@ -37,6 +37,7 @@
ALL_TARGET= default
CONFIGURE_ENV= LOCALBASE=${LOCALBASE}
GNU_CONFIGURE= yes
+OBJDIR_BUILD= yes
USE_BZIP2= yes
USE_GMAKE= yes
USE_GL= gl
Deleted: branches/experimental/www/firefox/files/patch-bugzilla-736961
==============================================================================
--- branches/experimental/www/firefox/files/patch-bugzilla-736961 Sat Jun 23 13:14:24 2012 (r791)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,111 +0,0 @@
---- config/rules.mk.orig Wed May 2 05:16:35 2012
-+++ config/rules.mk Fri May 11 08:42:50 2012
-@@ -1479,7 +1487,7 @@ $(XPIDL_GEN_DIR)/%.h: %.idl $(XPIDL_DEPS) $(XPIDL_GEN_
- $(PYTHON_PATH) \
- -I$(topsrcdir)/other-licenses/ply \
- -I$(topsrcdir)/xpcom/idl-parser \
-- $(topsrcdir)/xpcom/idl-parser/header.py --cachedir=$(DEPTH)/xpcom/idl-parser $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@
-+ $(topsrcdir)/xpcom/idl-parser/header.py --cachedir=$(DEPTH)/xpcom/idl-parser/cache $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@
- @if test -n "$(findstring $*.h, $(EXPORTS))"; \
- then echo "*** WARNING: file $*.h generated from $*.idl overrides $(srcdir)/$*.h"; else true; fi
-
-@@ -1492,7 +1500,7 @@ $(XPIDL_GEN_DIR)/%.xpt: %.idl $(XPIDL_DEPS) $(XPIDL_GE
- -I$(topsrcdir)/other-licenses/ply \
- -I$(topsrcdir)/xpcom/idl-parser \
- -I$(topsrcdir)/xpcom/typelib/xpt/tools \
-- $(topsrcdir)/xpcom/idl-parser/typelib.py --cachedir=$(DEPTH)/xpcom/idl-parser $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@
-+ $(topsrcdir)/xpcom/idl-parser/typelib.py --cachedir=$(DEPTH)/xpcom/idl-parser/cache $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@
-
- # no need to link together if XPIDLSRCS contains only XPIDL_MODULE
- ifneq ($(XPIDL_MODULE).idl,$(strip $(XPIDLSRCS)))
---- js/src/config/rules.mk.orig Fri May 11 08:42:57 2012
-+++ js/src/config/rules.mk Fri May 11 08:43:15 2012
-@@ -1479,7 +1479,7 @@ $(XPIDL_GEN_DIR)/%.h: %.idl $(XPIDL_DEPS) $(XPIDL_GEN_
- $(PYTHON_PATH) \
- -I$(topsrcdir)/other-licenses/ply \
- -I$(topsrcdir)/xpcom/idl-parser \
-- $(topsrcdir)/xpcom/idl-parser/header.py --cachedir=$(DEPTH)/xpcom/idl-parser $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@
-+ $(topsrcdir)/xpcom/idl-parser/header.py --cachedir=$(DEPTH)/xpcom/idl-parser/cache $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@
- @if test -n "$(findstring $*.h, $(EXPORTS))"; \
- then echo "*** WARNING: file $*.h generated from $*.idl overrides $(srcdir)/$*.h"; else true; fi
-
-@@ -1492,7 +1492,7 @@ $(XPIDL_GEN_DIR)/%.xpt: %.idl $(XPIDL_DEPS) $(XPIDL_GE
- -I$(topsrcdir)/other-licenses/ply \
- -I$(topsrcdir)/xpcom/idl-parser \
- -I$(topsrcdir)/xpcom/typelib/xpt/tools \
-- $(topsrcdir)/xpcom/idl-parser/typelib.py --cachedir=$(DEPTH)/xpcom/idl-parser $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@
-+ $(topsrcdir)/xpcom/idl-parser/typelib.py --cachedir=$(DEPTH)/xpcom/idl-parser/cache $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@
-
- # no need to link together if XPIDLSRCS contains only XPIDL_MODULE
- ifneq ($(XPIDL_MODULE).idl,$(strip $(XPIDLSRCS)))
---- js/xpconnect/src/Makefile.in.orig Fri May 11 08:43:27 2012
-+++ js/xpconnect/src/Makefile.in Fri May 11 08:44:03 2012
-@@ -151,7 +151,7 @@ dom_quickstubs.cpp: $(srcdir)/dom_quickstubs.qsconf \
- -I$(topsrcdir)/xpcom/idl-parser \
- $(srcdir)/qsgen.py \
- --idlpath=$(DEPTH)/dist/idl \
-- --cachedir=$(DEPTH)/xpcom/idl-parser \
-+ --cachedir=$(DEPTH)/xpcom/idl-parser/cache \
- --header-output dom_quickstubs.h \
- --stub-output dom_quickstubs.cpp \
- --makedepend-output $(MDDEPDIR)/dom_qsgen.pp \
-@@ -172,7 +172,7 @@ dombindings_gen.h: $(srcdir)/dombindings.conf \
- -I$(topsrcdir)/xpcom/idl-parser \
- $(srcdir)/dombindingsgen.py \
- --idlpath=$(DEPTH)/dist/idl \
-- --cachedir=$(DEPTH)/xpcom/idl-parser \
-+ --cachedir=$(DEPTH)/xpcom/idl-parser/cache \
- --header-output dombindings_gen.h \
- $(srcdir)/dombindings.conf
-
-@@ -189,7 +189,7 @@ dombindings_gen.cpp: $(srcdir)/dombindings.conf \
- -I$(topsrcdir)/xpcom/idl-parser \
- $(srcdir)/dombindingsgen.py \
- --idlpath=$(DEPTH)/dist/idl \
-- --cachedir=$(DEPTH)/xpcom/idl-parser \
-+ --cachedir=$(DEPTH)/xpcom/idl-parser/cache \
- --stub-output dombindings_gen.cpp \
- --makedepend-output $(MDDEPDIR)/dombindingsgen.pp \
- $(srcdir)/dombindings.conf
-@@ -208,7 +208,7 @@ DictionaryHelpers.h: $(srcdir)/dictionary_helper_gen.c
- -I$(topsrcdir)/xpcom/idl-parser \
- $(srcdir)/dictionary_helper_gen.py \
- -I $(DEPTH)/dist/idl \
-- --cachedir=$(DEPTH)/xpcom/idl-parser \
-+ --cachedir=$(DEPTH)/xpcom/idl-parser/cache \
- --header-output DictionaryHelpers.h \
- $(srcdir)/dictionary_helper_gen.conf
-
-@@ -223,7 +223,7 @@ DictionaryHelpers.cpp: $(srcdir)/dictionary_helper_gen
- -I$(topsrcdir)/xpcom/idl-parser \
- $(srcdir)/dictionary_helper_gen.py \
- -I $(DEPTH)/dist/idl \
-- --cachedir=$(DEPTH)/xpcom/idl-parser \
-+ --cachedir=$(DEPTH)/xpcom/idl-parser/cache \
- --header-output DictionaryHelpers.h \
- --stub-output DictionaryHelpers.cpp \
- --makedepend-output $(MDDEPDIR)/dictionary_helper_gen.pp \
---- xpcom/idl-parser/Makefile.in.orig Fri May 11 08:44:10 2012
-+++ xpcom/idl-parser/Makefile.in Fri May 11 08:44:29 2012
-@@ -61,7 +61,7 @@ export:: $(PARSER_SRCS) $(PLY_PROGS)
- $(PYTHON_PATH) \
- -I$(topsrcdir)/other-licenses/ply \
- -I$(topsrcdir)/xpcom/idl-parser \
-- $(topsrcdir)/xpcom/idl-parser/header.py --cachedir=. --regen
-+ $(topsrcdir)/xpcom/idl-parser/header.py --cachedir=$(DEPTH)/xpcom/idl-parser/cache --regen
-
- check::
- $(PYTHON_PATH) \
---- xpcom/typelib/xpidl/Makefile.in.orig Fri May 11 08:44:51 2012
-+++ xpcom/typelib/xpidl/Makefile.in Fri May 11 08:45:09 2012
-@@ -48,8 +48,8 @@ SDK_BINARY = \
- $(topsrcdir)/xpcom/idl-parser/xpidl.py \
- $(topsrcdir)/xpcom/idl-parser/header.py \
- $(topsrcdir)/xpcom/idl-parser/typelib.py \
-- $(DEPTH)/xpcom/idl-parser/xpidllex.py \
-- $(DEPTH)/xpcom/idl-parser/xpidlyacc.py \
-+ $(DEPTH)/xpcom/idl-parser/cache/xpidllex.py \
-+ $(DEPTH)/xpcom/idl-parser/cache/xpidlyacc.py \
- $(NULL)
-
- ifndef MOZ_SYSTEM_PLY
Modified: branches/experimental/www/seamonkey/Makefile
==============================================================================
--- branches/experimental/www/seamonkey/Makefile Sat Jun 23 13:13:23 2012 (r791)
+++ branches/experimental/www/seamonkey/Makefile Sat Jun 23 13:14:24 2012 (r792)
@@ -29,6 +29,7 @@
WANT_GNOME= yes
WANT_PERL= yes
GNU_CONFIGURE= yes
+OBJDIR_BUILD= yes
ALL_TARGET= default
USE_GL= gl
MAKE_JOBS_SAFE= yes
Deleted: branches/experimental/www/seamonkey/files/patch-bugzilla-736961
==============================================================================
--- branches/experimental/www/seamonkey/files/patch-bugzilla-736961 Sat Jun 23 13:14:24 2012 (r791)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,111 +0,0 @@
---- mozilla/config/rules.mk.orig Wed May 2 05:16:35 2012
-+++ mozilla/config/rules.mk Fri May 11 08:42:50 2012
-@@ -1479,7 +1487,7 @@ $(XPIDL_GEN_DIR)/%.h: %.idl $(XPIDL_DEPS) $(XPIDL_GEN_
- $(PYTHON_PATH) \
- -I$(topsrcdir)/other-licenses/ply \
- -I$(topsrcdir)/xpcom/idl-parser \
-- $(topsrcdir)/xpcom/idl-parser/header.py --cachedir=$(DEPTH)/xpcom/idl-parser $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@
-+ $(topsrcdir)/xpcom/idl-parser/header.py --cachedir=$(DEPTH)/xpcom/idl-parser/cache $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@
- @if test -n "$(findstring $*.h, $(EXPORTS))"; \
- then echo "*** WARNING: file $*.h generated from $*.idl overrides $(srcdir)/$*.h"; else true; fi
-
-@@ -1492,7 +1500,7 @@ $(XPIDL_GEN_DIR)/%.xpt: %.idl $(XPIDL_DEPS) $(XPIDL_GE
- -I$(topsrcdir)/other-licenses/ply \
- -I$(topsrcdir)/xpcom/idl-parser \
- -I$(topsrcdir)/xpcom/typelib/xpt/tools \
-- $(topsrcdir)/xpcom/idl-parser/typelib.py --cachedir=$(DEPTH)/xpcom/idl-parser $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@
-+ $(topsrcdir)/xpcom/idl-parser/typelib.py --cachedir=$(DEPTH)/xpcom/idl-parser/cache $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@
-
- # no need to link together if XPIDLSRCS contains only XPIDL_MODULE
- ifneq ($(XPIDL_MODULE).idl,$(strip $(XPIDLSRCS)))
---- mozilla/js/src/config/rules.mk.orig Fri May 11 08:42:57 2012
-+++ mozilla/js/src/config/rules.mk Fri May 11 08:43:15 2012
-@@ -1479,7 +1479,7 @@ $(XPIDL_GEN_DIR)/%.h: %.idl $(XPIDL_DEPS) $(XPIDL_GEN_
- $(PYTHON_PATH) \
- -I$(topsrcdir)/other-licenses/ply \
- -I$(topsrcdir)/xpcom/idl-parser \
-- $(topsrcdir)/xpcom/idl-parser/header.py --cachedir=$(DEPTH)/xpcom/idl-parser $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@
-+ $(topsrcdir)/xpcom/idl-parser/header.py --cachedir=$(DEPTH)/xpcom/idl-parser/cache $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@
- @if test -n "$(findstring $*.h, $(EXPORTS))"; \
- then echo "*** WARNING: file $*.h generated from $*.idl overrides $(srcdir)/$*.h"; else true; fi
-
-@@ -1492,7 +1492,7 @@ $(XPIDL_GEN_DIR)/%.xpt: %.idl $(XPIDL_DEPS) $(XPIDL_GE
- -I$(topsrcdir)/other-licenses/ply \
- -I$(topsrcdir)/xpcom/idl-parser \
- -I$(topsrcdir)/xpcom/typelib/xpt/tools \
-- $(topsrcdir)/xpcom/idl-parser/typelib.py --cachedir=$(DEPTH)/xpcom/idl-parser $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@
-+ $(topsrcdir)/xpcom/idl-parser/typelib.py --cachedir=$(DEPTH)/xpcom/idl-parser/cache $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@
-
- # no need to link together if XPIDLSRCS contains only XPIDL_MODULE
- ifneq ($(XPIDL_MODULE).idl,$(strip $(XPIDLSRCS)))
---- mozilla/js/xpconnect/src/Makefile.in.orig Fri May 11 08:43:27 2012
-+++ mozilla/js/xpconnect/src/Makefile.in Fri May 11 08:44:03 2012
-@@ -151,7 +151,7 @@ dom_quickstubs.cpp: $(srcdir)/dom_quickstubs.qsconf \
- -I$(topsrcdir)/xpcom/idl-parser \
- $(srcdir)/qsgen.py \
- --idlpath=$(DEPTH)/dist/idl \
-- --cachedir=$(DEPTH)/xpcom/idl-parser \
-+ --cachedir=$(DEPTH)/xpcom/idl-parser/cache \
- --header-output dom_quickstubs.h \
- --stub-output dom_quickstubs.cpp \
- --makedepend-output $(MDDEPDIR)/dom_qsgen.pp \
-@@ -172,7 +172,7 @@ dombindings_gen.h: $(srcdir)/dombindings.conf \
- -I$(topsrcdir)/xpcom/idl-parser \
- $(srcdir)/dombindingsgen.py \
- --idlpath=$(DEPTH)/dist/idl \
-- --cachedir=$(DEPTH)/xpcom/idl-parser \
-+ --cachedir=$(DEPTH)/xpcom/idl-parser/cache \
- --header-output dombindings_gen.h \
- $(srcdir)/dombindings.conf
-
-@@ -189,7 +189,7 @@ dombindings_gen.cpp: $(srcdir)/dombindings.conf \
- -I$(topsrcdir)/xpcom/idl-parser \
- $(srcdir)/dombindingsgen.py \
- --idlpath=$(DEPTH)/dist/idl \
-- --cachedir=$(DEPTH)/xpcom/idl-parser \
-+ --cachedir=$(DEPTH)/xpcom/idl-parser/cache \
- --stub-output dombindings_gen.cpp \
- --makedepend-output $(MDDEPDIR)/dombindingsgen.pp \
- $(srcdir)/dombindings.conf
-@@ -208,7 +208,7 @@ DictionaryHelpers.h: $(srcdir)/dictionary_helper_gen.c
- -I$(topsrcdir)/xpcom/idl-parser \
- $(srcdir)/dictionary_helper_gen.py \
- -I $(DEPTH)/dist/idl \
-- --cachedir=$(DEPTH)/xpcom/idl-parser \
-+ --cachedir=$(DEPTH)/xpcom/idl-parser/cache \
- --header-output DictionaryHelpers.h \
- $(srcdir)/dictionary_helper_gen.conf
-
-@@ -223,7 +223,7 @@ DictionaryHelpers.cpp: $(srcdir)/dictionary_helper_gen
- -I$(topsrcdir)/xpcom/idl-parser \
- $(srcdir)/dictionary_helper_gen.py \
- -I $(DEPTH)/dist/idl \
-- --cachedir=$(DEPTH)/xpcom/idl-parser \
-+ --cachedir=$(DEPTH)/xpcom/idl-parser/cache \
- --header-output DictionaryHelpers.h \
- --stub-output DictionaryHelpers.cpp \
- --makedepend-output $(MDDEPDIR)/dictionary_helper_gen.pp \
---- mozilla/xpcom/idl-parser/Makefile.in.orig Fri May 11 08:44:10 2012
-+++ mozilla/xpcom/idl-parser/Makefile.in Fri May 11 08:44:29 2012
-@@ -61,7 +61,7 @@ export:: $(PARSER_SRCS) $(PLY_PROGS)
- $(PYTHON_PATH) \
- -I$(topsrcdir)/other-licenses/ply \
- -I$(topsrcdir)/xpcom/idl-parser \
-- $(topsrcdir)/xpcom/idl-parser/header.py --cachedir=. --regen
-+ $(topsrcdir)/xpcom/idl-parser/header.py --cachedir=$(DEPTH)/xpcom/idl-parser/cache --regen
-
- check::
- $(PYTHON_PATH) \
---- mozilla/xpcom/typelib/xpidl/Makefile.in.orig Fri May 11 08:44:51 2012
-+++ mozilla/xpcom/typelib/xpidl/Makefile.in Fri May 11 08:45:09 2012
-@@ -48,8 +48,8 @@ SDK_BINARY = \
- $(topsrcdir)/xpcom/idl-parser/xpidl.py \
- $(topsrcdir)/xpcom/idl-parser/header.py \
- $(topsrcdir)/xpcom/idl-parser/typelib.py \
-- $(DEPTH)/xpcom/idl-parser/xpidllex.py \
-- $(DEPTH)/xpcom/idl-parser/xpidlyacc.py \
-+ $(DEPTH)/xpcom/idl-parser/cache/xpidllex.py \
-+ $(DEPTH)/xpcom/idl-parser/cache/xpidlyacc.py \
- $(NULL)
-
- ifndef MOZ_SYSTEM_PLY
Deleted: branches/experimental/www/seamonkey/files/patch-mozilla-config-gcc-stl-wrapper.template.h
==============================================================================
--- branches/experimental/www/seamonkey/files/patch-mozilla-config-gcc-stl-wrapper.template.h Sat Jun 23 13:14:24 2012 (r791)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,11 +0,0 @@
---- mozilla/config/gcc-stl-wrapper.template.h.orig 2010-05-12 13:56:18.000000000 +0000
-+++ mozilla/config/gcc-stl-wrapper.template.h 2010-05-12 13:56:52.000000000 +0000
-@@ -89,7 +89,7 @@
- // -fshort-wchar). We don't want that and so define our own inlined
- // __throw_*().
- #ifndef mozilla_throw_gcc_h
--# include "mozilla/throw_gcc.h"
-+# include "../../memory/mozalloc/throw_gcc.h"
- #endif
-
- #endif // if mozilla_${HEADER}_h
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201206231314.q5NDEOLt050876>