wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge m-c to b2g-inbound

Browse Source
This commit is contained in:
Carsten "Tomcat" Book 2013-12-06 07:54:35 +01:00
commit ba46d7d6d2
10 changed files with 33 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
b2g/config/mozconfigs/common
View File

@ -5,3 +5,5 @@
# This file is included at the top of all b2g mozconfigs
. "$topsrcdir/build/mozconfig.common"
ac_add_options --disable-unified-compilation

13
config/baseconfig.mk
View File

@ -10,10 +10,17 @@ _OBJ_SUFFIX := $(OBJ_SUFFIX)
OBJ_SUFFIX = $(error config/config.mk needs to be included before using OBJ_SUFFIX)
ifeq ($(HOST_OS_ARCH),WINNT)
# We only support building with pymake or a specially built gnu make.
# We only support building with pymake or a non-msys gnu make version
# strictly above 4.0.
ifndef .PYMAKE
ifeq (,$(filter mozmake%,$(notdir $(MAKE))))
$(error Only building with pymake or mozmake is supported.)
ifeq (a,$(firstword a$(subst /, ,$(abspath .))))
$(error MSYS make is not supported)
endif
# 4.0- happens to be greater than 4.0, lower than the mozmake version,
# and lower than 4.0.1 or 4.1, whatever next version of gnu make will
# be released.
ifneq (4.0-,$(firstword $(sort 4.0- $(MAKE_VERSION))))
$(error Make version too old. Only versions strictly greater than 4.0 are supported.)
endif
endif
ifeq (a,$(firstword a$(subst /, ,$(srcdir))))

3
gfx/gl/GLSharedHandleHelpers.cpp
View File

@ -5,6 +5,9 @@
#include "GLContext.h"
#include "GLLibraryEGL.h"
#include "GLSharedHandleHelpers.h"
#ifdef MOZ_WIDGET_ANDROID
#include "nsSurfaceTexture.h"
#endif
namespace mozilla {
namespace gl {

13
js/src/config/baseconfig.mk
View File

@ -17,10 +17,17 @@ _OBJ_SUFFIX := $(OBJ_SUFFIX)
OBJ_SUFFIX = $(error config/config.mk needs to be included before using OBJ_SUFFIX)
ifeq ($(HOST_OS_ARCH),WINNT)
# We only support building with pymake or a specially built gnu make.
# We only support building with pymake or a non-msys gnu make version
# strictly above 4.0.
ifndef .PYMAKE
ifeq (,$(filter mozmake%,$(notdir $(MAKE))))
$(error Only building with pymake or mozmake is supported.)
ifeq (a,$(firstword a$(subst /, ,$(abspath .))))
$(error MSYS make is not supported)
endif
# 4.0- happens to be greater than 4.0, lower than the mozmake version,
# and lower than 4.0.1 or 4.1, whatever next version of gnu make will
# be released.
ifneq (4.0-,$(firstword $(sort 4.0- $(MAKE_VERSION))))
$(error Make version too old. Only versions strictly greater than 4.0 are supported.)
endif
endif
ifeq (a,$(firstword a$(subst /, ,$(srcdir))))

1
mobile/android/config/mozconfigs/android-armv6/debug
View File

@ -2,6 +2,7 @@
# Global options
ac_add_options --enable-debug
ac_add_options --disable-unified-compilation
# Build Fennec
ac_add_options --enable-application=mobile/android

1
mobile/android/config/mozconfigs/android-x86/debug
View File

@ -2,6 +2,7 @@
# Global options
ac_add_options --enable-debug
ac_add_options --disable-unified-compilation
# Build Fennec
ac_add_options --enable-application=mobile/android

1
mobile/android/config/mozconfigs/android/debug
View File

@ -2,6 +2,7 @@
# Global options
ac_add_options --enable-debug
ac_add_options --disable-unified-compilation
# Build Fennec
ac_add_options --enable-application=mobile/android

2
python/mozbuild/mozbuild/controller/clobber.py
View File

@ -180,6 +180,8 @@ def main(args, env, cwd, fh=sys.stderr):
required, performed, message = clobber.maybe_do_clobber(cwd, auto, fh)
if not required or performed:
if performed and env.get('TINDERBOX_OUTPUT'):
print('TinderboxPrint: auto clobber')
return 0
print(message, file=fh)

2
toolkit/mozapps/installer/packager.mk
View File

@ -477,7 +477,7 @@ INNER_UNMAKE_PACKAGE = \
test -n '$(MOZ_PKG_MAC_DSSTORE)' && \
rsync -a '$(_ABS_DIST)/unpack.tmp/.DS_Store' '$(MOZ_PKG_MAC_DSSTORE)'; \
test -n '$(MOZ_PKG_MAC_BACKGROUND)' && \
rsync -a '$(_ABS_DIST)/unpack.tmp/.background/`basename '$(MOZ_PKG_MAC_BACKGROUND)'`' '$(MOZ_PKG_MAC_BACKGROUND)'; \
rsync -a '$(_ABS_DIST)/unpack.tmp/.background/$(notdir $(MOZ_PKG_MAC_BACKGROUND))' '$(MOZ_PKG_MAC_BACKGROUND)'; \
test -n '$(MOZ_PKG_MAC_ICON)' && \
rsync -a '$(_ABS_DIST)/unpack.tmp/.VolumeIcon.icns' '$(MOZ_PKG_MAC_ICON)'; \
rm -rf $(_ABS_DIST)/unpack.tmp; \

2
xulrunner/config/mozconfigs/common
View File

@ -5,3 +5,5 @@
# This file is included at the top of all xulrunner mozconfigs
. "$topsrcdir/build/mozconfig.common"
ac_add_options --disable-unified-compilation