mirror of
https://github.com/macports/macports-ports.git
synced 2026-07-12 18:20:25 -07:00
Clemens LangandClemens Lang
500bb44a1b
Fix packaging of pywatchman and specify the watchman version number
(which cannot be determined from git in our setup).
Drop the first patch, which does no longer seem to be required.
Update edencommon to the same version, because the build will fail
otherwise.
This fixes the watchman prebuilt package, which is broken since the last
libsodium update in 86381201ed and was not
fixed in https://github.com/macports/macports-ports/pull/20537 either.
Closes: https://trac.macports.org/ticket/65475
Closes: https://trac.macports.org/ticket/68702
31 lines
893 B
Diff
31 lines
893 B
Diff
--- ./CMakeLists.txt.orig 2023-11-11 02:06:57
|
|
+++ ./CMakeLists.txt 2023-11-15 13:09:46
|
|
@@ -50,11 +50,6 @@
|
|
find_package(folly CONFIG REQUIRED)
|
|
include_directories(${FOLLY_INCLUDE_DIR})
|
|
|
|
-find_package(GMock MODULE REQUIRED)
|
|
-include_directories(${GMOCK_INCLUDEDIR} ${LIBGMOCK_INCLUDE_DIR})
|
|
-include(GoogleTest)
|
|
-enable_testing()
|
|
-
|
|
add_subdirectory(eden/common/os)
|
|
add_subdirectory(eden/common/utils)
|
|
|
|
--- eden/common/utils/CMakeLists.txt.orig 2023-11-11 02:06:57
|
|
+++ eden/common/utils/CMakeLists.txt 2023-11-15 13:06:08
|
|
@@ -36,5 +36,3 @@
|
|
FILES ${utils_headers}
|
|
DESTINATION ${INCLUDE_INSTALL_DIR}/eden/common/utils
|
|
)
|
|
-
|
|
-add_subdirectory(test)
|
|
--- ./eden/common/os/CMakeLists.txt.orig 2023-11-15 13:27:03
|
|
+++ ./eden/common/os/CMakeLists.txt 2023-11-15 13:27:12
|
|
@@ -41,5 +41,3 @@
|
|
FILES ${os_headers}
|
|
DESTINATION ${INCLUDE_INSTALL_DIR}/eden/common/os
|
|
)
|
|
-
|
|
-add_subdirectory(test)
|