Skip to content

Commit a86e7a4

Browse files
committed
Merge bitcoin/bitcoin#30838: build: Use CMake's default permissions in macOS deploy target
5ba03e7 build: Use CMake's default permissions in macOS `deploy` target (Hennadii Stepanov) Pull request description: This PR ensures that the file permissions in macOS `zip` archives are independent of the user's `umask` value. Fixes bitcoin/bitcoin#30815. ACKs for top commit: fanquake: ACK 5ba03e7 - I'm going to merge this now so we return to usable (comparable) guix builds. Tree-SHA512: 78f724cd3ffd5c1fd5fc1b4832f1e8154c62723f3de5ac9599f44715cbd08a3dfbb806801411c55069773d2e34c9f8cab25585dbad2f032c36b68dd83cb51847
2 parents f0eb633 + 5ba03e7 commit a86e7a4

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

cmake/module/Maintenance.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,11 +92,11 @@ function(add_macos_deploy_target)
9292
if(CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND TARGET bitcoin-qt)
9393
set(macos_app "Bitcoin-Qt.app")
9494
# Populate Contents subdirectory.
95-
configure_file(${PROJECT_SOURCE_DIR}/share/qt/Info.plist.in ${macos_app}/Contents/Info.plist USE_SOURCE_PERMISSIONS)
95+
configure_file(${PROJECT_SOURCE_DIR}/share/qt/Info.plist.in ${macos_app}/Contents/Info.plist NO_SOURCE_PERMISSIONS)
9696
file(CONFIGURE OUTPUT ${macos_app}/Contents/PkgInfo CONTENT "APPL????")
9797
# Populate Contents/Resources subdirectory.
9898
file(CONFIGURE OUTPUT ${macos_app}/Contents/Resources/empty.lproj CONTENT "")
99-
configure_file(${PROJECT_SOURCE_DIR}/src/qt/res/icons/bitcoin.icns ${macos_app}/Contents/Resources/bitcoin.icns USE_SOURCE_PERMISSIONS COPYONLY)
99+
configure_file(${PROJECT_SOURCE_DIR}/src/qt/res/icons/bitcoin.icns ${macos_app}/Contents/Resources/bitcoin.icns NO_SOURCE_PERMISSIONS COPYONLY)
100100
file(CONFIGURE OUTPUT ${macos_app}/Contents/Resources/Base.lproj/InfoPlist.strings
101101
CONTENT "{ CFBundleDisplayName = \"@PACKAGE_NAME@\"; CFBundleName = \"@PACKAGE_NAME@\"; }"
102102
)

0 commit comments

Comments
 (0)