highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-06-06 05:00:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge #21337: guix: Update darwin native packages dependencies

Browse Source 
c967fb7fb97a86fc434912d0fff621f9f50dfe80 guix: Remove libcap from manifest (Hennadii Stepanov)
7bbb409314c63750a9731dedaaf6dd6ecd17d988 guix: Update darwin native packages dependencies (Hennadii Stepanov)

Pull request description:

  It is a #20470 follow up.

ACKs for top commit:
  fanquake:
    ACK c967fb7fb97a86fc434912d0fff621f9f50dfe80

Tree-SHA512: 66ce05770f578ba61a44c58747c5a2669f425a989ed987838058bd86e3b49e342ac5a4f8852fc49f2b3a86b58fb6a340fdf3e34c1fc19bdab910729febba4bc7
This commit is contained in:
Wladimir J. van der Laan 2021-03-04 15:44:21 +01:00
commit b4d22654fe
No known key found for this signature in database
GPG Key ID: 1E4AED62986CD25D
2 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
contrib/guix/libexec/build.sh
View File

@ -58,17 +58,10 @@ unset C_INCLUDE_PATH
unset CPLUS_INCLUDE_PATH unset CPLUS_INCLUDE_PATH
case "$HOST" in case "$HOST" in
*darwin*) *darwin*)
# When targeting darwin, some native tools built by depends require # When targeting darwin, zlib is required by native_libdmg-hfsplus.
# native packages not incorporated in depends zlib_store_path=$(store_path "zlib")
# export LIBRARY_PATH="${zlib_store_path}/lib:${LIBRARY_PATH}"
# libcap required by native_cdrkit/wodim export CPATH="${zlib_store_path}/include:${CPATH}"
# zlib, bzip2 required by native_cdrkit/genisoimage
for native_pkg in libcap zlib bzip2; do
native_pkg_store_path=$(store_path "$native_pkg")
export LIBRARY_PATH="${native_pkg_store_path}/lib:${LIBRARY_PATH}"
export CPATH="${native_pkg_store_path}/include:${CPATH}"
done
;;
esac esac
# Set environment variables to point the CROSS toolchain to the right # Set environment variables to point the CROSS toolchain to the right

2
contrib/guix/manifest.scm
View File

@ -235,5 +235,5 @@ chain for " target " development."))
((string-contains target "-linux-") ((string-contains target "-linux-")
(list (make-bitcoin-cross-toolchain target))) (list (make-bitcoin-cross-toolchain target)))
((string-contains target "darwin") ((string-contains target "darwin")
(list clang-8 libcap binutils imagemagick libtiff librsvg font-tuffy cmake xorriso)) (list clang-8 binutils imagemagick libtiff librsvg font-tuffy cmake xorriso))
(else '()))))) (else '())))))