Skip to content

Commit 3782019

Browse files
kgrytekgryte
committed
Move recipes
1 parent c8c666e commit 3782019

File tree

5 files changed

+12
-7
lines changed

5 files changed

+12
-7
lines changed

‎tools/make/lib/install/Makefile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020

2121
# Note: keep in alphabetical order...
2222
include $(TOOLS_MAKE_LIB_DIR)/install/boost.mk
23+
include $(TOOLS_MAKE_LIB_DIR)/install/cephes.mk
2324
include $(TOOLS_MAKE_LIB_DIR)/install/electron.mk
2425
include $(TOOLS_MAKE_LIB_DIR)/install/node.mk
2526

tools/make/lib/deps/cephes.mk renamed to tools/make/lib/install/cephes.mk

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@
1919
# DEPENDENCIES #
2020

2121
ifeq ($(DEPS_CEPHES_DIST), netlib)
22-
include $(TOOLS_MAKE_LIB_DIR)/deps/cephes_netlib.mk
22+
include $(TOOLS_MAKE_LIB_DIR)/install/cephes_netlib.mk
2323
else
2424
ifeq ($(DEPS_CEPHES_DIST), cephes-2.8)
25-
include $(TOOLS_MAKE_LIB_DIR)/deps/cephes_2_8.mk
25+
include $(TOOLS_MAKE_LIB_DIR)/install/cephes_2_8.mk
2626
else
2727
ifeq ($(DEPS_CEPHES_DIST), moshier)
28-
include $(TOOLS_MAKE_LIB_DIR)/deps/cephes_moshier.mk
28+
include $(TOOLS_MAKE_LIB_DIR)/install/cephes_moshier.mk
2929
endif
3030
endif
3131
endif

tools/make/lib/deps/cephes_2_8.mk renamed to tools/make/lib/install/cephes_2_8.mk

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ DEPS_CEPHES_URL ?= http://www.moshier.net/cephes-math-28.tar.gz
2424
# Determine the basename for the download:
2525
deps_cephes_basename := $(notdir $(DEPS_CEPHES_URL))
2626

27-
# Define the path to the file containing a checksum verify a download:
28-
DEPS_CEPHES_CHECKSUM ?= $(shell cat $(DEPS_CHECKSUMS_DIR)/$(subst -,_,$(subst .,_,$(deps_cephes_basename)))/sha256)
27+
# Define the path to the file containing a checksum to verify a download:
28+
DEPS_CEPHES_CHECKSUM ?= $(shell $(CAT) $(DEPS_CHECKSUMS_DIR)/$(subst -,_,$(subst .,_,$(deps_cephes_basename)))/sha256)
2929

3030
# Define the output path when downloading:
3131
DEPS_CEPHES_DOWNLOAD_OUT ?= $(DEPS_TMP_DIR)/$(deps_cephes_basename)
@@ -182,6 +182,7 @@ $(DEPS_CEPHES_TEST_INSTALL_OUT): $(deps_cephes_build_out) $(DEPS_CEPHES_TEST_OUT
182182
# Downloads a Cephes distribution.
183183
#
184184
# @private
185+
#
185186
# @example
186187
# make deps-download-cephes
187188
#/
@@ -193,6 +194,7 @@ deps-download-cephes: $(DEPS_CEPHES_DOWNLOAD_OUT)
193194
# Verifies a downloaded Cephes distribution.
194195
#
195196
# @private
197+
#
196198
# @example
197199
# make deps-verify-cephes
198200
#/
@@ -206,6 +208,7 @@ deps-verify-cephes: deps-download-cephes
206208
# Extracts a downloaded Cephes distribution.
207209
#
208210
# @private
211+
#
209212
# @example
210213
# make deps-extract-cephes
211214
#/
@@ -217,6 +220,7 @@ deps-extract-cephes: $(deps_cephes_build_out)
217220
# Tests a Cephes installation.
218221
#
219222
# @private
223+
#
220224
# @example
221225
# make deps-test-cephes
222226
#/

tools/make/lib/deps/cephes_moshier.mk renamed to tools/make/lib/install/cephes_moshier.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ DEPS_CEPHES_URL ?= http://www.moshier.net/
2525
deps_cephes_basename := moshier_cephes
2626

2727
# Define the checksum(s) to verify downloaded libraries:
28-
DEPS_CEPHES_CHECKSUM ?= $(foreach file,$(filter-out 128bit,$(DEPS_CEPHES_LIBS)),$(shell cat $(DEPS_CHECKSUMS_DIR)/$(subst .,_,$(deps_cephes_basename)_$(file).zip)/sha256)) $(foreach file,$(filter 128bit,$(DEPS_CEPHES_LIBS)),$(shell cat $(DEPS_CHECKSUMS_DIR)/$(subst .,_,$(deps_cephes_basename)_$(file).tgz)/sha256))
28+
DEPS_CEPHES_CHECKSUM ?= $(foreach file,$(filter-out 128bit,$(DEPS_CEPHES_LIBS)),$(shell $(CAT) $(DEPS_CHECKSUMS_DIR)/$(subst .,_,$(deps_cephes_basename)_$(file).zip)/sha256)) $(foreach file,$(filter 128bit,$(DEPS_CEPHES_LIBS)),$(shell $(CAT) $(DEPS_CHECKSUMS_DIR)/$(subst .,_,$(deps_cephes_basename)_$(file).tgz)/sha256))
2929

3030
# Define the output directory when downloading:
3131
DEPS_CEPHES_DOWNLOAD_OUT ?= $(DEPS_TMP_DIR)/$(deps_cephes_basename)

tools/make/lib/deps/cephes_netlib.mk renamed to tools/make/lib/install/cephes_netlib.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ DEPS_CEPHES_URL ?= http://www.netlib.org/cephes/
2525
deps_cephes_basename := netlib_cephes
2626

2727
# Define the checksum(s) to verify downloaded libraries:
28-
DEPS_CEPHES_CHECKSUM ?= $(foreach file,$(DEPS_CEPHES_LIBS),$(shell cat $(DEPS_CHECKSUMS_DIR)/$(subst .,_,$(deps_cephes_basename)_$(file).tgz)/sha256))
28+
DEPS_CEPHES_CHECKSUM ?= $(foreach file,$(DEPS_CEPHES_LIBS),$(shell $(CAT) $(DEPS_CHECKSUMS_DIR)/$(subst .,_,$(deps_cephes_basename)_$(file).tgz)/sha256))
2929

3030
# Define the output directory when downloading:
3131
DEPS_CEPHES_DOWNLOAD_OUT ?= $(DEPS_TMP_DIR)/$(deps_cephes_basename)

0 commit comments

Comments
 (0)