From 556d3ef8b90e55c22957041257c14bbc17e7e1a9 Mon Sep 17 00:00:00 2001 From: miqlas Date: Tue, 24 Jan 2017 22:07:13 +0100 Subject: [PATCH] cmake: bump version (#1081) --- dev-util/cmake/cmake-3.7.2.recipe | 76 ++++++++++++++++ dev-util/cmake/patches/cmake-3.7.2.patchset | 99 +++++++++++++++++++++ 2 files changed, 175 insertions(+) create mode 100644 dev-util/cmake/cmake-3.7.2.recipe create mode 100644 dev-util/cmake/patches/cmake-3.7.2.patchset diff --git a/dev-util/cmake/cmake-3.7.2.recipe b/dev-util/cmake/cmake-3.7.2.recipe new file mode 100644 index 000000000..5b5041b2e --- /dev/null +++ b/dev-util/cmake/cmake-3.7.2.recipe @@ -0,0 +1,76 @@ +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="1" +SOURCE_URI="https://cmake.org/files/v3.7/cmake-$portVersion.tar.gz" +CHECKSUM_SHA256="dc1246c4e6d168ea4d6e042cfba577c1acd65feea27e56f5ff37df920c30cae0" +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:cmake = $portVersion compat >= 3 + cmd:ccmake = $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 +} diff --git a/dev-util/cmake/patches/cmake-3.7.2.patchset b/dev-util/cmake/patches/cmake-3.7.2.patchset new file mode 100644 index 000000000..2f2ca205c --- /dev/null +++ b/dev-util/cmake/patches/cmake-3.7.2.patchset @@ -0,0 +1,99 @@ +From 92d374dd798f1b805d91395991ea1679358321c2 Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +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 +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 + #include +-#elif defined(__HAIKU__) +-#include +-#include +-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 ++# 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 // For dynamic section information +-- +2.11.0 + + +From 7782383697fe69839f2e1b9afff378f9a51a5305 Mon Sep 17 00:00:00 2001 +From: Jerome Duval +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