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: bump (#5362)

Browse Source
This commit is contained in:
extrowerk
2020-11-08 11:27:34 +01:00
committed by GitHub
parent 406e57edf0
commit 6b8a3d7839
6 changed files with 35 additions and 394 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
dev-util/cmake/cmake-3.16.0.recipe → dev-util/cmake/cmake-3.18.4.recipe
View File

@@ -5,11 +5,11 @@ simple platform and compiler independent configuration files. CMake generates \
native makefiles and workspaces that can be used in the compiler environment \
of your choice."
HOMEPAGE="https://cmake.org/"
COPYRIGHT="2002-2019 Kitware, Inc., Insight Consortium"
COPYRIGHT="2002-2020 Kitware, Inc., Insight Consortium"
LICENSE="CMake"
REVISION="3"
SOURCE_URI="https://cmake.org/files/v3.16/cmake-$portVersion.tar.gz"
CHECKSUM_SHA256="6da56556c63cab6e9a3e1656e8763ed4a841ac9859fefb63cbe79472e67e8c5f"
REVISION="1"
SOURCE_URI="https://cmake.org/files/v3.18/cmake-$portVersion.tar.gz"
CHECKSUM_SHA256="597c61358e6a92ecbfad42a9b5321ddd801fc7e7eca08441307c9138382d4f77"
SOURCE_DIR="cmake-$portVersion"
PATCHES="cmake-$portVersion.patchset"
@@ -71,6 +71,8 @@ INSTALL()
# No way to tell this to configure...
mv $prefix/share/aclocal $dataDir
mv $prefix/share/bash-completion $dataDir/bash-completion
rm -rf $prefix/share/{emacs,vim}
rmdir $prefix/share
}

76
dev-util/cmake/cmake-3.8.2.recipe
View File

@@ -1,76 +0,0 @@
SUMMARY="A cross-platform build system"
DESCRIPTION="CMake is a family of tools designed to build, test and package \
software. It is used to control the software compilation process using \
simple platform and compiler independent configuration files. CMake generates \
native makefiles and workspaces that can be used in the compiler environment \
of your choice."
HOMEPAGE="https://cmake.org/"
COPYRIGHT="2002-2017 Kitware, Inc., Insight Consortium"
LICENSE="CMake"
REVISION="3"
SOURCE_URI="https://cmake.org/files/v3.8/cmake-$portVersion.tar.gz"
CHECKSUM_SHA256="da3072794eb4c09f2d782fcee043847b99bb4cf8d4573978d9b2024214d6e92d"
SOURCE_DIR="cmake-$portVersion"
PATCHES="cmake-$portVersion.patchset"
ARCHITECTURES="!x86_gcc2 x86 x86_64 ?arm"
SECONDARY_ARCHITECTURES="x86"
PROVIDES="
cmake$secondaryArchSuffix = $portVersion compat >= 3
cmd:ccmake = $portVersion compat >= 3
cmd:cmake = $portVersion compat >= 3
cmd:cpack = $portVersion compat >= 3
cmd:ctest = $portVersion compat >= 3
"
REQUIRES="
haiku$secondaryArchSuffix
lib:libcurl$secondaryArchSuffix
lib:libncurses$secondaryArchSuffix
lib:libz$secondaryArchSuffix
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libcurl$secondaryArchSuffix
devel:libncurses$secondaryArchSuffix
devel:libz$secondaryArchSuffix
"
BUILD_PREREQUIRES="
cmd:gcc$secondaryArchSuffix
cmd:grep
cmd:ld$secondaryArchSuffix
cmd:libtoolize$secondaryArchSuffix
cmd:make
cmd:sed
"
BUILD()
{
# not an autotools configure
./configure --prefix=$prefix \
--datadir=/$relativeDataDir/cmake \
--docdir=/$relativeDocDir \
--mandir=/$relativeManDir \
--no-server \
--no-system-libs \
--system-curl \
-- -DCMAKE_USE_LIBUV=0
make $jobArgs
}
INSTALL()
{
make install
# No way to tell this to configure...
mv $prefix/share/aclocal $dataDir
rmdir $prefix/share
}
TEST()
{
cp bin/ctest Bootstrap.cmk/
make test VERBOSE=1
}

80
dev-util/cmake/cmake-3.9.5.recipe
View File

@@ -1,80 +0,0 @@
SUMMARY="A cross-platform build system"
DESCRIPTION="CMake is a family of tools designed to build, test and package \
software. It is used to control the software compilation process using \
simple platform and compiler independent configuration files. CMake generates \
native makefiles and workspaces that can be used in the compiler environment \
of your choice."
HOMEPAGE="https://cmake.org/"
COPYRIGHT="2002-2017 Kitware, Inc., Insight Consortium"
LICENSE="CMake"
REVISION="5"
SOURCE_URI="https://cmake.org/files/v3.9/cmake-$portVersion.tar.gz"
CHECKSUM_SHA256="6220c1683b4e6bb8f38688fa3ffb17a7cf39f36317c2ddfdc3f12f09d086c166"
SOURCE_DIR="cmake-$portVersion"
PATCHES="cmake-$portVersion.patchset"
ARCHITECTURES="!x86_gcc2 ?x86 x86_64 ?arm"
SECONDARY_ARCHITECTURES="x86"
PROVIDES="
cmake$secondaryArchSuffix = $portVersion compat >= 3
cmd:ccmake = $portVersion compat >= 3
cmd:cmake = $portVersion compat >= 3
cmd:cpack = $portVersion compat >= 3
cmd:ctest = $portVersion compat >= 3
"
REQUIRES="
haiku$secondaryArchSuffix
lib:libcurl$secondaryArchSuffix
lib:libncurses$secondaryArchSuffix
lib:librhash$secondaryArchSuffix
lib:libz$secondaryArchSuffix
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libcurl$secondaryArchSuffix
devel:libncurses$secondaryArchSuffix
devel:librhash$secondaryArchSuffix
devel:libz$secondaryArchSuffix
"
BUILD_PREREQUIRES="
cmd:gcc$secondaryArchSuffix
cmd:grep
cmd:ld$secondaryArchSuffix
cmd:libtoolize$secondaryArchSuffix
cmd:make
cmd:sed
"
BUILD()
{
# not an autotools configure
./configure --prefix=$prefix \
--datadir=/$relativeDataDir/cmake \
--docdir=/$relativeDocDir \
--mandir=/$relativeManDir \
--no-server \
--no-system-libs \
--system-curl \
--system-librhash \
--parallel=${jobArgs#-j} \
-- -DCMAKE_USE_LIBUV=0
make $jobArgs
}
INSTALL()
{
make install
# No way to tell this to configure...
mv $prefix/share/aclocal $dataDir
rmdir $prefix/share
}
TEST()
{
cp bin/ctest Bootstrap.cmk/
make test VERBOSE=1
}

64
dev-util/cmake/patches/cmake-3.16.0.patchset → dev-util/cmake/patches/cmake-3.18.4.patchset
View File

@@ -1,17 +1,17 @@
From 0bbd9a38b11050f32cf2fca8af4f8341344ca63e Mon Sep 17 00:00:00 2001
From 2d4028dd25addb772db78d2feb06dd46cb00b681 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 5976b2f..1dd659a 100644
index a8d81f7..57bb496 100644
--- a/Source/cmELF.cxx
+++ b/Source/cmELF.cxx
@@ -21,28 +21,20 @@
@@ -20,17 +20,18 @@
// Include the ELF format information system header.
#if defined(__OpenBSD__)
# include <elf_abi.h>
# include <stdint.h>
-#elif defined(__HAIKU__)
-# include <elf32.h>
-# include <elf64.h>
@@ -33,25 +33,21 @@ index 5976b2f..1dd659a 100644
+# endif
+# ifndef ELFMAG3
# 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>
# define ET_NONE 0
# define ET_REL 1
@@ -42,6 +43,7 @@ using Elf32_Rela = struct Elf32_Rela;
# define EM_PPC 20
#else
# include <elf.h>
+# endif
#endif
#if defined(__sun)
# include <sys/link.h> // For dynamic section information
--
2.24.0
2.28.0
From 572ea587e8c345177ca6804bf73148278a8a3735 Mon Sep 17 00:00:00 2001
From 2537a0d5d3a0f608e87b374386e6c800ebd674e8 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sat, 24 Mar 2018 14:19:43 +0100
Subject: Fix search path for Lua headers.
@@ -71,20 +67,20 @@ index 283a3eb..8fd73f2 100644
~/Library/Frameworks
/Library/Frameworks
--
2.24.0
2.28.0
From 382e246c35e29e60d3caa7583515f5e57bf65095 Mon Sep 17 00:00:00 2001
From 0c2a87666ce469081a22f0579870e35871d2d908 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sat, 7 Sep 2019 17:29:56 +0200
Subject: links against libnetwork
diff --git a/bootstrap b/bootstrap
index 883b165..e6d5dfc 100755
index 04067dc..34f2639 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1478,6 +1478,9 @@ else
@@ -1527,6 +1527,9 @@ else
uv_c_flags="${uv_c_flags} -D__EXTENSIONS__ -D_XOPEN_SOURCE=600"
libs="${libs} -lkstat -lnsl -lsendfile -lsocket -lrt"
;;
@@ -95,20 +91,20 @@ index 883b165..e6d5dfc 100755
fi
uv_c_flags="${uv_c_flags} `cmake_escape "-I${cmake_source_dir}/Utilities/cmlibuv/include"`"
--
2.24.0
2.28.0
From adb7f8b33e9ae223b0643239fb5134cccb2b85ef Mon Sep 17 00:00:00 2001
From c52012bab336206af17e1d5bc65831a0fba64e14 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sat, 7 Sep 2019 23:46:47 +0200
Subject: bootstrap uses cmlibuv
diff --git a/Utilities/cmlibuv/src/unix/core.c b/Utilities/cmlibuv/src/unix/core.c
index cf7dea0..5d23bf2 100644
index 7b80ed5..2f8ab6c 100644
--- a/Utilities/cmlibuv/src/unix/core.c
+++ b/Utilities/cmlibuv/src/unix/core.c
@@ -1377,7 +1377,9 @@ int uv_os_getpriority(uv_pid_t pid, int* priority) {
@@ -1418,7 +1418,9 @@ int uv_os_getpriority(uv_pid_t pid, int* priority) {
return UV_EINVAL;
errno = 0;
@@ -118,7 +114,7 @@ index cf7dea0..5d23bf2 100644
if (r == -1 && errno != 0)
return UV__ERR(errno);
@@ -1391,8 +1393,10 @@ int uv_os_setpriority(uv_pid_t pid, int priority) {
@@ -1432,8 +1434,10 @@ int uv_os_setpriority(uv_pid_t pid, int priority) {
if (priority < UV_PRIORITY_HIGHEST || priority > UV_PRIORITY_LOW)
return UV_EINVAL;
@@ -130,10 +126,10 @@ index cf7dea0..5d23bf2 100644
return 0;
}
--
2.24.0
2.28.0
From b48761aa83b8f815f54647a99d3eb11a0b64f4ac Mon Sep 17 00:00:00 2001
From 0ca0bc03e339d3bfedd93aa057cd187f7662d435 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sat, 21 Sep 2019 15:30:44 +0200
Subject: also detect secondary arch with clang.
@@ -155,20 +151,17 @@ index 7e0af61..4129c00 100644
if(NOT CMAKE_HAIKU_SECONDARY_ARCH)
set(CMAKE_HAIKU_SECONDARY_ARCH_SUBDIR "")
--
2.24.0
2.28.0
From eb38d3c7ff8edae11ba59ecfd3dcbe98b8a403d3 Mon Sep 17 00:00:00 2001
From 0d5b6a0f198cef80ef63aacb285bbd256de08b4f Mon Sep 17 00:00:00 2001
From: Augustin Cavalier <waddlesplash@gmail.com>
Date: Fri, 21 Feb 2020 15:38:39 -0500
Subject: [PATCH] Modules/Haiku: Set CMAKE_SYSTEM_FRAMEWORK_PATH.
Subject: Modules/Haiku: Set CMAKE_SYSTEM_FRAMEWORK_PATH.
---
Modules/Platform/Haiku.cmake | 3 +++
1 file changed, 3 insertions(+)
diff --git a/Modules/Platform/Haiku.cmake b/Modules/Platform/Haiku.cmake
index 4129c00..9523a92 100644
index 4129c00..90afe19 100644
--- a/Modules/Platform/Haiku.cmake
+++ b/Modules/Platform/Haiku.cmake
@@ -129,6 +129,9 @@ LIST(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
@@ -182,4 +175,5 @@ index 4129c00..9523a92 100644
set(CMAKE_INSTALL_PREFIX "/boot/system" CACHE PATH
"Install path prefix, prepended onto install directories." FORCE)
--
2.24.1
2.28.0

99
dev-util/cmake/patches/cmake-3.8.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

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

@@ -1,100 +0,0 @@
From eb5b1b21f9add5bccec9dd1d0df8db7f01dd7e8f 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 c3d202e..734f5f0 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.16.1
From 4db31de672c0607d1174fad544a8d72beb538e09 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 fc97bf3..5706f31 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.16.1
From 1fb2f9944d670e829608044f51cf9af6a1ab9b5e Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sat, 24 Mar 2018 14:19:43 +0100
Subject: Fix search path for Lua headers.
diff --git a/Modules/FindLua51.cmake b/Modules/FindLua51.cmake
index f2b2322..e127ba7 100644
--- a/Modules/FindLua51.cmake
+++ b/Modules/FindLua51.cmake
@@ -36,7 +36,7 @@
find_path(LUA_INCLUDE_DIR lua.h
HINTS
ENV LUA_DIR
- PATH_SUFFIXES include/lua51 include/lua5.1 include/lua-5.1 include/lua include
+ PATH_SUFFIXES include/lua51 include/lua5.1 include/lua-5.1 include/lua include lua5.1
PATHS
~/Library/Frameworks
/Library/Frameworks
--
2.16.1