Skip to content

Commit 901af3a

Browse files
committed
More
1 parent 9c22867 commit 901af3a

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

erlang.mk

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -657,6 +657,10 @@ endif
657657

658658
# Deps related targets.
659659

660+
autopatch_verbose_0 = @echo " PATCH " $(subst autopatch-,,$@) "(method: $(AUTOPATCH_METHOD))";
661+
autopatch_verbose_2 = set -x;
662+
autopatch_verbose = $(autopatch_verbose_$(V))
663+
660664
define dep_autopatch_detect
661665
if [ -f $(DEPS_DIR)/$1/erlang.mk ]; then \
662666
echo erlang.mk; \
@@ -829,7 +833,6 @@ define dep_autopatch_rebar.erl
829833
GetHexVsn2 = fun(N, NP) ->
830834
case file:consult("$(call core_native_path,$(DEPS_DIR)/$1/rebar.lock)") of
831835
{ok, Lock} ->
832-
io:format("~p~n", [Lock]),
833836
LockPkgs = case lists:keyfind("1.2.0", 1, Lock) of
834837
{_, LP} ->
835838
LP;
@@ -843,10 +846,8 @@ define dep_autopatch_rebar.erl
843846
end,
844847
if
845848
is_list(LockPkgs) ->
846-
io:format("~p~n", [LockPkgs]),
847849
case lists:keyfind(atom_to_binary(N, latin1), 1, LockPkgs) of
848850
{_, {pkg, _, Vsn}, _} ->
849-
io:format("~p~n", [Vsn]),
850851
{N, {hex, NP, binary_to_list(Vsn)}};
851852
_ ->
852853
false
@@ -1298,7 +1299,7 @@ define dep_fetch_fail
12981299
endef
12991300

13001301
define dep_target
1301-
$(DEPS_DIR)/$(call query_name,$1): $(if $(filter elixir,$(BUILD_DEPS) $(DEPS)),$(if $(filter-out elixir,$1),$(DEPS_DIR)/elixir/ebin/dep_built)) $(if $(filter hex,$(call query_fetch_method,$1)),$(DEPS_DIR)/hex_core/ebin/dep_built) | $(ERLANG_MK_TMP)
1302+
$(DEPS_DIR)/$(call query_name,$1): $(if $(filter elixir,$(BUILD_DEPS) $(DEPS)),$(if $(filter-out elixir,$1),$(DEPS_DIR)/elixir/ebin/dep_built)) $(if $(filter hex,$(call query_fetch_method,$1)),$(if $(wildcard $(DEPS_DIR)/$(call query_name,$1)),,$(DEPS_DIR)/hex_core/ebin/dep_built)) | $(ERLANG_MK_TMP)
13021303
$(eval DEP_NAME := $(call query_name,$1))
13031304
$(eval DEP_STR := $(if $(filter $1,$(DEP_NAME)),$1,"$1 ($(DEP_NAME))"))
13041305
$(verbose) if test -d $(APPS_DIR)/$(DEP_NAME); then \
@@ -1327,7 +1328,7 @@ autopatch-elixir::
13271328
ln -s lib/elixir/ebin $(DEPS_DIR)/elixir/
13281329
else
13291330
autopatch-$(call query_name,$1)::
1330-
$$(call dep_autopatch_for_$(AUTOPATCH_METHOD),$(call query_name,$1))
1331+
$$(autopatch_verbose) $$(call dep_autopatch_for_$(AUTOPATCH_METHOD),$(call query_name,$1))
13311332
endif
13321333
endef
13331334

0 commit comments

Comments
 (0)