mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-19 19:59:43 +00:00
Code Issues Releases Activity

Add some upstream patches that properly declare all build dependencies.

Browse Source 
The upcoming CMake 3.5.0 generates Makefiles that break parallel builds more
often when the dependencies between each targets are not declared correctly.

PR:		208033
This commit is contained in:
Raphael Kubo da Costa 2016-03-19 14:38:35 +00:00
parent f5d9f759f0
commit 8f30c5e1b7
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=411407
2 changed files with 41 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
net-im/telepathy-qt4/files/patch-git_1e1f53e9 Normal file
View File

@ -0,0 +1,21 @@
This commit is required to avoid occasional build failures in parallel builds
especially after CMake 3.5.0.
commit 1e1f53e9d91684918c34ec50392f86287e001a1e
Author: Alexandr Akulich <akulichalexander@gmail.com>
Date: Fri Jan 15 18:52:59 2016 +0500
BaseChannel: Reduced includes (doesn't depend on client stuff anymore).
--- TelepathyQt/base-channel.cpp
+++ TelepathyQt/base-channel.cpp
@@ -26,7 +26,8 @@
#include "TelepathyQt/_gen/base-channel.moc.hpp"
#include "TelepathyQt/_gen/base-channel-internal.moc.hpp"
-#include "TelepathyQt/future-internal.h"
+#include "TelepathyQt/_gen/future-constants.h"
+#include "TelepathyQt/_gen/future-types.h"
#include "TelepathyQt/debug-internal.h"

20
net-im/telepathy-qt4/files/patch-git_7389dc9 Normal file
View File

@ -0,0 +1,20 @@
This commit is required to avoid occasional build failures in parallel builds.
commit 7389dc990c67d4269f3a79c924c054e87f2e4ac5
Author: Alexandr Akulich <akulichalexander@gmail.com>
Date: Fri, 15 Jan 2016 18:54:09 +0500
CMakeLists: Added missing service dependence.
telepathy-qt-service depends on generated stable and future types and consts.
--- TelepathyQt/CMakeLists.txt
+++ TelepathyQt/CMakeLists.txt
@@ -953,6 +953,7 @@ if(ENABLE_SERVICE_SUPPORT)
#endif (ENABLE_COMPILER_COVERAGE)
# lets build a static only library until we have a stable API/ABI
add_library(telepathy-qt${QT_VERSION_MAJOR}-service STATIC ${telepathy_qt_service_SRCS})
+ add_dependencies(telepathy-qt${QT_VERSION_MAJOR}-service stable-typesgen future-typesgen)
# generate service moc files
foreach(moc_src ${telepathy_qt_service_MOC_SRCS})