From d50f282a6546b2fd92171d7a0dcf20ab95342759 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Mon, 14 Oct 2013 10:06:53 +0200 Subject: [PATCH] Add command line length limit to Ninja generator * If we don't do that, ninja will fail building WebKit because of a too long command line * CMake will use a "response file" to forward arguments when the command line gets over the limit (with a safety margin) --- dev-util/cmake/cmake-2.8.11.2.recipe | 2 +- .../cmake/patches/cmake-2.8.11.2.patchset | 23 +++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/dev-util/cmake/cmake-2.8.11.2.recipe b/dev-util/cmake/cmake-2.8.11.2.recipe index 26ecd2641..2c10c2503 100644 --- a/dev-util/cmake/cmake-2.8.11.2.recipe +++ b/dev-util/cmake/cmake-2.8.11.2.recipe @@ -10,7 +10,7 @@ LICENSE="CMake" COPYRIGHT="2002-2013 Kitware, Inc., Insight Consortium, All rights reserved." SRC_URI="http://www.cmake.org/files/v2.8/cmake-2.8.11.2.tar.gz" CHECKSUM_MD5="6f5d7b8e7534a5d9e1a7664ba63cf882" -REVISION="1" +REVISION="2" ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64" PROVIDES=" diff --git a/dev-util/cmake/patches/cmake-2.8.11.2.patchset b/dev-util/cmake/patches/cmake-2.8.11.2.patchset index 004c417ca..11b7db37d 100644 --- a/dev-util/cmake/patches/cmake-2.8.11.2.patchset +++ b/dev-util/cmake/patches/cmake-2.8.11.2.patchset @@ -524,3 +524,26 @@ index fec142e..6adec1f 100644 -- 1.8.3.4 + +From ff28e08e29c0d54d794185ada1ddf496b41285e0 Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Mon, 14 Oct 2013 09:35:02 +0200 +Subject: Enable command-line length limitation on Haiku. + + +diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx +index 7e48cd7..3d15900 100644 +--- a/Source/cmNinjaNormalTargetGenerator.cxx ++++ b/Source/cmNinjaNormalTargetGenerator.cxx +@@ -563,7 +563,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement() + cmSystemTools::GetEnv(forceRspFile) == 0) { + #ifdef _WIN32 + commandLineLengthLimit = 8000 - linkRuleLength; +-#elif defined(__linux) || defined(__APPLE__) ++#elif defined(__linux) || defined(__APPLE__) || defined(__HAIKU__) + // for instance ARG_MAX is 2096152 on Ubuntu or 262144 on Mac + commandLineLengthLimit = ((int)sysconf(_SC_ARG_MAX))-linkRuleLength-1000; + #else +-- +1.8.3.4 +