Skip to content

Commit 90c2108

Browse files
hayzamjshayzamjs
committed
depends: update packages
1 parent ff30b8c commit 90c2108

File tree

5 files changed

+56
-85
lines changed

5 files changed

+56
-85
lines changed

‎contrib/depends/Makefile‎

Lines changed: 21 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
.NOTPARALLEL :
22

3+
# Pattern rule to print variables, e.g. make print-all_packages
4+
print-%: FORCE
5+
@echo '$($*)'
6+
37
SOURCES_PATH ?= $(BASEDIR)/sources
48
BASE_CACHE ?= $(BASEDIR)/built
59
FALLBACK_DOWNLOAD_PATH ?= https://downloads.getmonero.org/depends-sources
@@ -74,21 +78,6 @@ $(host_arch)_$(host_os)_prefix=$(BASEDIR)/$(host)
7478
$(host_arch)_$(host_os)_host=$(host)
7579
host_prefix=$($(host_arch)_$(host_os)_prefix)
7680
build_prefix=$(host_prefix)/native
77-
ifeq ($(host_os),mingw32)
78-
host_cmake=Windows
79-
endif
80-
ifeq ($(host_os),linux)
81-
host_cmake=Linux
82-
endif
83-
ifeq ($(host_os),freebsd)
84-
host_cmake=FreeBSD
85-
endif
86-
ifeq ($(host_os),darwin)
87-
host_cmake=Darwin
88-
endif
89-
ifeq ($(host_os),android)
90-
host_cmake=Android
91-
endif
9281

9382
AT_$(V):=
9483
AT_:=@
@@ -102,6 +91,7 @@ include builders/$(build_os).mk
10291
include builders/default.mk
10392
include packages/packages.mk
10493

94+
ifeq ($(GUIX_ENVIRONMENT),)
10595
build_id_string:=$(BUILD_ID_SALT)
10696
build_id_string+=$(shell $(build_CC) --version 2>/dev/null)
10797
build_id_string+=$(shell $(build_AR) --version 2>/dev/null)
@@ -115,6 +105,10 @@ $(host_arch)_$(host_os)_id_string+=$(shell $(host_AR) --version 2>/dev/null)
115105
$(host_arch)_$(host_os)_id_string+=$(shell $(host_CXX) --version 2>/dev/null)
116106
$(host_arch)_$(host_os)_id_string+=$(shell $(host_RANLIB) --version 2>/dev/null)
117107
$(host_arch)_$(host_os)_id_string+=$(shell $(host_STRIP) --version 2>/dev/null)
108+
else
109+
build_id_string:=$(realpath $(GUIX_ENVIRONMENT))
110+
$(host_arch)_$(host_os)_id_string:=$(realpath $(GUIX_ENVIRONMENT))
111+
endif
118112

119113
packages += $($(host_arch)_$(host_os)_packages) $($(host_os)_packages)
120114
native_packages += $($(host_arch)_$(host_os)_native_packages) $($(host_os)_native_packages)
@@ -127,18 +121,8 @@ $(host_arch)_$(host_os)_native_toolchain?=$($(host_os)_native_toolchain)
127121

128122
include funcs.mk
129123

130-
CONF_PKGS := cmake-conf mxe-conf
131-
132-
build-only-$(1)_$(3): CMAKE_RUNRESULT_FILE = $(PREFIX)/share/cmake/modules/TryRunResults.cmake
133-
build-only-$(1)_$(3): CMAKE_TOOLCHAIN_FILE = $(PREFIX)/$(3)/share/cmake/mxe-conf.cmake
134-
build-only-$(1)_$(3): CMAKE_TOOLCHAIN_DIR = $(PREFIX)/$(3)/share/cmake/mxe-conf.d
135-
build-only-$(1)_$(3): CMAKE_STATIC_BOOL = $(if $(findstring shared,$(3)),OFF,ON)
136-
build-only-$(1)_$(3): CMAKE_SHARED_BOOL = $(if $(findstring shared,$(3)),ON,OFF)
137-
138-
139124
toolchain_path=$($($(host_arch)_$(host_os)_native_toolchain)_prefixbin)
140-
final_build_id_long+=$(shell $(build_SHA256SUM) config.site.in)
141-
final_build_id_long+=$(shell $(build_SHA256SUM) toolchain.cmake.in)
125+
final_build_id_long+=:[sha256sum]:$(shell $(build_SHA256SUM) toolchain.cmake.in)
142126
final_build_id+=$(shell echo -n "$(final_build_id_long)" | $(build_SHA256SUM) | cut -c-$(HASH_LENGTH))
143127
$(host_prefix)/.stamp_$(final_build_id): $(native_packages) $(packages)
144128
$(AT)rm -rf $(@D)
@@ -148,31 +132,11 @@ $(host_prefix)/.stamp_$(final_build_id): $(native_packages) $(packages)
148132
$(AT)cd $(@D); $(foreach package,$^, tar xf $($(package)_cached); )
149133
$(AT)touch $@
150134

151-
$(host_prefix)/share/config.site : config.site.in $(host_prefix)/.stamp_$(final_build_id)
152-
$(AT)@mkdir -p $(@D)
153-
$(AT)sed -e 's|@HOST@|$(host)|' \
154-
-e 's|@CC@|$(toolchain_path)$(host_CC)|' \
155-
-e 's|@CXX@|$(toolchain_path)$(host_CXX)|' \
156-
-e 's|@AR@|$(toolchain_path)$(host_AR)|' \
157-
-e 's|@RANLIB@|$(toolchain_path)$(host_RANLIB)|' \
158-
-e 's|@NM@|$(toolchain_path)$(host_NM)|' \
159-
-e 's|@STRIP@|$(toolchain_path)$(host_STRIP)|' \
160-
-e 's|@build_os@|$(build_os)|' \
161-
-e 's|@host_os@|$(host_os)|' \
162-
-e 's|@CFLAGS@|$(strip $(host_CFLAGS) $(host_$(release_type)_CFLAGS))|' \
163-
-e 's|@CXXFLAGS@|$(strip $(host_CXXFLAGS) $(host_$(release_type)_CXXFLAGS))|' \
164-
-e 's|@CPPFLAGS@|$(strip $(host_CPPFLAGS) $(host_$(release_type)_CPPFLAGS))|' \
165-
-e 's|@LDFLAGS@|$(strip $(host_LDFLAGS) $(host_$(release_type)_LDFLAGS))|' \
166-
-e 's|@allow_host_packages@|$(ALLOW_HOST_PACKAGES)|' \
167-
-e 's|@debug@|$(DEBUG)|' \
168-
$< > $@
169-
$(AT)touch $@
170-
171135
$(host_prefix)/share/toolchain.cmake : toolchain.cmake.in $(host_prefix)/.stamp_$(final_build_id)
172136
$(AT)@mkdir -p $(@D)
173137
$(AT)sed -e 's|@HOST@|$(host)|' \
174-
-e 's|@CC@|$(toolchain_path)$(host_CC)|' \
175-
-e 's|@CXX@|$(toolchain_path)$(host_CXX)|' \
138+
-e 's|@CC@|$(host_CC)|' \
139+
-e 's|@CXX@|$(host_CXX)|' \
176140
-e 's|@AR@|$(toolchain_path)$(host_AR)|' \
177141
-e 's|@RANLIB@|$(toolchain_path)$(host_RANLIB)|' \
178142
-e 's|@NM@|$(toolchain_path)$(host_NM)|' \
@@ -187,7 +151,7 @@ $(host_prefix)/share/toolchain.cmake : toolchain.cmake.in $(host_prefix)/.stamp_
187151
-e 's|@debug@|$(DEBUG)|' \
188152
-e 's|@release_type@|$(cmake_release_type)|' \
189153
-e 's|@build_tests@|$(build_tests)|' \
190-
-e 's|@depends@|$(host_cmake)|' \
154+
-e 's|@cmake_system_name@|$($(host_os)_cmake_system)|' \
191155
-e 's|@prefix@|$($(host_arch)_$(host_os)_prefix)|'\
192156
-e 's|@arch@|$(host_arch)|'\
193157
$< > $@
@@ -212,24 +176,27 @@ check-packages:
212176
check-sources:
213177
@$(foreach package,$(all_packages),$(call check_or_remove_sources,$(package));)
214178

215-
$(host_prefix)/share/config.site: check-packages
216179
$(host_prefix)/share/toolchain.cmake: check-packages
217180

218181
check-packages: check-sources
219182

220-
install: check-packages $(host_prefix)/share/config.site
221183
install: check-packages $(host_prefix)/share/toolchain.cmake
222184

223185
download-one: check-sources $(all_sources)
224186

225187
download-osx:
226-
@$(MAKE) -s HOST=x86_64-apple-darwin11 download-one
188+
@$(MAKE) -s HOST=x86_64-apple-darwin download-one
227189
download-linux:
228190
@$(MAKE) -s HOST=x86_64-unknown-linux-gnu download-one
229191
download-win:
230192
@$(MAKE) -s HOST=x86_64-w64-mingw32 download-one
231-
download: download-osx download-linux download-win
193+
download-freebsd:
194+
@$(MAKE) -s HOST=x86_64-unknown-freebsd download-one
195+
download-android:
196+
@$(MAKE) -s HOST=aarch64-linux-android download-one
197+
download: download-osx download-linux download-win download-freebsd download-android
232198

233199
$(foreach package,$(all_packages),$(eval $(call ext_add_stages,$(package))))
234200

235-
.PHONY: install cached download-one download-osx download-linux download-win download check-packages check-sources
201+
.PHONY: install cached download-one download-osx download-linux download-win download-freebsd download-android download check-packages check-sources
202+
.PHONY: FORCE

‎contrib/depends/hosts/freebsd.mk‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
1-
freebsd_CC=clang-8
2-
freebsd_CXX=clang++-8
1+
clang_prog=$(shell $(SHELL) $(.SHELLFLAGS) "command -v clang")
2+
clangxx_prog=$(shell $(SHELL) $(.SHELLFLAGS) "command -v clang++")
3+
4+
freebsd_CC=env -u C_INCLUDE_PATH -u CPLUS_INCLUDE_PATH \
5+
-u OBJC_INCLUDE_PATH -u OBJCPLUS_INCLUDE_PATH -u CPATH \
6+
-u LIBRARY_PATH $(clang_prog) --target=$(host) --sysroot=$(host_prefix)/native -iwithsysroot/usr/include
7+
freebsd_CXX=env -u C_INCLUDE_PATH -u CPLUS_INCLUDE_PATH \
8+
-u OBJC_INCLUDE_PATH -u OBJCPLUS_INCLUDE_PATH -u CPATH \
9+
-u LIBRARY_PATH $(clangxx_prog) --target=$(host) -stdlib=libc++ --sysroot=$(host_prefix)/native \
10+
-iwithsysroot/usr/include/c++/v1 -iwithsysroot/usr/include
11+
312
freebsd_AR=ar
413
freebsd_RANLIB=ranlib
514
freebsd_NM=nm
@@ -16,3 +25,4 @@ freebsd_debug_CXXFLAGS=$(freebsd_debug_CFLAGS)
1625

1726
freebsd_native_toolchain=freebsd_base
1827

28+
freebsd_cmake_system=FreeBSD

‎contrib/depends/packages/android_ndk.mk‎

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,15 @@
11
package=android_ndk
2-
$(package)_version=17b
2+
$(package)_version=27c
33
$(package)_download_path=https://dl.google.com/android/repository/
4-
$(package)_file_name=android-ndk-r$($(package)_version)-linux-x86_64.zip
5-
$(package)_sha256_hash=5dfbbdc2d3ba859fed90d0e978af87c71a91a5be1f6e1c40ba697503d48ccecd
6-
7-
define $(package)_set_vars
8-
$(package)_config_opts_arm=--arch arm
9-
$(package)_config_opts_aarch64=--arch arm64
10-
endef
4+
$(package)_file_name=android-ndk-r$($(package)_version)-linux.zip
5+
$(package)_sha256_hash=59c2f6dc96743b5daf5d1626684640b20a6bd2b1d85b13156b90333741bad5cc
116

127
define $(package)_extract_cmds
138
echo $($(package)_sha256_hash) $($(1)_source_dir)/$($(package)_file_name) | sha256sum -c &&\
149
unzip -q $($(1)_source_dir)/$($(package)_file_name)
1510
endef
1611

1712
define $(package)_stage_cmds
18-
android-ndk-r$($(package)_version)/build/tools/make_standalone_toolchain.py --api 21 \
19-
--install-dir $(build_prefix) --stl=libc++ $($(package)_config_opts) &&\
20-
mv $(build_prefix) $($(package)_staging_dir)/$(host_prefix)
13+
mkdir -p $($(package)_staging_prefix_dir) && \
14+
mv android-ndk-r$($(package)_version)/toolchains/llvm/prebuilt/linux-x86_64/* $($(package)_staging_prefix_dir)
2115
endef
22-

‎contrib/depends/packages/darwin_sdk.mk‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
package=darwin_sdk
2-
$(package)_version=11.1
3-
$(package)_download_path=https://github.com/phracker/MacOSX-SDKs/releases/download/11.3/
4-
$(package)_file_name=MacOSX$($(package)_version).sdk.tar.xz
5-
$(package)_sha256_hash=68797baaacb52f56f713400de306a58a7ca00b05c3dc6d58f0a8283bcac721f8
2+
$(package)_version=12.2
3+
$(package)_download_path=https://bitcoincore.org/depends-sources/sdks
4+
$(package)_file_name=Xcode-12.2-12B45b-extracted-SDK-with-libcxx-headers.tar.gz
5+
$(package)_sha256_hash=df75d30ecafc429e905134333aeae56ac65fac67cb4182622398fd717df77619
6+
7+
# Prevent clang from including readline headers from the SDK. We statically link
8+
# our own version of readline.
69

710
define $(package)_stage_cmds
8-
mkdir -p $($(package)_staging_dir)/$(host_prefix)/native/SDK &&\
9-
mv * $($(package)_staging_dir)/$(host_prefix)/native/SDK
11+
mkdir -p $($(package)_staging_prefix_dir)/SDK &&\
12+
rm -rf usr/include/readline && \
13+
mv * $($(package)_staging_prefix_dir)/SDK
1014
endef

‎contrib/depends/packages/freebsd_base.mk‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,20 @@
11
package=freebsd_base
2-
$(package)_version=11.3
3-
$(package)_download_path=https://download.freebsd.org/ftp/releases/amd64/$($(package)_version)-RELEASE/
2+
$(package)_version=12.3
3+
$(package)_download_path=https://archive.freebsd.org/old-releases/amd64/$($(package)_version)-RELEASE/
44
$(package)_download_file=base.txz
55
$(package)_file_name=freebsd-base-$($(package)_version).txz
6-
$(package)_sha256_hash=4599023ac136325b86f2fddeec64c1624daa83657e40b00b2ef944c81463a4ff
6+
$(package)_sha256_hash=e85b256930a2fbc04b80334106afecba0f11e52e32ffa197a88d7319cf059840
77

88
define $(package)_extract_cmds
99
echo $($(package)_sha256_hash) $($(1)_source_dir)/$($(package)_file_name) | sha256sum -c &&\
1010
tar xf $($(1)_source_dir)/$($(package)_file_name) ./lib/ ./usr/lib/ ./usr/include/
1111
endef
1212

13-
define $(package)_build_cmds
14-
mkdir bin &&\
15-
echo "#!/bin/sh\n\nexec /usr/bin/clang-8 -target x86_64-unknown-freebsd$($(package)_version) --sysroot=$(host_prefix)/native $$$$""@" > bin/clang-8 &&\
16-
echo "#!/bin/sh\n\nexec /usr/bin/clang++-8 -target x86_64-unknown-freebsd$($(package)_version) --sysroot=$(host_prefix)/native $$$$""@" > bin/clang++-8 &&\
17-
chmod 755 bin/*
18-
endef
13+
# Prevent clang from including OpenSSL headers from the system base. We
14+
# statically link our own version of OpenSSL.
1915

2016
define $(package)_stage_cmds
21-
mkdir $($(package)_staging_dir)/$(host_prefix)/native &&\
22-
mv bin lib usr $($(package)_staging_dir)/$(host_prefix)/native
17+
mkdir $($(package)_staging_prefix_dir) &&\
18+
rm -rf usr/include/openssl &&\
19+
mv lib usr $($(package)_staging_prefix_dir)
2320
endef

0 commit comments

Comments
 (0)