diff options
| author | merge-script <fanquake@gmail.com> | 2024-09-12 10:17:08 +0100 |
|---|---|---|
| committer | merge-script <fanquake@gmail.com> | 2024-09-12 10:17:08 +0100 |
| commit | a86e7a476d505a4f8122f6d6d5bebcb20ae1f031 (patch) | |
| tree | 3682cae168829f43adb77b6899b4ea1a8ca7cd0f | |
| parent | f0eb63399a8f4b9d6329cc827e12e96d1ed3c8f5 (diff) | |
| parent | 5ba03e7d35e1b47ba864c9ae3c94af97cd3ae10b (diff) | |
| download | bitcoin-a86e7a476d505a4f8122f6d6d5bebcb20ae1f031.tar.xz | |
Merge bitcoin/bitcoin#30838: build: Use CMake's default permissions in macOS `deploy` target
5ba03e7d35e1b47ba864c9ae3c94af97cd3ae10b 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 https://github.com/bitcoin/bitcoin/issues/30815.
ACKs for top commit:
fanquake:
ACK 5ba03e7d35e1b47ba864c9ae3c94af97cd3ae10b - I'm going to merge this now so we return to usable (comparable) guix builds.
Tree-SHA512: 78f724cd3ffd5c1fd5fc1b4832f1e8154c62723f3de5ac9599f44715cbd08a3dfbb806801411c55069773d2e34c9f8cab25585dbad2f032c36b68dd83cb51847
| -rw-r--r-- | cmake/module/Maintenance.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmake/module/Maintenance.cmake b/cmake/module/Maintenance.cmake index a232a9fc1e..456419b722 100644 --- a/cmake/module/Maintenance.cmake +++ b/cmake/module/Maintenance.cmake @@ -92,11 +92,11 @@ function(add_macos_deploy_target) if(CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND TARGET bitcoin-qt) set(macos_app "Bitcoin-Qt.app") # Populate Contents subdirectory. - configure_file(${PROJECT_SOURCE_DIR}/share/qt/Info.plist.in ${macos_app}/Contents/Info.plist USE_SOURCE_PERMISSIONS) + configure_file(${PROJECT_SOURCE_DIR}/share/qt/Info.plist.in ${macos_app}/Contents/Info.plist NO_SOURCE_PERMISSIONS) file(CONFIGURE OUTPUT ${macos_app}/Contents/PkgInfo CONTENT "APPL????") # Populate Contents/Resources subdirectory. file(CONFIGURE OUTPUT ${macos_app}/Contents/Resources/empty.lproj CONTENT "") - configure_file(${PROJECT_SOURCE_DIR}/src/qt/res/icons/bitcoin.icns ${macos_app}/Contents/Resources/bitcoin.icns USE_SOURCE_PERMISSIONS COPYONLY) + configure_file(${PROJECT_SOURCE_DIR}/src/qt/res/icons/bitcoin.icns ${macos_app}/Contents/Resources/bitcoin.icns NO_SOURCE_PERMISSIONS COPYONLY) file(CONFIGURE OUTPUT ${macos_app}/Contents/Resources/Base.lproj/InfoPlist.strings CONTENT "{ CFBundleDisplayName = \"@PACKAGE_NAME@\"; CFBundleName = \"@PACKAGE_NAME@\"; }" ) |