From b7091df0680c6f442b7a57bc065d8ab5aa19ac9e Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sun, 10 Jul 2011 22:41:09 +0000 Subject: [PATCH] Remove the /boot/home/config paths again for alignment with the Unixes. --- dev-util/cmake/patches/cmake-2.8.5.patch | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/dev-util/cmake/patches/cmake-2.8.5.patch b/dev-util/cmake/patches/cmake-2.8.5.patch index 5a77b6557..9cd379392 100644 --- a/dev-util/cmake/patches/cmake-2.8.5.patch +++ b/dev-util/cmake/patches/cmake-2.8.5.patch @@ -181,7 +181,7 @@ diff -ur cmake-2.8.5_orig/Modules/FindOpenGL.cmake cmake-2.8.5/Modules/FindOpenG diff -ur cmake-2.8.5_orig/Modules/Platform/Haiku.cmake cmake-2.8.5/Modules/Platform/Haiku.cmake --- cmake-2.8.5_orig/Modules/Platform/Haiku.cmake 2011-07-08 12:21:44.016777216 +0000 +++ cmake-2.8.5/Modules/Platform/Haiku.cmake 2011-07-09 17:59:50.092798976 +0000 -@@ -1,20 +1,31 @@ +@@ -1,20 +1,27 @@ -SET(BEOS 1) +SET(HAIKU 1) +SET(UNIX 1) @@ -195,7 +195,7 @@ diff -ur cmake-2.8.5_orig/Modules/Platform/Haiku.cmake cmake-2.8.5/Modules/Platf SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":") +SET(CMAKE_SHARED_LIBRARY_RPATH_LINK_C_FLAG "-Wl,-rpath-link,") SET(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-soname,") -+ SET(CMAKE_EXE_EXPORTS_C_FLAG "-Wl,--export-dynamic") ++SET(CMAKE_EXE_EXPORTS_C_FLAG "-Wl,--export-dynamic") -INCLUDE(Platform/UnixPaths) -LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH /boot/common) @@ -206,15 +206,11 @@ diff -ur cmake-2.8.5_orig/Modules/Platform/Haiku.cmake cmake-2.8.5/Modules/Platf -LIST(APPEND CMAKE_SYSTEM_INCLUDE_PATH /boot/develop/headers/3rdparty) -LIST(APPEND CMAKE_SYSTEM_LIBRARY_PATH /boot/develop/lib/x86) +LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH -+ /boot/home/config/non-packaged -+ /boot/home/config + /boot/common/non-packaged + /boot/common + /boot/system + ) +LIST(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES -+ /boot/home/config/non-packaged/lib -+ /boot/home/config/lib + /boot/common/non-packaged/lib + /boot/common/lib + /boot/system/develop/lib/x86