mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-13 15:20:07 +02:00
0436ddb314
* TODO: qtgui should only be provided for archs providing qt5, or split up in another recipe.
78 lines
1.8 KiB
Plaintext
78 lines
1.8 KiB
Plaintext
From 551d725dbdcc4a66e7bfbd172d6b65907c1cb9d0 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.2.2
|
|
|
|
|
|
From 91ff2dc74b26ad0511bc2591698078c15b5afb6b 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 d062987..40f2f03 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.2.2
|
|
|