diff --git a/dev-util/cmake/cmake-3.3.2.recipe b/dev-util/cmake/cmake-3.3.2.recipe index 552df67f0..d63df8e93 100644 --- a/dev-util/cmake/cmake-3.3.2.recipe +++ b/dev-util/cmake/cmake-3.3.2.recipe @@ -7,7 +7,7 @@ of your choice." HOMEPAGE="http://www.cmake.org" COPYRIGHT="2002-2014 Kitware, Inc., Insight Consortium" LICENSE="CMake" -REVISION="2" +REVISION="3" SOURCE_URI="http://www.cmake.org/files/v3.3/cmake-$portVersion.tar.gz" CHECKSUM_SHA256="e75a178d6ebf182b048ebfe6e0657c49f0dc109779170bad7ffcb17463f2fc22" SOURCE_DIR="cmake-$portVersion" @@ -30,7 +30,6 @@ REQUIRES=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libncurses$secondaryArchSuffix - devel:libqt5$secondaryArchSuffix " BUILD_PREREQUIRES=" @@ -46,51 +45,22 @@ BUILD_PREREQUIRES=" BUILD() { # not an autotools configure - # TODO: remove Qt5Widgets_DIR when Qt5 package is fixed - Qt5Widgets_DIR=/system/data/cmake/Modules/Qt5Widgets \ ./configure --prefix=$prefix \ --datadir=/$relativeDataDir/cmake \ --docdir=/$relativeDocDir \ - --mandir=/$relativeManDir \ - --qt-gui - + --mandir=/$relativeManDir make $jobArgs } INSTALL() { make install - strip -s $prefix/bin/* # No way to tell this to configure... mv $prefix/share/aclocal $dataDir - rm -rf $prefix/share - - packageEntries gui \ - $prefix/bin/cmake-gui + rmdir $prefix/share } -SUMMARY_gui="A GUI tool for cross-platform build system" -DESCRIPTION_gui="The “cmake-gui” executable is the CMake GUI. Project \ -configuration settings may be specified interactively. Brief instructions \ -are provided at the bottom of the window when the program is running. - -CMake is a cross-platform build system generator. Projects specify their \ -build process with platform-independent CMake listfiles included in each \ -directory of a source tree with the name CMakeLists.txt. Users build a \ -project by using CMake to generate a build system for a native tool on \ -their platform." - -PROVIDES_gui=" - cmake_gui${secondaryArchSuffix} = $portVersion - cmd:cmake_gui${secondaryArchSuffix} = $portVersion - " -REQUIRES_gui=" - haiku$secondaryArchSuffix - cmake$secondaryArchSuffix == $portVersion base - lib:libqt5$secondaryArchSuffix - " - TEST() { cp bin/ctest Bootstrap.cmk/ diff --git a/dev-util/cmake/patches/cmake-3.3.2.patchset b/dev-util/cmake/patches/cmake-3.3.2.patchset index ac5897ac5..f63d3f018 100644 --- a/dev-util/cmake/patches/cmake-3.3.2.patchset +++ b/dev-util/cmake/patches/cmake-3.3.2.patchset @@ -1,4 +1,4 @@ -From 39333f7fd44b281cdaafb98820d549c923103011 Mon Sep 17 00:00:00 2001 +From 551d725dbdcc4a66e7bfbd172d6b65907c1cb9d0 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Mon, 9 Jun 2014 22:30:55 +0200 Subject: Fix OpenAL search path. @@ -20,3 +20,58 @@ index 8150ff2..e0276f8 100644 -- 2.2.2 + +From 91ff2dc74b26ad0511bc2591698078c15b5afb6b 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 d062987..40f2f03 100644 +--- a/Source/cmELF.cxx ++++ b/Source/cmELF.cxx +@@ -23,28 +23,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.2.2 +