diff --git a/dev-util/cmake/patches/cmake-3.0.0_git.patchset b/dev-util/cmake/patches/cmake-3.0.0_git.patchset index 74c45b918..1c97ac007 100644 --- a/dev-util/cmake/patches/cmake-3.0.0_git.patchset +++ b/dev-util/cmake/patches/cmake-3.0.0_git.patchset @@ -1,151 +1,4 @@ -From 71a1a0a1f751e4c47f0d58a1c7a207051f0235c1 Mon Sep 17 00:00:00 2001 -From: Brad King -Date: Thu, 6 Mar 2014 16:18:56 -0500 -Subject: FindSDL: Make FindSDL_*.cmake path suffixes consistent with main - module - -Add the 'SDL' path suffix to the FindSDL_*.cmake modules. Add a comment -explaining the purpose of suffixes as in commit v3.0.0-rc1~540^2 -(FindSDL: Add path suffixes for /include/..., 2013-10-08). - -Inspired-by: Adrien Destugues - -diff --git a/Modules/FindSDL_image.cmake b/Modules/FindSDL_image.cmake -index e5173e3..fc2c043 100644 ---- a/Modules/FindSDL_image.cmake -+++ b/Modules/FindSDL_image.cmake -@@ -54,7 +54,9 @@ find_path(SDL_IMAGE_INCLUDE_DIR SDL_image.h - HINTS - ENV SDLIMAGEDIR - ENV SDLDIR -- PATH_SUFFIXES include/SDL include/SDL12 include/SDL11 include -+ PATH_SUFFIXES SDL -+ # path suffixes to search inside ENV{SDLDIR} -+ include/SDL include/SDL12 include/SDL11 include - ) - - if(CMAKE_SIZEOF_VOID_P EQUAL 8) -diff --git a/Modules/FindSDL_mixer.cmake b/Modules/FindSDL_mixer.cmake -index 8f2f066..176fee6 100644 ---- a/Modules/FindSDL_mixer.cmake -+++ b/Modules/FindSDL_mixer.cmake -@@ -54,7 +54,9 @@ find_path(SDL_MIXER_INCLUDE_DIR SDL_mixer.h - HINTS - ENV SDLMIXERDIR - ENV SDLDIR -- PATH_SUFFIXES include/SDL include/SDL12 include/SDL11 include -+ PATH_SUFFIXES SDL -+ # path suffixes to search inside ENV{SDLDIR} -+ include/SDL include/SDL12 include/SDL11 include - ) - - if(CMAKE_SIZEOF_VOID_P EQUAL 8) -diff --git a/Modules/FindSDL_net.cmake b/Modules/FindSDL_net.cmake -index e5c2cdb..ef23573 100644 ---- a/Modules/FindSDL_net.cmake -+++ b/Modules/FindSDL_net.cmake -@@ -54,7 +54,9 @@ find_path(SDL_NET_INCLUDE_DIR SDL_net.h - HINTS - ENV SDLNETDIR - ENV SDLDIR -- PATH_SUFFIXES include/SDL include/SDL12 include/SDL11 include -+ PATH_SUFFIXES SDL -+ # path suffixes to search inside ENV{SDLDIR} -+ include/SDL include/SDL12 include/SDL11 include - ) - - if(CMAKE_SIZEOF_VOID_P EQUAL 8) -diff --git a/Modules/FindSDL_sound.cmake b/Modules/FindSDL_sound.cmake -index 3a6ab7b..8b22ff7 100644 ---- a/Modules/FindSDL_sound.cmake -+++ b/Modules/FindSDL_sound.cmake -@@ -98,7 +98,9 @@ find_path(SDL_SOUND_INCLUDE_DIR SDL_sound.h - HINTS - ENV SDLSOUNDDIR - ENV SDLDIR -- PATH_SUFFIXES include/SDL include/SDL12 include/SDL11 include -+ PATH_SUFFIXES SDL -+ # path suffixes to search inside ENV{SDLDIR} -+ include/SDL include/SDL12 include/SDL11 include - ) - - find_library(SDL_SOUND_LIBRARY -diff --git a/Modules/FindSDL_ttf.cmake b/Modules/FindSDL_ttf.cmake -index 3f58ac1..4b527fa 100644 ---- a/Modules/FindSDL_ttf.cmake -+++ b/Modules/FindSDL_ttf.cmake -@@ -54,7 +54,9 @@ find_path(SDL_TTF_INCLUDE_DIR SDL_ttf.h - HINTS - ENV SDLTTFDIR - ENV SDLDIR -- PATH_SUFFIXES include/SDL include/SDL12 include/SDL11 include -+ PATH_SUFFIXES SDL -+ # path suffixes to search inside ENV{SDLDIR} -+ include/SDL include/SDL12 include/SDL11 include - ) - - if(CMAKE_SIZEOF_VOID_P EQUAL 8) --- -1.8.3.4 - - -From b698a970d31ad923cf2451a1e248771eadd879a0 Mon Sep 17 00:00:00 2001 -From: Adrien Destugues -Date: Mon, 3 Mar 2014 16:01:23 +0100 -Subject: FindFreetype: Add plain 'freetype2' path suffix - -On Haiku, the headers are not in an 'include' directory. - -diff --git a/Modules/FindFreetype.cmake b/Modules/FindFreetype.cmake -index 6f03c86..f0f9fe1 100644 ---- a/Modules/FindFreetype.cmake -+++ b/Modules/FindFreetype.cmake -@@ -62,7 +62,7 @@ find_path(FREETYPE_INCLUDE_DIR_ft2build ft2build.h - ENV GTKMM_BASEPATH - [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path] - [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path] -- PATH_SUFFIXES include/freetype2 include -+ PATH_SUFFIXES include/freetype2 include freetype2 - ) - - find_path(FREETYPE_INCLUDE_DIR_freetype2 -@@ -79,7 +79,7 @@ find_path(FREETYPE_INCLUDE_DIR_freetype2 - ENV GTKMM_BASEPATH - [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path] - [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path] -- PATH_SUFFIXES include/freetype2 include -+ PATH_SUFFIXES include/freetype2 include freetype2 - ) - - find_library(FREETYPE_LIBRARY --- -1.8.3.4 - - -From 37e2252c6e5647bbca9a5c5992775ee7495a4c07 Mon Sep 17 00:00:00 2001 -From: Adrien Destugues -Date: Mon, 3 Mar 2014 15:47:08 +0100 -Subject: Ninja: Detect command-line length limit on Haiku - - -diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx -index a49fc2d..c24c5e0 100644 ---- a/Source/cmNinjaNormalTargetGenerator.cxx -+++ b/Source/cmNinjaNormalTargetGenerator.cxx -@@ -591,7 +591,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 - - -From 3d18f07a267c6ecedeedd8c5eadd4a9361f0715c Mon Sep 17 00:00:00 2001 +From d96821f7bb988822d4d24aea8a5f1eb68076b600 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Mon, 3 Mar 2014 15:47:08 +0100 Subject: Haiku: Enable CMake builtin ELF editor @@ -153,7 +6,7 @@ Subject: Haiku: Enable CMake builtin ELF editor Co-Author: Brad King diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt -index 966e0f6..93b44ba 100644 +index 762470f..27d099d 100644 --- a/Source/CMakeLists.txt +++ b/Source/CMakeLists.txt @@ -18,6 +18,23 @@ else() @@ -180,7 +33,7 @@ index 966e0f6..93b44ba 100644 else() set(CMAKE_USE_ELF_PARSER) endif() -@@ -52,6 +69,7 @@ include_directories( +@@ -57,6 +74,7 @@ include_directories( ${CMAKE_EXPAT_INCLUDES} ${CMAKE_TAR_INCLUDES} ${CMAKE_COMPRESS_INCLUDES} @@ -189,7 +42,7 @@ index 966e0f6..93b44ba 100644 # let cmake know it is supposed to use it diff --git a/Source/cmELF.cxx b/Source/cmELF.cxx -index 353f2e9..da5a58c 100644 +index bc1c25b..dc6772c 100644 --- a/Source/cmELF.cxx +++ b/Source/cmELF.cxx @@ -23,6 +23,26 @@ @@ -223,7 +76,7 @@ index 353f2e9..da5a58c 100644 1.8.3.4 -From 5c6d7bdabf3dfb8f0d423b855ce03c0884f7e55d Mon Sep 17 00:00:00 2001 +From 88fe347ab31291ec0535d4d4438717355544a191 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Mon, 3 Mar 2014 15:57:05 +0100 Subject: Haiku: Fix compiler detection when using distcc @@ -304,7 +157,7 @@ index 825f851..dfc2664 100644 1.8.3.4 -From fb798c65438e33ddaa00b4665a8df94a9ec5d20c Mon Sep 17 00:00:00 2001 +From 5d126e36b08d159cccb3eeddbfa3b9432b6521a3 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Mon, 3 Mar 2014 15:51:49 +0100 Subject: CPack: Add HPKG generation support @@ -614,10 +467,10 @@ index 0000000..772f422 + message("CPackHpkg:Debug: CPACK_TEMPORARY_PACKAGE_FILE_NAME = ${CPACK_TEMPORARY_PACKAGE_FILE_NAME}") +endif() diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt -index 93b44ba..83ecac0 100644 +index 27d099d..bbf979b 100644 --- a/Source/CMakeLists.txt +++ b/Source/CMakeLists.txt -@@ -576,6 +576,12 @@ if(UNIX) +@@ -589,6 +589,12 @@ if(UNIX) ) endif()