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

Some of our patches were merged upstream (thanks!). Remove them from the patch file. Also add a test rule while I'm at it. We fail 8 tests out of 257.

Browse Source
This commit is contained in:
Adrien Destugues
2013-01-11 19:17:13 +00:00
parent a1ea61f2ed
commit 6f41d37e10
2 changed files with 5 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

195
dev-util/cmake/patches/cmake-2.8-git.patch
View File

@@ -1,124 +1,3 @@
diff -urN cmake-2.8-git-orig/bootstrap cmake-2.8-git/bootstrap
--- cmake-2.8-git-orig/bootstrap 2012-11-27 05:26:34.015728640 -0800
+++ cmake-2.8-git/bootstrap 2012-12-03 12:02:17.615251968 -0800
@@ -146,7 +146,9 @@
cmake_default_prefix="c:/Program Files/CMake"
fi
elif ${cmake_system_haiku}; then
- cmake_default_prefix=`/bin/finddir B_COMMON_DIRECTORY`
+ cmake_default_prefix=`finddir B_COMMON_DIRECTORY`
+ cmake_man_dir="/documentation/man"
+ cmake_doc_dir="/documentation/doc/cmake-${cmake_version}"
else
cmake_default_prefix="/usr/local"
fi
diff -urN cmake-2.8-git-orig/Modules/CMakePlatformId.h.in cmake-2.8-git/Modules/CMakePlatformId.h.in
--- cmake-2.8-git-orig/Modules/CMakePlatformId.h.in 2012-11-27 05:26:32.056623104 -0800
+++ cmake-2.8-git/Modules/CMakePlatformId.h.in 2012-12-03 12:02:17.633864192 -0800
@@ -35,11 +35,8 @@
#elif defined(__hpux) || defined(__hpux__)
# define PLATFORM_ID "HP-UX"
-#elif defined(__HAIKU) || defined(__HAIKU__) || defined(_HAIKU)
+#elif defined(__HAIKU__)
# define PLATFORM_ID "Haiku"
-/* Haiku also defines __BEOS__ so we must
- put it prior to the check for __BEOS__
-*/
#elif defined(__BeOS) || defined(__BEOS__) || defined(_BEOS)
# define PLATFORM_ID "BeOS"
diff -urN cmake-2.8-git-orig/Modules/FindGLUT.cmake cmake-2.8-git/Modules/FindGLUT.cmake
--- cmake-2.8-git-orig/Modules/FindGLUT.cmake 2012-11-27 13:26:32.057147392 +0000
+++ cmake-2.8-git/Modules/FindGLUT.cmake 2012-12-04 09:11:43.176422912 +0000
@@ -46,19 +46,23 @@
/usr/openwin/include
/opt/graphics/OpenGL/include
/opt/graphics/OpenGL/contrib/libglut
+ /boot/develop/headers/os/opengl
)
find_library( GLUT_glut_LIBRARY glut
/usr/openwin/lib
+ /boot/develop/lib/x86/
)
- find_library( GLUT_Xi_LIBRARY Xi
- /usr/openwin/lib
- )
-
- find_library( GLUT_Xmu_LIBRARY Xmu
- /usr/openwin/lib
- )
+ if(NOT BEOS AND NOT HAIKU)
+ find_library( GLUT_Xi_LIBRARY Xi
+ /usr/openwin/lib
+ )
+
+ find_library( GLUT_Xmu_LIBRARY Xmu
+ /usr/openwin/lib
+ )
+ endif()
endif ()
@@ -70,12 +74,18 @@
if (GLUT_FOUND)
# Is -lXi and -lXmu required on all platforms that have it?
# If not, we need some way to figure out what platform we are on.
- set( GLUT_LIBRARIES
- ${GLUT_glut_LIBRARY}
- ${GLUT_Xmu_LIBRARY}
- ${GLUT_Xi_LIBRARY}
- ${GLUT_cocoa_LIBRARY}
- )
+ if(BEOS OR HAIKU)
+ set( GLUT_LIBRARIES
+ ${GLUT_glut_LIBRARY}
+ )
+ else
+ set( GLUT_LIBRARIES
+ ${GLUT_glut_LIBRARY}
+ ${GLUT_Xmu_LIBRARY}
+ ${GLUT_Xi_LIBRARY}
+ ${GLUT_cocoa_LIBRARY}
+ )
+ endif()
#The following deprecated settings are for backwards compatibility with CMake1.4
set (GLUT_LIBRARY ${GLUT_LIBRARIES})
diff -urN cmake-2.8-git-orig/Modules/FindLua51.cmake cmake-2.8-git/Modules/FindLua51.cmake
--- cmake-2.8-git-orig/Modules/FindLua51.cmake 2012-11-27 05:26:32.033030144 -0800
+++ cmake-2.8-git/Modules/FindLua51.cmake 2012-12-03 12:02:17.644612096 -0800
@@ -54,7 +54,7 @@
if(LUA_LIBRARY)
# include the math library for Unix
- if(UNIX AND NOT APPLE)
+ if(UNIX AND NOT APPLE AND NOT BEOS AND NOT HAIKU)
find_library(LUA_MATH_LIBRARY m)
set( LUA_LIBRARIES "${LUA_LIBRARY};${LUA_MATH_LIBRARY}" CACHE STRING "Lua Libraries")
# For Windows and Mac, don't need to explicitly include the math library
diff -urN cmake-2.8-git-orig/Modules/FindOpenGL.cmake cmake-2.8-git/Modules/FindOpenGL.cmake
--- cmake-2.8-git-orig/Modules/FindOpenGL.cmake 2012-11-27 05:26:32.034340864 -0800
+++ cmake-2.8-git/Modules/FindOpenGL.cmake 2012-12-03 12:02:17.651952128 -0800
@@ -80,6 +80,7 @@
/usr/share/doc/NVIDIA_GLX-1.0/include
/usr/openwin/share/include
/opt/graphics/OpenGL/include /usr/X11R6/include
+ /boot/develop/headers/os/opengl
)
find_path(OPENGL_xmesa_INCLUDE_DIR GL/xmesa.h
@@ -94,6 +95,7 @@
/usr/openwin/lib
/usr/shlib /usr/X11R6/lib
${HPUX_IA_OPENGL_LIB_PATH}
+ /boot/develop/lib/x86/
)
# On Unix OpenGL most certainly always requires X11.
diff -urN cmake-2.8-git-orig/Modules/Platform/Haiku.cmake cmake-2.8-git/Modules/Platform/Haiku.cmake
--- cmake-2.8-git-orig/Modules/Platform/Haiku.cmake 2012-12-03 12:11:47.804519936 -0800
+++ cmake-2.8-git/Modules/Platform/Haiku.cmake 2012-12-03 12:02:17.652738560 -0800
@@ -161,18 +40,6 @@ diff -urN cmake-2.8-git-orig/Modules/Platform/Haiku.cmake cmake-2.8-git/Modules/
list(APPEND CMAKE_SYSTEM_INCLUDE_PATH /boot/develop/headers/3rdparty)
list(APPEND CMAKE_SYSTEM_LIBRARY_PATH /boot/develop/lib/x86)
diff -urN cmake-2.8-git-orig/Source/cmCTest.cxx cmake-2.8-git/Source/cmCTest.cxx
--- cmake-2.8-git-orig/Source/cmCTest.cxx 2012-11-27 05:26:32.060030976 -0800
+++ cmake-2.8-git/Source/cmCTest.cxx 2012-12-03 12:02:17.659816448 -0800
@@ -53,7 +53,7 @@
#include <cm_zlib.h>
#include <cmsys/Base64.h>
-#if defined(__BEOS__) && !defined(__HAIKU__)
+#if defined(__BEOS__)
#include <be/kernel/OS.h> /* disable_debugger() API. */
#endif
diff -urN cmake-2.8-git-orig/Source/cmExportCommand.cxx cmake-2.8-git/Source/cmExportCommand.cxx
--- cmake-2.8-git-orig/Source/cmExportCommand.cxx 2012-11-27 05:26:33.039059456 -0800
+++ cmake-2.8-git/Source/cmExportCommand.cxx 2012-12-03 12:02:17.665059328 -0800
@@ -296,68 +163,6 @@ diff -urN cmake-2.8-git-orig/Source/CPack/cmCPackGenerator.cxx cmake-2.8-git/Sou
}
else
{
diff -urN cmake-2.8-git-orig/Source/CPack/cmCPackGeneratorFactory.cxx cmake-2.8-git/Source/CPack/cmCPackGeneratorFactory.cxx
--- cmake-2.8-git-orig/Source/CPack/cmCPackGeneratorFactory.cxx 2012-12-03 12:07:50.301203456 -0800
+++ cmake-2.8-git/Source/CPack/cmCPackGeneratorFactory.cxx 2012-12-03 12:02:17.678428672 -0800
@@ -113,7 +113,7 @@
}
#endif
#if !defined(_WIN32) \
+ && !defined(__QNXNTO__) && !defined(__BEOS__) && !defined(__HAIKU__)
- && !defined(__QNXNTO__) && !defined(__BEOS__)
if (cmCPackDebGenerator::CanGenerate())
{
this->RegisterGenerator("DEB", "Debian packages",
diff -urN cmake-2.8-git-orig/Source/kwsys/ProcessUNIX.c cmake-2.8-git/Source/kwsys/ProcessUNIX.c
--- cmake-2.8-git-orig/Source/kwsys/ProcessUNIX.c 2012-11-27 05:26:33.000524288 -0800
+++ cmake-2.8-git/Source/kwsys/ProcessUNIX.c 2012-12-03 12:02:17.707264512 -0800
@@ -63,10 +63,6 @@
#include <dirent.h> /* DIR, dirent */
#include <ctype.h> /* isspace */
-#ifdef __HAIKU__
-#undef __BEOS__
-#endif
-
#if defined(__VMS)
# define KWSYSPE_VMS_NONBLOCK , O_NONBLOCK
#else
diff -urN cmake-2.8-git-orig/Source/kwsys/SystemTools.cxx cmake-2.8-git/Source/kwsys/SystemTools.cxx
--- cmake-2.8-git-orig/Source/kwsys/SystemTools.cxx 2012-11-27 05:26:33.005505024 -0800
+++ cmake-2.8-git/Source/kwsys/SystemTools.cxx 2012-12-03 12:02:17.708313088 -0800
@@ -157,7 +157,7 @@
#include <os/storage/Path.h>
#endif
-#if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__)
+#if defined(__BEOS__) && !defined(__ZETA__)
#include <be/kernel/OS.h>
#include <be/storage/Path.h>
diff -urN cmake-2.8-git-orig/Source/kwsys/testDynamicLoader.cxx cmake-2.8-git/Source/kwsys/testDynamicLoader.cxx
--- cmake-2.8-git-orig/Source/kwsys/testDynamicLoader.cxx 2012-11-27 05:26:33.006815744 -0800
+++ cmake-2.8-git/Source/kwsys/testDynamicLoader.cxx 2012-12-03 12:02:17.713818112 -0800
@@ -15,7 +15,7 @@
#include KWSYS_HEADER(ios/iostream)
#include KWSYS_HEADER(stl/string)
-#if defined(__BEOS__) && !defined(__HAIKU__)
+#if defined(__BEOS__)
#include <be/kernel/OS.h> /* disable_debugger() API. */
#endif
diff -urN cmake-2.8-git-orig/Source/kwsys/testProcess.c cmake-2.8-git/Source/kwsys/testProcess.c
--- cmake-2.8-git-orig/Source/kwsys/testProcess.c 2012-11-27 05:26:33.007602176 -0800
+++ cmake-2.8-git/Source/kwsys/testProcess.c 2012-12-03 12:02:17.714604544 -0800
@@ -32,7 +32,7 @@
# pragma warn -8060 /* possibly incorrect assignment */
#endif
-#if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__)
+#if defined(__BEOS__) && !defined(__ZETA__)
/* BeOS 5 doesn't have usleep(), but it has snooze(), which is identical. */
# include <be/kernel/OS.h>
static inline void testProcess_usleep(unsigned int msec)
diff -urN cmake-2.8-git-orig/Tests/ComplexOneConfig/Library/CMakeLists.txt cmake-2.8-git/Tests/ComplexOneConfig/Library/CMakeLists.txt
--- cmake-2.8-git-orig/Tests/ComplexOneConfig/Library/CMakeLists.txt 2012-11-27 05:26:34.013369344 -0800
+++ cmake-2.8-git/Tests/ComplexOneConfig/Library/CMakeLists.txt 2012-12-03 12:02:42.181665792 -0800