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

dev-util: Remove old CMake recipes; mark 3.8.2 as tested on gcc2_x86.

Browse Source
This commit is contained in:
Augustin Cavalier
2017-07-20 19:37:24 -04:00
parent ddb6c727ed
commit abd25f4e66
17 changed files with 1 additions and 4382 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2018
dev-util/cmake/patches/cmake-2.8.11.2.patchset
View File

File diff suppressed because it is too large Load Diff

1318
dev-util/cmake/patches/cmake-3.0.0_rc6.patchset
View File

File diff suppressed because it is too large Load Diff

22
dev-util/cmake/patches/cmake-3.2.3.patchset
View File

@@ -1,22 +0,0 @@
From 39333f7fd44b281cdaafb98820d549c923103011 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

77
dev-util/cmake/patches/cmake-3.3.2.patchset
View File

@@ -1,77 +0,0 @@
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

100
dev-util/cmake/patches/cmake-3.4.3.patchset
View File

@@ -1,100 +0,0 @@
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

100
dev-util/cmake/patches/cmake-3.5.2.patchset
View File

@@ -1,100 +0,0 @@
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 eb63cef..594560b 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 b480cd5..558f990 100644
--- a/Source/cmELF.cxx
+++ b/Source/cmELF.cxx
@@ -19,28 +19,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

100
dev-util/cmake/patches/cmake-3.6.3.patchset
View File

@@ -1,100 +0,0 @@
From 396b4ed14b91ca0d52300ed2d1b274b956535232 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 eb63cef..594560b 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 68da04c3931e80a77c6b6697a756431f06405f23 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 26f1a44..f83fec0 100644
--- a/Source/cmELF.cxx
+++ b/Source/cmELF.cxx
@@ -20,28 +20,20 @@
#if defined(__OpenBSD__)
#include <elf_abi.h>
#include <stdint.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 1d0aee56562e1aeea03ed46fa354ca3848687663 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 9031181..aed77af 100644
--- a/Utilities/cmcurl/CMakeLists.txt
+++ b/Utilities/cmcurl/CMakeLists.txt
@@ -783,6 +783,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

99
dev-util/cmake/patches/cmake-3.7.2.patchset
View File

@@ -1,99 +0,0 @@
From 92d374dd798f1b805d91395991ea1679358321c2 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 1abb0d6..f140682 100644
--- a/Modules/FindOpenAL.cmake
+++ b/Modules/FindOpenAL.cmake
@@ -58,7 +58,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.11.0
From 3def505b9d0c5b18e9d73ff387554c4fa1597a38 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 2d86674..aad0fb6 100644
--- a/Source/cmELF.cxx
+++ b/Source/cmELF.cxx
@@ -15,28 +15,20 @@
#if defined(__OpenBSD__)
#include <elf_abi.h>
#include <stdint.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.11.0
From 7782383697fe69839f2e1b9afff378f9a51a5305 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 9031181..aed77af 100644
--- a/Utilities/cmcurl/CMakeLists.txt
+++ b/Utilities/cmcurl/CMakeLists.txt
@@ -783,6 +783,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.11.0