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

cmake: added recipe for version 3.5.1.

Browse Source 
Test results on x86_64: 98% tests passed, 10 tests failed out of 403

The following tests FAILED:
          7 - kwsys.testSystemTools (Failed)
         28 - FindPackageTest (Failed)
         61 - ExportImport (Failed)
         69 - StagingPrefix (Failed)
        114 - BuildDepends (Failed)
        213 - CTestTestTimeout (Failed)
        279 - RunCMake.BuildDepends (Failed)
        350 - RunCMake.no_install_prefix (Failed)
        357 - RunCMake.CommandLine (Failed)
        379 - CMake.FindBase (Failed)
This commit is contained in:
Jerome Duval
2016-04-08 19:37:16 +00:00
parent de75c4bf95
commit 5ef7894686
2 changed files with 168 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

100
dev-util/cmake/patches/cmake-3.5.1.patchset Normal file
View File

@@ -0,0 +1,100 @@
From 543646ad716146251a04905c0566a105a3192dbd Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Mon, 9 Jun 2014 22:30:55 +0200
Subject: Fix OpenAL search path.
diff --git a/Modules/FindOpenAL.cmake b/Modules/FindOpenAL.cmake
index 8150ff2..e0276f8 100644
--- a/Modules/FindOpenAL.cmake
+++ b/Modules/FindOpenAL.cmake
@@ -68,7 +68,7 @@
find_path(OPENAL_INCLUDE_DIR al.h
HINTS
ENV OPENALDIR
- PATH_SUFFIXES include/AL include/OpenAL include
+ PATH_SUFFIXES include/AL include/OpenAL include AL OpenAL
PATHS
~/Library/Frameworks
/Library/Frameworks
--
2.7.0
From 5a77a5b124ea2e429bf5aa6d2c6e05b49775985d Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sat, 21 Nov 2015 22:02:38 +0000
Subject: Haiku provides elf.h now.
diff --git a/Source/cmELF.cxx b/Source/cmELF.cxx
index 37dd328..c0b5d9e 100644
--- a/Source/cmELF.cxx
+++ b/Source/cmELF.cxx
@@ -23,28 +23,20 @@
#if defined(__OpenBSD__)
# include <stdint.h>
# include <elf_abi.h>
-#elif defined(__HAIKU__)
-# include <elf32.h>
-# include <elf64.h>
- typedef struct Elf32_Ehdr Elf32_Ehdr;
- typedef struct Elf32_Shdr Elf32_Shdr;
- typedef struct Elf32_Sym Elf32_Sym;
- typedef struct Elf32_Rel Elf32_Rel;
- typedef struct Elf32_Rela Elf32_Rela;
-# define ELFMAG0 0x7F
-# define ELFMAG1 'E'
-# define ELFMAG2 'L'
-# define ELFMAG3 'F'
-# define ET_NONE 0
-# define ET_REL 1
-# define ET_EXEC 2
-# define ET_DYN 3
-# define ET_CORE 4
-# define EM_386 3
-# define EM_SPARC 2
-# define EM_PPC 20
#else
# include <elf.h>
+# ifndef ELFMAG0
+# define ELFMAG0 0x7F
+# endif
+# ifndef ELFMAG1
+# define ELFMAG1 'E'
+# endif
+# ifndef ELFMAG2
+# define ELFMAG2 'L'
+# endif
+# ifndef ELFMAG3
+# define ELFMAG3 'F'
+# endif
#endif
#if defined(__sun)
# include <sys/link.h> // For dynamic section information
--
2.7.0
From 39878b19a2a282df2b5496b27bea1811d784b0b8 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sat, 20 Feb 2016 15:52:03 +0000
Subject: use libnetwork when it exists.
diff --git a/Utilities/cmcurl/CMakeLists.txt b/Utilities/cmcurl/CMakeLists.txt
index 39b70c0..e8dc1f9 100644
--- a/Utilities/cmcurl/CMakeLists.txt
+++ b/Utilities/cmcurl/CMakeLists.txt
@@ -780,6 +780,8 @@ if(HAVE_LIBWS2_32)
set(CMAKE_REQUIRED_LIBRARIES ws2_32)
elseif(HAVE_LIBSOCKET)
set(CMAKE_REQUIRED_LIBRARIES socket)
+elseif(HAVE_LIBNETWORK)
+ set(CMAKE_REQUIRED_LIBRARIES network)
endif()
check_symbol_exists(basename "${CURL_INCLUDES}" HAVE_BASENAME)
--
2.7.0