diff options
| author | cyan <cyjan@mrcyjanek.net> | 2024-11-14 17:55:20 +0000 |
|---|---|---|
| committer | cyan <cyjan@mrcyjanek.net> | 2024-11-14 17:55:20 +0000 |
| commit | f8a6716e00f62a9985f73c4837c904eca3b71275 (patch) | |
| tree | 4f219f128472bfc13e52cc2ea1de9e2081d888df | |
| parent | 9060109354c9989172262e899286a6e8672d2b8c (diff) | |
fix package name
migrate mirror to my own hostin
change download mirror priority (fallback first)
| -rwxr-xr-x | build_single.sh | 7 | ||||
| -rw-r--r-- | contrib/depends/Makefile | 2 | ||||
| -rw-r--r-- | contrib/depends/funcs.mk | 4 | ||||
| -rw-r--r-- | contrib/depends/packages/native_clang.mk | 2 |
4 files changed, 8 insertions, 7 deletions
diff --git a/build_single.sh b/build_single.sh index 975cdf8..5893312 100755 --- a/build_single.sh +++ b/build_single.sh @@ -337,10 +337,11 @@ pushd release/$repo APPENDIX="" if [[ "${HOST_ABI}" == "x86_64-w64-mingw32" || "${HOST_ABI}" == "i686-w64-mingw32" ]]; then + echo "TODO: check if it's still needed" APPENDIX="${APPENDIX}dll" - cp ../../$repo/build/${HOST_ABI}/external/polyseed/libpolyseed.${APPENDIX} ${HOST_ABI}_libpolyseed.${APPENDIX} - rm ${HOST_ABI}_libpolyseed.${APPENDIX}.xz || true - xz -e ${HOST_ABI}_libpolyseed.${APPENDIX} + # cp ../../$repo/build/${HOST_ABI}/external/polyseed/libpolyseed.${APPENDIX} ${HOST_ABI}_libpolyseed.${APPENDIX} + # rm ${HOST_ABI}_libpolyseed.${APPENDIX}.xz || true + # xz -e ${HOST_ABI}_libpolyseed.${APPENDIX} elif [[ "${HOST_ABI}" == "x86_64-apple-darwin11" || "${HOST_ABI}" == "aarch64-apple-darwin11" || "${HOST_ABI}" == "host-apple-darwin" || "${HOST_ABI}" == "x86_64-host-apple-darwin" || "${HOST_ABI}" == "aarch64-host-apple-darwin" || "${HOST_ABI}" == "host-apple-ios" ]]; then APPENDIX="${APPENDIX}dylib" diff --git a/contrib/depends/Makefile b/contrib/depends/Makefile index 09cb177..d0854d7 100644 --- a/contrib/depends/Makefile +++ b/contrib/depends/Makefile @@ -2,7 +2,7 @@ SOURCES_PATH ?= $(BASEDIR)/sources BASE_CACHE ?= $(BASEDIR)/built -FALLBACK_DOWNLOAD_PATH ?= https://static.mrcyjanek.net/.download_mirror +FALLBACK_DOWNLOAD_PATH ?= https://static.mrcyjanek.net/download_mirror/ BUILD = $(shell ./config.guess) HOST ?= $(BUILD) diff --git a/contrib/depends/funcs.mk b/contrib/depends/funcs.mk index 574a8ed..5e31428 100644 --- a/contrib/depends/funcs.mk +++ b/contrib/depends/funcs.mk @@ -31,8 +31,8 @@ endef define fetch_file ( test -f $$($(1)_source_dir)/$(4) || \ - ( $(call fetch_file_inner,$(1),$(2),$(3),$(4),$(5)) || \ - $(call fetch_file_inner,$(1),$(FALLBACK_DOWNLOAD_PATH),$(4),$(4),$(5)))) + ( $(call fetch_file_inner,$(1),$(FALLBACK_DOWNLOAD_PATH),$(4),$(4),$(5)) || \ + $(call fetch_file_inner,$(1),$(2),$(3),$(4),$(5)))) endef define int_get_build_recipe_hash diff --git a/contrib/depends/packages/native_clang.mk b/contrib/depends/packages/native_clang.mk index 115f8f3..79523ae 100644 --- a/contrib/depends/packages/native_clang.mk +++ b/contrib/depends/packages/native_clang.mk @@ -2,7 +2,7 @@ package=native_clang $(package)_version=9.0.0 $(package)_download_path=https://releases.llvm.org/$($(package)_version) $(package)_download_file=clang+llvm-$($(package)_version)-x86_64-linux-gnu-ubuntu-18.04.tar.xz -$(package)_file_name=clang-llvm-$($(package)_version)-x86_64-linux-gnu-ubuntu-18.04.tar.xz +$(package)_file_name=clang+llvm-$($(package)_version)-x86_64-linux-gnu-ubuntu-18.04.tar.xz $(package)_sha256_hash=a23b082b30c128c9831dbdd96edad26b43f56624d0ad0ea9edec506f5385038d define $(package)_extract_cmds |