cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix cyclical dependency error

Browse Source 
fallout from upcoming ninja-1.6.0
This commit is contained in:
dcoppa 2015-10-05 08:46:21 +00:00
parent b84b73339f
commit 45340805ef
2 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/weechat/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.21 2015/09/03 17:44:13 sthen Exp $
# $OpenBSD: Makefile,v 1.22 2015/10/05 08:46:21 dcoppa Exp $
COMMENT-main= fast, light and extensible chat client
COMMENT-lua= Lua bindings for weechat
@ -82,7 +82,7 @@ CONFIGURE_ARGS+=-DENABLE_ASPELL=no \
-DMODTCL_LIB=${MODTCL_LIB}
pre-configure:
rm ${WRKSRC}/cmake/FindLua.cmake \
rm -f ${WRKSRC}/cmake/FindLua.cmake \
${WRKSRC}/cmake/FindRuby.cmake \
${WRKSRC}/cmake/FindTCL.cmake

25
net/weechat/patches/patch-src_gui_curses_CMakeLists_txt Normal file
View File

@ -0,0 +1,25 @@
$OpenBSD: patch-src_gui_curses_CMakeLists_txt,v 1.4 2015/10/05 08:46:21 dcoppa Exp $
Fix cyclical dependency error
--- src/gui/curses/CMakeLists.txt.orig Sun Aug 16 08:27:07 2015
+++ src/gui/curses/CMakeLists.txt Sun Oct 4 11:26:54 2015
@@ -88,17 +88,13 @@ target_link_libraries(${EXECUTABLE} ${STATIC_LIBS} wee
# This link is created for compatibility with old versions on /upgrade.
# It may be removed in future.
add_custom_command(
- OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${EXECUTABLE}-curses${CMAKE_EXECUTABLE_SUFFIX}
+ TARGET ${EXECUTABLE} POST_BUILD
COMMAND ${CMAKE_COMMAND} -E remove -f "weechat-curses${CMAKE_EXECUTABLE_SUFFIX}"
COMMAND ${CMAKE_COMMAND} -E create_symlink "weechat${CMAKE_EXECUTABLE_SUFFIX}" "weechat-curses${CMAKE_EXECUTABLE_SUFFIX}"
DEPENDS ${EXECUTABLE}
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
COMMENT "Creating symbolic link ${EXECUTABLE}-curses${CMAKE_EXECUTABLE_SUFFIX}"
- )
-add_custom_target(${EXECUTABLE}-curses${CMAKE_EXECUTABLE_SUFFIX} ALL
- DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${EXECUTABLE}-curses${CMAKE_EXECUTABLE_SUFFIX}
)
-add_dependencies(${EXECUTABLE}-curses${CMAKE_EXECUTABLE_SUFFIX} ${EXECUTABLE})
list(APPEND CMAKE_INSTALL_MANIFEST_FILES "${CMAKE_INSTALL_PREFIX}/bin/weechat-curses${CMAKE_EXECUTABLE_SUFFIX}")
# Install executable and symbolic link