author | Mike Hommey <mh+mozilla@glandium.org> |
Mon, 14 Mar 2011 14:41:41 +0100 | |
changeset 63509 | aad612e0b8c92d9f121559a7cf0f5e3af2cf470a |
parent 63508 | 60381b92efa656ead9c64b1e37130d11a8e71c5c |
child 63510 | bf12fcfef518c15f8d2062d6bfcf6ff341b75d2d |
push id | 19231 |
push user | khuey@kylehuey.com |
push date | Wed, 23 Mar 2011 00:22:04 +0000 |
treeherder | mozilla-central@57a0f8967cce [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | ted |
bugs | 637341 |
milestone | 2.0b13pre |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/Makefile.in +++ b/Makefile.in @@ -167,16 +167,19 @@ ifdef MOZ_SYMBOLS_EXTRA_BUILDID EXTRA_BUILDID := -$(MOZ_SYMBOLS_EXTRA_BUILDID) endif export SYMBOL_INDEX_NAME = \ $(MOZ_APP_NAME)-$(MOZ_APP_VERSION)-$(OS_TARGET)-$(BUILDID)$(EXTRA_BUILDID)-symbols.txt buildsymbols: ifdef MOZ_CRASHREPORTER +ifdef USE_ELF_HACK + $(MAKE) -C $(MOZ_BUILD_APP)/installer elfhack +endif echo building symbol store $(RM) -rf $(DIST)/crashreporter-symbols $(RM) -f "$(DIST)/$(SYMBOL_ARCHIVE_BASENAME).zip" $(NSINSTALL) -D $(DIST)/crashreporter-symbols $(PYTHON) $(topsrcdir)/toolkit/crashreporter/tools/symbolstore.py \ $(MAKE_SYM_STORE_ARGS) \ $(foreach dir,$(SYM_STORE_SOURCE_DIRS),-s $(dir)) \ $(DUMP_SYMS_BIN) \
--- a/build/unix/Makefile.in +++ b/build/unix/Makefile.in @@ -40,21 +40,19 @@ DEPTH = ../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk MODULE = build -ifeq ($(USE_ELF_HACK)$(HOST_OS_ARCH)$(OS_ARCH),1LinuxLinux) -ifneq (,$(filter %86 x86_64 arm,$(OS_TEST))) +ifdef USE_ELF_HACK DIRS = elfhack endif -endif include $(topsrcdir)/config/rules.mk libs:: $(srcdir)/run-mozilla.sh $(INSTALL) $< $(DIST)/bin ifeq ($(OS_ARCH),OpenVMS) libs:: vms/mozilla.com vms/install.com vms/getinfo.com
--- a/configure.in +++ b/configure.in @@ -7709,16 +7709,35 @@ dnl = --disable-elf-hack dnl ======================================================== USE_ELF_HACK= MOZ_ARG_DISABLE_BOOL(elf-hack, [ --disable-elf-hack Disable elf hacks], USE_ELF_HACK=, USE_ELF_HACK=1) +# Only enable elfhack where supported +if test "$USE_ELF_HACK" = 1; then + case "${HOST_OS_ARCH},${OS_ARCH}" in + Linux,Linux) + case "${CPU_ARCH}" in + arm | x86 | x86_64) + USE_ELF_HACK=1 + ;; + *) + USE_ELF_HACK= + ;; + esac + ;; + *) + USE_ELF_HACK= + ;; + esac +fi + dnl ======================================================== dnl = dnl = Profiling and Instrumenting dnl = dnl ======================================================== MOZ_ARG_HEADER(Profiling and Instrumenting) dnl ========================================================
--- a/toolkit/mozapps/installer/packager.mk +++ b/toolkit/mozapps/installer/packager.mk @@ -486,17 +486,27 @@ ifdef MOZ_OPTIONAL_PKG_LIST @$(NSINSTALL) -D $(DEPTH)/installer-stage/optional $(call PACKAGER_COPY, "$(call core_abspath,$(DIST))",\ "$(call core_abspath,$(DEPTH)/installer-stage/optional)", \ "$(MOZ_PKG_MANIFEST)", "$(PKGCP_OS)", 1, 0, 1 \ $(foreach pkg,$(MOZ_OPTIONAL_PKG_LIST),$(PKG_ARG)) ) @cd $(DEPTH)/installer-stage/optional/extensions; find -maxdepth 1 -mindepth 1 -exec rm -r ../../core/extensions/{} \; endif -stage-package: $(MOZ_PKG_MANIFEST) $(MOZ_PKG_REMOVALS_GEN) +elfhack: +ifdef USE_ELF_HACK + @echo === + @echo === If you get failures below, please file a bug describing the error + @echo === and your environment \(compiler and linker versions\), and use + @echo === --disable-elf-hack until this is fixed. + @echo === + cd $(DIST)/bin; find . -name "*$(DLL_SUFFIX)" | xargs $(DEPTH)/build/unix/elfhack/elfhack +endif + +stage-package: $(MOZ_PKG_MANIFEST) $(MOZ_PKG_REMOVALS_GEN) elfhack @rm -rf $(DIST)/$(MOZ_PKG_DIR) $(DIST)/$(PKG_PATH)$(PKG_BASENAME).tar $(DIST)/$(PKG_PATH)$(PKG_BASENAME).dmg $@ $(EXCLUDE_LIST) # NOTE: this must be a tar now that dist links into the tree so that we # do not strip the binaries actually in the tree. @echo "Creating package directory..." @mkdir $(DIST)/$(MOZ_PKG_DIR) ifndef UNIVERSAL_BINARY # If UNIVERSAL_BINARY, the package will be made from an already-prepared # STAGEPATH @@ -532,26 +542,16 @@ else @echo "Linking XPT files..." @rm -rf $(DIST)/xpt @$(NSINSTALL) -D $(DIST)/xpt @($(XPIDL_LINK) $(DIST)/xpt/$(MOZ_PKG_APPNAME).xpt $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)/components/*.xpt && rm -f $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)/components/*.xpt && cp $(DIST)/xpt/$(MOZ_PKG_APPNAME).xpt $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)/components && printf "interfaces $(MOZ_PKG_APPNAME).xpt\n" >$(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)/components/interfaces.manifest) || echo No *.xpt files found in: $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)/components/. Continuing... endif # DMG endif # MOZ_PKG_MANIFEST endif # UNIVERSAL_BINARY $(OPTIMIZE_JARS_CMD) --optimize $(DIST)/jarlog/ $(DIST)/bin/chrome $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)/chrome -ifeq ($(USE_ELF_HACK)$(HOST_OS_ARCH)$(OS_ARCH),1LinuxLinux) -ifneq (,$(filter %86 x86_64 arm,$(OS_TEST))) - @echo === - @echo === If you get failures below, please file a bug describing the error - @echo === and your environment \(compiler and linker versions\), and use - @echo === --disable-elf-hack until this is fixed. - @echo === - cd $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR); find . -name "*$(DLL_SUFFIX)" | xargs $(DEPTH)/build/unix/elfhack/elfhack -endif -endif ifndef PKG_SKIP_STRIP @echo "Stripping package directory..." @cd $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR); find . ! -type d \ ! -name "*.js" \ ! -name "*.xpt" \ ! -name "*.gif" \ ! -name "*.jpg" \ ! -name "*.png" \