You've already forked macports-ports
mirror of
https://github.com/macports/macports-ports.git
synced 2026-07-12 18:20:25 -07:00
Clemens 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
18 lines
679 B
Diff
18 lines
679 B
Diff
CMakeLists.txt: Fix Python install path
|
|
|
|
It seems Python already prepends MacPorts' install prefix by default, so
|
|
there's no need to add ${CMAKE_INSTALL_PREFIX} a second time.
|
|
|
|
Upstream-Status: Inappropriate [configuration]
|
|
--- ./CMakeLists.txt.orig 2023-11-15 13:44:07
|
|
+++ ./CMakeLists.txt 2023-11-15 13:44:39
|
|
@@ -409,7 +409,7 @@
|
|
${CMAKE_COMMAND} -E env
|
|
CMAKE_CURRENT_SOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR}
|
|
${Python3_EXECUTABLE} ${SETUP_PY} install
|
|
- --root $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}
|
|
+ --root $ENV{DESTDIR}
|
|
RESULT_VARIABLE STATUS)
|
|
if (NOT STATUS STREQUAL 0)
|
|
message(FATAL_ERROR \"pywatchman install failed\")
|