Re-do the fix for "ui_custom_include_paths.h", should work now

(continues to work without problems on i386...)

Also, fix fallout from some recent headers tweaking in base.

Both fixes are build-time only, so no REVISION bump.
This commit is contained in:
zhuk 2014-07-21 21:25:11 +00:00
parent 730956fe7a
commit 67d01e978d
2 changed files with 21 additions and 6 deletions

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-debuggers_gdb_stty_cpp,v 1.1 2014/07/21 21:25:11 zhuk Exp $
Unbreak build.
--- debuggers/gdb/stty.cpp.orig Tue Jul 22 00:33:07 2014
+++ debuggers/gdb/stty.cpp Tue Jul 22 00:33:20 2014
@@ -37,6 +37,7 @@
#include <sys/wait.h>
#include <sys/time.h>
#include <sys/resource.h>
+#include <sys/select.h>
#ifdef HAVE_SYS_STROPTS_H
#include <sys/stropts.h>

View File

@ -1,12 +1,15 @@
$OpenBSD: patch-languages_cpp_CMakeLists_txt,v 1.1 2014/07/19 11:54:45 zhuk Exp $
--- languages/cpp/CMakeLists.txt.orig Sat Jul 19 01:00:03 2014
+++ languages/cpp/CMakeLists.txt Sat Jul 19 01:00:12 2014
@@ -88,6 +88,9 @@ target_link_libraries(kdevcpplanguagesupport
$OpenBSD: patch-languages_cpp_CMakeLists_txt,v 1.2 2014/07/21 21:25:11 zhuk Exp $
Unbreak unordered builds.
--- languages/cpp/CMakeLists.txt.orig Sat Dec 7 22:51:45 2013
+++ languages/cpp/CMakeLists.txt Mon Jul 21 22:45:06 2014
@@ -88,6 +88,11 @@ target_link_libraries(kdevcpplanguagesupport
${KDE4_KTEXTEDITOR_LIBS}
)
+# XXX should be done directly in KDE4Macros.cmake instead?
+add_dependencies(kdevcpplanguagesupport ${CMAKE_CURRENT_BINARY_DIR}/ui_custom_include_paths.h)
+add_custom_target(custom_include_paths_header
+ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/ui_custom_include_paths.h
+ )
+add_dependencies(kdevcpplanguagesupport custom_include_paths_header)
+
install(TARGETS kdevcpplanguagesupport DESTINATION ${PLUGIN_INSTALL_DIR})