Skip to content

Commit c485301

Browse files
committed
Update libuv.
1 parent 6784b18 commit c485301

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+1403
-3640
lines changed

.gitmodules

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
url = git://github.com/brson/llvm.git
44
[submodule "src/libuv"]
55
path = src/libuv
6-
url = git://github.com/joyent/libuv
6+
url = git://github.com/graydon/libuv.git

configure

+2
Original file line numberDiff line numberDiff line change
@@ -467,6 +467,8 @@ cd ${CFG_SRC_DIR}
467467

468468
if [ -z $CFG_DISABLE_MANAGE_SUBMODULES ]
469469
then
470+
msg "git: submodule sync"
471+
"${CFG_GIT}" submodule sync --quiet
470472
SUBMODULE_STATUS=$("${CFG_GIT}" submodule status)
471473
NEED_INIT_COUNT=$(echo "$SUBMODULE_STATUS" | grep -c "^-")
472474
NEED_UPDATE_COUNT=$(echo "$SUBMODULE_STATUS" | grep -c "^+")

mk/libuv/ia32/mac/Makefile

+11-7
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ MAKEFLAGS=-r
88

99
# The source directory tree.
1010
srcdir := ../../../..
11+
abs_srcdir := $(abspath $(srcdir))
1112

1213
# The name of the builddir.
1314
builddir_name ?= out
@@ -20,7 +21,7 @@ else
2021
endif
2122

2223
# Specify BUILDTYPE=Release on the command line for a release build.
23-
BUILDTYPE ?= Default
24+
BUILDTYPE ?= Debug
2425

2526
# Directory all our build output goes into.
2627
# Note that this must be two directories beneath src/ for unit tests to pass,
@@ -147,7 +148,7 @@ cmd_objcxx = $(CXX.$(TOOLSET)) $(GYP_OBJCXXFLAGS) $(DEPFLAGS) -c -o $@ $<
147148
quiet_cmd_pch_c = CXX($(TOOLSET)) $@
148149
cmd_pch_c = $(CC.$(TOOLSET)) $(GYP_PCH_CFLAGS) $(DEPFLAGS) $(CXXFLAGS.$(TOOLSET)) -c -o $@ $<
149150
quiet_cmd_pch_cc = CXX($(TOOLSET)) $@
150-
cmd_pch_cc = $(CC.$(TOOLSET)) $(GYP_PCH_CCFLAGS) $(DEPFLAGS) $(CXXFLAGS.$(TOOLSET)) -c -o $@ $<
151+
cmd_pch_cc = $(CC.$(TOOLSET)) $(GYP_PCH_CXXFLAGS) $(DEPFLAGS) $(CXXFLAGS.$(TOOLSET)) -c -o $@ $<
151152
quiet_cmd_pch_m = CXX($(TOOLSET)) $@
152153
cmd_pch_m = $(CC.$(TOOLSET)) $(GYP_PCH_OBJCFLAGS) $(DEPFLAGS) -c -o $@ $<
153154
quiet_cmd_pch_mm = CXX($(TOOLSET)) $@
@@ -162,6 +163,9 @@ cmd_mac_tool = ./gyp-mac-tool $(4) $< "$@"
162163
quiet_cmd_mac_package_framework = PACKAGE FRAMEWORK $@
163164
cmd_mac_package_framework = ./gyp-mac-tool package-framework "$@" $(4)
164165

166+
quiet_cmd_infoplist = INFOPLIST $@
167+
cmd_infoplist = $(CC.$(TOOLSET)) -E -P -Wno-trigraphs -x c $(INFOPLIST_DEFINES) "$<" -o "$@"
168+
165169
quiet_cmd_touch = TOUCH $@
166170
cmd_touch = touch $@
167171

@@ -262,8 +266,8 @@ $(if $(or $(command_changed),$(prereq_changed)),
262266
)
263267
endef
264268

265-
# Declare "all" target first so it is the default, even though we don't have the
266-
# deps yet.
269+
# Declare the "all" target first so it is the default,
270+
# even though we don't have the deps yet.
267271
.PHONY: all
268272
all:
269273

@@ -343,9 +347,9 @@ ifeq ($(strip $(foreach prefix,$(NO_LOAD),\
343347
include src/libuv/uv.target.mk
344348
endif
345349

346-
quiet_cmd_regen_makefile = ACTION Regenerating $@
347-
cmd_regen_makefile = ./src/libuv/build/gyp/gyp -fmake --ignore-environment "--toplevel-dir=." "--depth=." "--generator-output=mk/libuv/ia32/mac" "-Dlibrary=static_library" "-Dtarget_arch=ia32" "-DOS=mac" src/libuv/uv.gyp
348-
Makefile: $(srcdir)/src/libuv/uv.gyp
350+
#quiet_cmd_regen_makefile = ACTION Regenerating $@
351+
#cmd_regen_makefile = ./src/libuv/build/gyp/gyp -fmake --ignore-environment "--toplevel-dir=." -Isrc/libuv/common.gypi "--depth=." "--generator-output=mk/libuv/ia32/mac" "-Ddefault_configuration=Default" "-Dcomponent=static_library" "-Dlibrary=static_library" "-Dtarget_arch=ia32" "-DOS=mac" src/libuv/uv.gyp
352+
#Makefile: $(srcdir)/src/libuv/uv.gyp $(srcdir)/src/libuv/common.gypi
349353
# $(call do_cmd,regen_makefile)
350354

351355
# "all" is a concatenation of the "all" targets from all the included

0 commit comments

Comments
 (0)