diff options
Diffstat (limited to 'nixpkgs/pkgs/development/compilers/ponyc/make-safe-for-sandbox.patch')
| -rw-r--r-- | nixpkgs/pkgs/development/compilers/ponyc/make-safe-for-sandbox.patch | 33 |
1 files changed, 20 insertions, 13 deletions
diff --git a/nixpkgs/pkgs/development/compilers/ponyc/make-safe-for-sandbox.patch b/nixpkgs/pkgs/development/compilers/ponyc/make-safe-for-sandbox.patch index 8190cc2ee02e..796bbf81f4d4 100644 --- a/nixpkgs/pkgs/development/compilers/ponyc/make-safe-for-sandbox.patch +++ b/nixpkgs/pkgs/development/compilers/ponyc/make-safe-for-sandbox.patch @@ -1,28 +1,28 @@ ---- a/lib/CMakeLists.txt.orig 2021-07-07 13:40:20.209410160 -0400 -+++ a/lib/CMakeLists.txt 2021-07-07 13:43:11.886969662 -0400 +--- a/lib/CMakeLists.txt.orig 2021-10-01 13:04:00.867762912 -0400 ++++ a/lib/CMakeLists.txt 2021-10-01 13:06:21.220023453 -0400 @@ -15,12 +15,12 @@ endif() ExternalProject_Add(gbenchmark - URL ${PONYC_GBENCHMARK_URL} -+ SOURCE_DIR gbenchmark-prefix/src/benchmark ++ SOURCE_DIR gbenchmark-prefix/src/benchmark CMAKE_ARGS -DCMAKE_BUILD_TYPE=${PONYC_LIBS_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} -DBENCHMARK_ENABLE_GTEST_TESTS=OFF -DCMAKE_CXX_FLAGS=-fpic --no-warn-unused-cli ) ExternalProject_Add(googletest -- URL https://github.com/google/googletest/archive/release-1.8.1.tar.gz -+ URL @googletest@ +- URL https://github.com/google/googletest/archive/release-1.10.0.tar.gz ++ URL @googletest@ CMAKE_ARGS -DCMAKE_BUILD_TYPE=${PONYC_LIBS_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} -DCMAKE_CXX_FLAGS=-fpic -Dgtest_force_shared_crt=ON --no-warn-unused-cli ) -@@ -33,75 +33,6 @@ +@@ -33,82 +33,6 @@ COMPONENT library ) -find_package(Git) - --set(LLVM_DESIRED_HASH "c1a0a213378a458fbea1a5c77b315c7dce08fd05") --set(PATCHES_DESIRED_HASH "9063f83d727bf042a1232420e168c1ea192bf6a2960d35e57123245b630eb923") +-set(LLVM_DESIRED_HASH "fed41342a82f5a3a9201819a82bf7a48313e296b") +-set(PATCHES_DESIRED_HASH "3a655193262fd9b2e87340e096efcbd96726a07fe6dd42a263f3a4fc2dc0192e") - -if(GIT_FOUND) - if(EXISTS "${PROJECT_SOURCE_DIR}/../.git") @@ -56,12 +56,19 @@ - file(GLOB PONY_LLVM_PATCHES "${PROJECT_SOURCE_DIR}/llvm/patches/*.diff") - - # check to see if the patch hashes match +- message("Checking patches ${PONY_LLVM_PATCHES}") - set(PATCHES_ACTUAL_HASH "") - foreach (PATCH ${PONY_LLVM_PATCHES}) -- file(SHA256 ${PATCH} patch_file_hash) -- string(CONCAT PATCHES_ACTUAL_HASH patch_file_hash) +- file(STRINGS ${PATCH} patch_file NEWLINE_CONSUME) +- string(REPLACE "\n" " " patch_file ${patch_file}) +- string(SHA256 patch_file_hash ${patch_file}) +- # message("${PATCH}: '${patch_file_hash}'") +- string(CONCAT PATCHES_ACTUAL_HASH ${PATCHES_ACTUAL_HASH} ${patch_file_hash}) +- # message("concat is '${PATCHES_ACTUAL_HASH}'") - endforeach() - string(SHA256 PATCHES_ACTUAL_HASH ${PATCHES_ACTUAL_HASH}) +- # message("Desired hash ${PATCHES_DESIRED_HASH}") +- # message("Actual hash ${PATCHES_ACTUAL_HASH}") - if(NOT PATCHES_ACTUAL_HASH EQUAL "${PATCHES_DESIRED_HASH}") - message(FATAL_ERROR "Patch hash actual ${PATCHES_ACTUAL_HASH} does not match desired ${PATCHES_DESIRED_HASH}") - endif() @@ -88,6 +95,6 @@ - message(FATAL_ERROR "Git not found!") -endif() - - if (NOT DEFINED LLVM_TARGETS_TO_BUILD) - set(LLVM_TARGETS_TO_BUILD X86) - endif() + message("Building targets: ${LLVM_TARGETS_TO_BUILD}") + + set(LLVM_ENABLE_BINDINGS OFF) |