Skip to content

Commit

Permalink
Update libuv.
Browse files Browse the repository at this point in the history
  • Loading branch information
graydon committed Feb 3, 2012
1 parent 6784b18 commit c485301
Show file tree
Hide file tree
Showing 49 changed files with 1,403 additions and 3,640 deletions.
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
url = git://github.com/brson/llvm.git
[submodule "src/libuv"]
path = src/libuv
url = git://github.com/joyent/libuv
url = git://github.com/graydon/libuv.git
2 changes: 2 additions & 0 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -467,6 +467,8 @@ cd ${CFG_SRC_DIR}

if [ -z $CFG_DISABLE_MANAGE_SUBMODULES ]
then
msg "git: submodule sync"
"${CFG_GIT}" submodule sync --quiet
SUBMODULE_STATUS=$("${CFG_GIT}" submodule status)
NEED_INIT_COUNT=$(echo "$SUBMODULE_STATUS" | grep -c "^-")
NEED_UPDATE_COUNT=$(echo "$SUBMODULE_STATUS" | grep -c "^+")
Expand Down
18 changes: 11 additions & 7 deletions mk/libuv/ia32/mac/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ MAKEFLAGS=-r

# The source directory tree.
srcdir := ../../../..
abs_srcdir := $(abspath $(srcdir))

# The name of the builddir.
builddir_name ?= out
Expand All @@ -20,7 +21,7 @@ else
endif

# Specify BUILDTYPE=Release on the command line for a release build.
BUILDTYPE ?= Default
BUILDTYPE ?= Debug

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

quiet_cmd_infoplist = INFOPLIST $@
cmd_infoplist = $(CC.$(TOOLSET)) -E -P -Wno-trigraphs -x c $(INFOPLIST_DEFINES) "$<" -o "$@"

quiet_cmd_touch = TOUCH $@
cmd_touch = touch $@

Expand Down Expand Up @@ -262,8 +266,8 @@ $(if $(or $(command_changed),$(prereq_changed)),
)
endef

# Declare "all" target first so it is the default, even though we don't have the
# deps yet.
# Declare the "all" target first so it is the default,
# even though we don't have the deps yet.
.PHONY: all
all:

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

quiet_cmd_regen_makefile = ACTION Regenerating $@
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
Makefile: $(srcdir)/src/libuv/uv.gyp
#quiet_cmd_regen_makefile = ACTION Regenerating $@
#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
#Makefile: $(srcdir)/src/libuv/uv.gyp $(srcdir)/src/libuv/common.gypi
# $(call do_cmd,regen_makefile)

# "all" is a concatenation of the "all" targets from all the included
Expand Down
Loading

0 comments on commit c485301

Please sign in to comment.