-
-
Notifications
You must be signed in to change notification settings - Fork 336
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
2 changed files
with
83 additions
and
82 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -17,7 +17,7 @@ | |
ERLANG_MK_FILENAME := $(realpath $(lastword $(MAKEFILE_LIST))) | ||
export ERLANG_MK_FILENAME | ||
|
||
ERLANG_MK_VERSION = 2017.08.28-16-g1a5adc6 | ||
ERLANG_MK_VERSION = 2017.08.28-19-g8e3d863 | ||
ERLANG_MK_WITHOUT = | ||
|
||
# Make 3.81 and 3.82 are deprecated. | ||
|
@@ -199,6 +199,87 @@ endif | |
# The erlang.mk package index is bundled in the default erlang.mk build. | ||
# Search for the string "copyright" to skip to the rest of the code. | ||
|
||
# Copyright (c) 2015-2017, Loïc Hoguin <[email protected]> | ||
# This file is part of erlang.mk and subject to the terms of the ISC License. | ||
|
||
.PHONY: distclean-kerl | ||
|
||
KERL_INSTALL_DIR ?= $(HOME)/erlang | ||
|
||
ifeq ($(strip $(KERL)),) | ||
KERL := $(ERLANG_MK_TMP)/kerl/kerl | ||
endif | ||
|
||
export KERL | ||
|
||
KERL_GIT ?= https://github.com/kerl/kerl | ||
KERL_COMMIT ?= master | ||
|
||
KERL_MAKEFLAGS ?= | ||
|
||
OTP_GIT ?= https://github.com/erlang/otp | ||
|
||
define kerl_otp_target | ||
ifeq ($(wildcard $(KERL_INSTALL_DIR)/$(1)),) | ||
$(KERL_INSTALL_DIR)/$(1): $(KERL) | ||
MAKEFLAGS="$(KERL_MAKEFLAGS)" $(KERL) build git $(OTP_GIT) $(1) $(1) | ||
$(KERL) install $(1) $(KERL_INSTALL_DIR)/$(1) | ||
endif | ||
endef | ||
|
||
define kerl_hipe_target | ||
ifeq ($(wildcard $(KERL_INSTALL_DIR)/$1-native),) | ||
$(KERL_INSTALL_DIR)/$1-native: $(KERL) | ||
KERL_CONFIGURE_OPTIONS=--enable-native-libs \ | ||
MAKEFLAGS="$(KERL_MAKEFLAGS)" $(KERL) build git $(OTP_GIT) $1 $1-native | ||
$(KERL) install $1-native $(KERL_INSTALL_DIR)/$1-native | ||
endif | ||
endef | ||
|
||
$(KERL): | ||
$(verbose) mkdir -p $(ERLANG_MK_TMP) | ||
$(gen_verbose) git clone --depth 1 $(KERL_GIT) $(ERLANG_MK_TMP)/kerl | ||
$(verbose) cd $(ERLANG_MK_TMP)/kerl && git checkout $(KERL_COMMIT) | ||
$(verbose) chmod +x $(KERL) | ||
|
||
distclean:: distclean-kerl | ||
|
||
distclean-kerl: | ||
$(gen_verbose) rm -rf $(KERL) | ||
|
||
# Allow users to select which version of Erlang/OTP to use for a project. | ||
|
||
ERLANG_OTP ?= | ||
ERLANG_HIPE ?= | ||
|
||
# Use kerl to enforce a specific Erlang/OTP version for a project. | ||
ifneq ($(strip $(ERLANG_OTP)),) | ||
export PATH := $(KERL_INSTALL_DIR)/$(ERLANG_OTP)/bin:$(PATH) | ||
SHELL := env PATH=$(PATH) $(SHELL) | ||
$(eval $(call kerl_otp_target,$(ERLANG_OTP))) | ||
|
||
# Build Erlang/OTP only if it doesn't already exist. | ||
ifeq ($(wildcard $(KERL_INSTALL_DIR)/$(ERLANG_OTP))$(BUILD_ERLANG_OTP),) | ||
$(info Building Erlang/OTP $(ERLANG_OTP)... Please wait...) | ||
$(shell $(MAKE) $(KERL_INSTALL_DIR)/$(ERLANG_OTP) ERLANG_OTP=$(ERLANG_OTP) BUILD_ERLANG_OTP=1 >&2) | ||
endif | ||
|
||
else | ||
# Same for a HiPE enabled VM. | ||
ifneq ($(strip $(ERLANG_HIPE)),) | ||
export PATH := $(KERL_INSTALL_DIR)/$(ERLANG_HIPE)-native/bin:$(PATH) | ||
SHELL := env PATH=$(PATH) $(SHELL) | ||
$(eval $(call kerl_hipe_target,$(ERLANG_HIPE))) | ||
|
||
# Build Erlang/OTP only if it doesn't already exist. | ||
ifeq ($(wildcard $(KERL_INSTALL_DIR)/$(ERLANG_HIPE))$(BUILD_ERLANG_OTP),) | ||
$(info Building HiPE-enabled Erlang/OTP $(ERLANG_OTP)... Please wait...) | ||
$(shell $(MAKE) $(KERL_INSTALL_DIR)/$(ERLANG_HIPE) ERLANG_HIPE=$(ERLANG_HIPE) BUILD_ERLANG_OTP=1 >&2) | ||
endif | ||
|
||
endif | ||
endif | ||
|
||
PACKAGES += aberth | ||
pkg_aberth_name = aberth | ||
pkg_aberth_description = Generic BERT-RPC server in Erlang | ||
|
@@ -4768,87 +4849,6 @@ ERLANG_MK_RECURSIVE_REL_DEPS_LIST = $(ERLANG_MK_TMP)/recursive-rel-deps-list.log | |
ERLANG_MK_RECURSIVE_TEST_DEPS_LIST = $(ERLANG_MK_TMP)/recursive-test-deps-list.log | ||
ERLANG_MK_RECURSIVE_SHELL_DEPS_LIST = $(ERLANG_MK_TMP)/recursive-shell-deps-list.log | ||
|
||
# Copyright (c) 2015-2017, Loïc Hoguin <[email protected]> | ||
# This file is part of erlang.mk and subject to the terms of the ISC License. | ||
|
||
.PHONY: distclean-kerl | ||
|
||
KERL_INSTALL_DIR ?= $(HOME)/erlang | ||
|
||
ifeq ($(strip $(KERL)),) | ||
KERL := $(ERLANG_MK_TMP)/kerl/kerl | ||
endif | ||
|
||
export KERL | ||
|
||
KERL_GIT ?= https://github.com/kerl/kerl | ||
KERL_COMMIT ?= master | ||
|
||
KERL_MAKEFLAGS ?= | ||
|
||
OTP_GIT ?= https://github.com/erlang/otp | ||
|
||
define kerl_otp_target | ||
ifeq ($(wildcard $(KERL_INSTALL_DIR)/$(1)),) | ||
$(KERL_INSTALL_DIR)/$(1): $(KERL) | ||
MAKEFLAGS="$(KERL_MAKEFLAGS)" $(KERL) build git $(OTP_GIT) $(1) $(1) | ||
$(KERL) install $(1) $(KERL_INSTALL_DIR)/$(1) | ||
endif | ||
endef | ||
|
||
define kerl_hipe_target | ||
ifeq ($(wildcard $(KERL_INSTALL_DIR)/$1-native),) | ||
$(KERL_INSTALL_DIR)/$1-native: $(KERL) | ||
KERL_CONFIGURE_OPTIONS=--enable-native-libs \ | ||
MAKEFLAGS="$(KERL_MAKEFLAGS)" $(KERL) build git $(OTP_GIT) $1 $1-native | ||
$(KERL) install $1-native $(KERL_INSTALL_DIR)/$1-native | ||
endif | ||
endef | ||
|
||
$(KERL): | ||
$(verbose) mkdir -p $(ERLANG_MK_TMP) | ||
$(gen_verbose) git clone --depth 1 $(KERL_GIT) $(ERLANG_MK_TMP)/kerl | ||
$(verbose) cd $(ERLANG_MK_TMP)/kerl && git checkout $(KERL_COMMIT) | ||
$(verbose) chmod +x $(KERL) | ||
|
||
distclean:: distclean-kerl | ||
|
||
distclean-kerl: | ||
$(gen_verbose) rm -rf $(KERL) | ||
|
||
# Allow users to select which version of Erlang/OTP to use for a project. | ||
|
||
ERLANG_OTP ?= | ||
ERLANG_HIPE ?= | ||
|
||
# Use kerl to enforce a specific Erlang/OTP version for a project. | ||
ifneq ($(strip $(ERLANG_OTP)),) | ||
export PATH := $(KERL_INSTALL_DIR)/$(ERLANG_OTP)/bin:$(PATH) | ||
SHELL := env PATH=$(PATH) $(SHELL) | ||
$(eval $(call kerl_otp_target,$(ERLANG_OTP))) | ||
|
||
# Build Erlang/OTP only if it doesn't already exist. | ||
ifeq ($(wildcard $(KERL_INSTALL_DIR)/$(ERLANG_OTP))$(BUILD_ERLANG_OTP),) | ||
$(info Building Erlang/OTP $(ERLANG_OTP)... Please wait...) | ||
$(shell $(MAKE) $(KERL_INSTALL_DIR)/$(ERLANG_OTP) ERLANG_OTP=$(ERLANG_OTP) BUILD_ERLANG_OTP=1 >&2) | ||
endif | ||
|
||
else | ||
# Same for a HiPE enabled VM. | ||
ifneq ($(strip $(ERLANG_HIPE)),) | ||
export PATH := $(KERL_INSTALL_DIR)/$(ERLANG_HIPE)-native/bin:$(PATH) | ||
SHELL := env PATH=$(PATH) $(SHELL) | ||
$(eval $(call kerl_hipe_target,$(ERLANG_HIPE))) | ||
|
||
# Build Erlang/OTP only if it doesn't already exist. | ||
ifeq ($(wildcard $(KERL_INSTALL_DIR)/$(ERLANG_HIPE))$(BUILD_ERLANG_OTP),) | ||
$(info Building HiPE-enabled Erlang/OTP $(ERLANG_OTP)... Please wait...) | ||
$(shell $(MAKE) $(KERL_INSTALL_DIR)/$(ERLANG_HIPE) ERLANG_HIPE=$(ERLANG_HIPE) BUILD_ERLANG_OTP=1 >&2) | ||
endif | ||
|
||
endif | ||
endif | ||
|
||
# Copyright (c) 2015-2016, Loïc Hoguin <[email protected]> | ||
# This file is part of erlang.mk and subject to the terms of the ISC License. | ||
|
||
|