From bfd924f10f6aac322b3052dced055c272c1ec6a6 Mon Sep 17 00:00:00 2001 From: woclass Date: Wed, 15 Jun 2022 22:30:28 +0800 Subject: [PATCH 1/6] deps/blastrampoline: pass cross compile flags to make --- deps/blastrampoline.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/deps/blastrampoline.mk b/deps/blastrampoline.mk index bde21174a12a6..edbbf7ed4db42 100644 --- a/deps/blastrampoline.mk +++ b/deps/blastrampoline.mk @@ -6,12 +6,14 @@ BLASTRAMPOLINE_GIT_URL := https://github.com/JuliaLinearAlgebra/libblastrampolin BLASTRAMPOLINE_TAR_URL = https://api.github.com/repos/JuliaLinearAlgebra/libblastrampoline/tarball/$1 $(eval $(call git-external,blastrampoline,BLASTRAMPOLINE,,,$(BUILDDIR))) +BLASTRAMPOLINE_BUILD_OPTS := $(MAKE_COMMON) CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" + $(BUILDDIR)/$(BLASTRAMPOLINE_SRC_DIR)/build-configured: $(BUILDDIR)/$(BLASTRAMPOLINE_SRC_DIR)/source-extracted mkdir -p $(dir $@) echo 1 > $@ $(BUILDDIR)/$(BLASTRAMPOLINE_SRC_DIR)/build-compiled: $(BUILDDIR)/$(BLASTRAMPOLINE_SRC_DIR)/build-configured - cd $(dir $@)/src && $(MAKE) $(MAKE_COMMON) + cd $(dir $@)/src && $(MAKE) $(BLASTRAMPOLINE_BUILD_OPTS) echo 1 > $@ define BLASTRAMPOLINE_INSTALL From bbdbc2da6735c72a31d3b13a904c48f865b979d7 Mon Sep 17 00:00:00 2001 From: woclass Date: Fri, 17 Jun 2022 10:51:35 +0800 Subject: [PATCH 2/6] deps/blastrampoline: pass `ARCH` and `OS` to make Co-Authored-By: Jameson Nash --- deps/blastrampoline.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/deps/blastrampoline.mk b/deps/blastrampoline.mk index edbbf7ed4db42..f2d31985879f2 100644 --- a/deps/blastrampoline.mk +++ b/deps/blastrampoline.mk @@ -7,6 +7,7 @@ BLASTRAMPOLINE_TAR_URL = https://api.github.com/repos/JuliaLinearAlgebra/libblas $(eval $(call git-external,blastrampoline,BLASTRAMPOLINE,,,$(BUILDDIR))) BLASTRAMPOLINE_BUILD_OPTS := $(MAKE_COMMON) CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" +BLASTRAMPOLINE_BUILD_OPTS += ARCH="$(ARCH)" OS="$(OS)" $(BUILDDIR)/$(BLASTRAMPOLINE_SRC_DIR)/build-configured: $(BUILDDIR)/$(BLASTRAMPOLINE_SRC_DIR)/source-extracted mkdir -p $(dir $@) From 6eccb4e803a6e7d1aa785e49172c3609103ad53e Mon Sep 17 00:00:00 2001 From: woclass Date: Fri, 17 Jun 2022 11:34:02 +0800 Subject: [PATCH 3/6] deps/blastrampoline: remove trailing space --- deps/blastrampoline.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/blastrampoline.mk b/deps/blastrampoline.mk index f2d31985879f2..cf484013230ed 100644 --- a/deps/blastrampoline.mk +++ b/deps/blastrampoline.mk @@ -18,7 +18,7 @@ $(BUILDDIR)/$(BLASTRAMPOLINE_SRC_DIR)/build-compiled: $(BUILDDIR)/$(BLASTRAMPOLI echo 1 > $@ define BLASTRAMPOLINE_INSTALL - $(MAKE) -C $(BUILDDIR)/$(BLASTRAMPOLINE_SRC_DIR)/src $(MAKE_COMMON) install DESTDIR="$2" + $(MAKE) -C $(BUILDDIR)/$(BLASTRAMPOLINE_SRC_DIR)/src install $(MAKE_COMMON) DESTDIR="$2" endef $(eval $(call staged-install, \ blastrampoline,$(BLASTRAMPOLINE_SRC_DIR), \ From b44aee5dfa4a6abf67313b3881c07bb1d0ce6f63 Mon Sep 17 00:00:00 2001 From: woclass Date: Sun, 3 Jul 2022 17:47:39 +0800 Subject: [PATCH 4/6] deps/blastrampoline: pass cross compile flags to `make install` --- deps/blastrampoline.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/blastrampoline.mk b/deps/blastrampoline.mk index cf484013230ed..8d1c73cff404d 100644 --- a/deps/blastrampoline.mk +++ b/deps/blastrampoline.mk @@ -18,7 +18,7 @@ $(BUILDDIR)/$(BLASTRAMPOLINE_SRC_DIR)/build-compiled: $(BUILDDIR)/$(BLASTRAMPOLI echo 1 > $@ define BLASTRAMPOLINE_INSTALL - $(MAKE) -C $(BUILDDIR)/$(BLASTRAMPOLINE_SRC_DIR)/src install $(MAKE_COMMON) DESTDIR="$2" + $(MAKE) -C $(BUILDDIR)/$(BLASTRAMPOLINE_SRC_DIR)/src install $(BLASTRAMPOLINE_BUILD_OPTS) DESTDIR="$2" endef $(eval $(call staged-install, \ blastrampoline,$(BLASTRAMPOLINE_SRC_DIR), \ From 09b9e07f5e7b43552603b6975dd4c71b7b073f7e Mon Sep 17 00:00:00 2001 From: woclass Date: Wed, 6 Jul 2022 00:02:38 +0800 Subject: [PATCH 5/6] deps/blastrampoline: use hardlink for win --- deps/blastrampoline.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/deps/blastrampoline.mk b/deps/blastrampoline.mk index 8d1c73cff404d..30d444dc6a70e 100644 --- a/deps/blastrampoline.mk +++ b/deps/blastrampoline.mk @@ -13,12 +13,18 @@ $(BUILDDIR)/$(BLASTRAMPOLINE_SRC_DIR)/build-configured: $(BUILDDIR)/$(BLASTRAMPO mkdir -p $(dir $@) echo 1 > $@ +BLASTRAMPOLINE_BUILD_ROOT := $(BUILDDIR)/$(BLASTRAMPOLINE_SRC_DIR)/src $(BUILDDIR)/$(BLASTRAMPOLINE_SRC_DIR)/build-compiled: $(BUILDDIR)/$(BLASTRAMPOLINE_SRC_DIR)/build-configured cd $(dir $@)/src && $(MAKE) $(BLASTRAMPOLINE_BUILD_OPTS) +ifeq ($(OS), WINNT) + # Windows doesn't like soft link, use hard link + cd $(BLASTRAMPOLINE_BUILD_ROOT)/build/ && \ + cp -f --dereference --link libblastrampoline.dll libblastrampoline.dll +endif echo 1 > $@ define BLASTRAMPOLINE_INSTALL - $(MAKE) -C $(BUILDDIR)/$(BLASTRAMPOLINE_SRC_DIR)/src install $(BLASTRAMPOLINE_BUILD_OPTS) DESTDIR="$2" + $(MAKE) -C $(BLASTRAMPOLINE_BUILD_ROOT) install $(BLASTRAMPOLINE_BUILD_OPTS) DESTDIR="$2" endef $(eval $(call staged-install, \ blastrampoline,$(BLASTRAMPOLINE_SRC_DIR), \ From fa3309251d8d7bde980840596d9271a2175e2f6b Mon Sep 17 00:00:00 2001 From: woclass Date: Wed, 6 Jul 2022 00:03:33 +0800 Subject: [PATCH 6/6] deps/blastrampoline: add `clean-blastrampoline` target --- deps/blastrampoline.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/deps/blastrampoline.mk b/deps/blastrampoline.mk index 30d444dc6a70e..a7fe342e9eee6 100644 --- a/deps/blastrampoline.mk +++ b/deps/blastrampoline.mk @@ -32,6 +32,11 @@ $(eval $(call staged-install, \ $$(BLASTRAMPOLINE_OBJ_TARGET), \ $$(INSTALL_NAME_CMD)libblastrampoline.$$(SHLIB_EXT) $$(build_shlibdir)/libblastrampoline.$$(SHLIB_EXT))) +clean-blastrampoline: + -$(MAKE) -C $(BLASTRAMPOLINE_BUILD_ROOT) clean + -$(RM) $(BUILDDIR)/$(BLASTRAMPOLINE_SRC_DIR)/build-compiled \ + $(BUILDDIR)/$(BLASTRAMPOLINE_SRC_DIR)/build-configured + get-blastrampoline: $(BLASTRAMPOLINE_SRC_FILE) extract-blastrampoline: $(BUILDDIR)/$(BLASTRAMPOLINE_SRC_DIR)/source-extracted configure-blastrampoline: extract-blastrampoline