haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-05-05 22:48:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

CMake: Remove failure message

Browse Source 
When running CPack, PlatformHaiku is imported without
CMAKE_C(XX)_COMPILER being set. Do not fail in this case, just don't set
the variables.
This commit is contained in:
Adrien Destugues
2013-11-21 15:58:30 +01:00
parent 5327a5fd38
commit 5725bc5195
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dev-util/cmake/cmake-2.8.11.2.recipe
View File

@@ -10,7 +10,7 @@ LICENSE="CMake"
COPYRIGHT="2002-2013 Kitware, Inc., Insight Consortium, All rights reserved." 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" SRC_URI="http://www.cmake.org/files/v2.8/cmake-2.8.11.2.tar.gz"
CHECKSUM_MD5="6f5d7b8e7534a5d9e1a7664ba63cf882" CHECKSUM_MD5="6f5d7b8e7534a5d9e1a7664ba63cf882"
REVISION="4" REVISION="5"
ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64" ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64"
PROVIDES=" PROVIDES="

10
dev-util/cmake/patches/cmake-2.8.11.2.patchset
View File

@@ -1651,7 +1651,7 @@ index 825f851..a3ebe24 100644
1.8.3.4 1.8.3.4
From dc8f5b4f8c63f27b4c155246f4614120fbb4fb8b Mon Sep 17 00:00:00 2001 From 95e14820c12369366cffae5050efabebf5b51c0d Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk> From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Tue, 12 Nov 2013 15:48:13 +0100 Date: Tue, 12 Nov 2013 15:48:13 +0100
Subject: Fix compiler detection when distcc is involved Subject: Fix compiler detection when distcc is involved
@@ -1661,10 +1661,10 @@ into another variable, with other arguments. Append CMAKE_CXX_COMPILER_ARG1
to our compiler invocation to take this into account. to our compiler invocation to take this into account.
diff --git a/Modules/Platform/Haiku.cmake b/Modules/Platform/Haiku.cmake diff --git a/Modules/Platform/Haiku.cmake b/Modules/Platform/Haiku.cmake
index a3ebe24..0aae768 100644 index a3ebe24..dd4c55e 100644
--- a/Modules/Platform/Haiku.cmake --- a/Modules/Platform/Haiku.cmake
+++ b/Modules/Platform/Haiku.cmake +++ b/Modules/Platform/Haiku.cmake
@@ -21,18 +21,29 @@ set(CMAKE_EXE_EXPORTS_C_FLAG "-Wl,--export-dynamic") @@ -21,18 +21,25 @@ set(CMAKE_EXE_EXPORTS_C_FLAG "-Wl,--export-dynamic")
# "/boot/system/develop/lib/<subdir>/", which we assume to be the secondary # "/boot/system/develop/lib/<subdir>/", which we assume to be the secondary
# architecture specific subdirectory and extract the name of the architecture # architecture specific subdirectory and extract the name of the architecture
# accordingly. # accordingly.
@@ -1691,10 +1691,6 @@ index a3ebe24..0aae768 100644
OUTPUT_STRIP_TRAILING_WHITESPACE) OUTPUT_STRIP_TRAILING_WHITESPACE)
-string(REGEX MATCH ".*\nlibraries: =?([^\n]*:)?/boot/system/develop/lib/([^/]*)/(:[^\n]*)?\n.*" _dummy "\n${_HAIKU_SEARCH_DIRS}\n") -string(REGEX MATCH ".*\nlibraries: =?([^\n]*:)?/boot/system/develop/lib/([^/]*)/(:[^\n]*)?\n.*" _dummy "\n${_HAIKU_SEARCH_DIRS}\n")
+if(NOT 0 EQUAL _HAIKU_SEARCH_DIRS_FOUND)
+ message(FATAL_ERROR "Could not determine secondary architecture directory for ${__HAIKU_COMPILER}.")
+endif()
+
+string(REGEX MATCH "libraries: =?([^\n]*:)?/boot/system/develop/lib/([^/]*)/(:[^\n]*)?" _dummy "${_HAIKU_SEARCH_DIRS}") +string(REGEX MATCH "libraries: =?([^\n]*:)?/boot/system/develop/lib/([^/]*)/(:[^\n]*)?" _dummy "${_HAIKU_SEARCH_DIRS}")
set(CMAKE_HAIKU_SECONDARY_ARCH "${CMAKE_MATCH_2}") set(CMAKE_HAIKU_SECONDARY_ARCH "${CMAKE_MATCH_2}")