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

Udate cmaek recipe to 3.0.0 rc6

Browse Source 
* Remove previous RCs
* Add fix to FindOpenAL module.
This commit is contained in:
Adrien Destugues
2014-06-09 22:42:16 +02:00
parent ea6fca8524
commit 8029989021
4 changed files with 37 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
dev-util/cmake/cmake-3.0.0_rc1.recipe
View File

@@ -1,72 +0,0 @@
SUMMARY="Cross platform Make"
DESCRIPTION="
CMake is a cross-platform, open-source build system. It is a family of tools \
designed to build, test and package software. CMake 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="http://www.cmake.org"
LICENSE="CMake"
COPYRIGHT="2002-2013 Kitware, Inc., Insight Consortium, All rights reserved."
SRC_URI="http://www.cmake.org/files/v3.0/cmake-3.0.0-rc1.tar.gz"
CHECKSUM_SHA256="f13ac75c2440cb81aa1c193cf4f3898092f72a0c2d43b7b02f8476a8e5e1d1e6"
REVISION="7"
ARCHITECTURES="x86 x86_64 arm"
if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
# x86_gcc2 is fine as primary target architecture as long as we're building
# for a different secondary architecture.
ARCHITECTURES="$ARCHITECTURES x86_gcc2"
fi
SECONDARY_ARCHITECTURES="x86"
PROVIDES="
cmake = $portVersion compat >= 3.0
cmd:cmake = $portVersion compat >= 3.0
cmd:ccmake = $portVersion compat >= 3.0
cmd:cpack = $portVersion compat >= 3.0
cmd:ctest = $portVersion compat >= 3.0
"
REQUIRES="
haiku$secondaryArchSuffix >= $haikuVersion
lib:libncurses$secondaryArchSuffix
"
BUILD_REQUIRES="
devel:libncurses$secondaryArchSuffix
"
BUILD_PREREQUIRES="
haiku${secondaryArchSuffix}_devel >= $haikuVersion
haiku_devel >= $haikuVersion
cmd:gcc$secondaryArchSuffix
cmd:grep
cmd:ld$secondaryArchSuffix
cmd:libtool
cmd:make
cmd:sed
"
PATCHES="cmake-$portVersion.patchset"
SOURCE_DIR="cmake-3.0.0-rc1"
BUILD()
{
./configure --prefix=$prefix \
--datadir=/$relativeDataDir/cmake \
--docdir=/$relativeDocDir \
--mandir=/$relativeManDir
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
}

73
dev-util/cmake/cmake-3.0.0_rc5.recipe
View File

@@ -1,73 +0,0 @@
SUMMARY="Cross platform Make"
DESCRIPTION="
CMake is a cross-platform, open-source build system. It is a family of tools \
designed to build, test and package software. CMake 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="http://www.cmake.org"
LICENSE="CMake"
COPYRIGHT="2002-2013 Kitware, Inc., Insight Consortium, All rights reserved."
SRC_URI="http://www.cmake.org/files/v3.0/cmake-3.0.0-rc5.tar.gz"
CHECKSUM_SHA256="fa8e76e5ed44199f4ceef24abd65a4d7df2d857edf44094d4ae7a2401af78389"
REVISION="1"
ARCHITECTURES="x86 x86_64"
if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
# x86_gcc2 is fine as primary target architecture as long as we're building
# for a different secondary architecture.
ARCHITECTURES="$ARCHITECTURES x86_gcc2"
fi
SECONDARY_ARCHITECTURES="x86"
PROVIDES="
cmake = $portVersion compat >= 3.0
cmd:cmake = $portVersion compat >= 3.0
cmd:ccmake = $portVersion compat >= 3.0
cmd:cpack = $portVersion compat >= 3.0
cmd:ctest = $portVersion compat >= 3.0
"
REQUIRES="
haiku$secondaryArchSuffix >= $haikuVersion
lib:libstdc++$secondaryArchSuffix
lib:libncurses$secondaryArchSuffix
"
BUILD_REQUIRES="
devel:libncurses$secondaryArchSuffix
"
BUILD_PREREQUIRES="
haiku${secondaryArchSuffix}_devel >= $haikuVersion
haiku_devel >= $haikuVersion
cmd:gcc$secondaryArchSuffix
cmd:grep
cmd:ld$secondaryArchSuffix
cmd:libtool
cmd:make
cmd:sed
"
PATCHES="cmake-3.0.0_rc1.patchset"
SOURCE_DIR="cmake-3.0.0-rc5"
BUILD()
{
./configure --prefix=$prefix \
--datadir=/$relativeDataDir/cmake \
--docdir=/$relativeDocDir \
--mandir=/$relativeManDir
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
}

12
dev-util/cmake/cmake-3.0.0_rc3.recipe → dev-util/cmake/cmake-3.0.0_rc6.recipe
View File

@@ -8,9 +8,9 @@ be used in the compiler environment of your choice.
"
HOMEPAGE="http://www.cmake.org"
LICENSE="CMake"
COPYRIGHT="2002-2013 Kitware, Inc., Insight Consortium, All rights reserved."
SRC_URI="http://www.cmake.org/files/v3.0/cmake-3.0.0-rc3.tar.gz"
CHECKSUM_SHA256="5d4fc1783825caa2a898374b7bf656652531984290f5969bf86e87222f16a2d3"
COPYRIGHT="2002-2014 Kitware, Inc., Insight Consortium, All rights reserved."
SRC_URI="http://www.cmake.org/files/v3.0/cmake-3.0.0-rc6.tar.gz"
CHECKSUM_SHA256="bb34dacec33b3ac26ee05b0a66b95ed8f52a0ce212f13c3e65a923944cdd484a"
REVISION="1"
ARCHITECTURES="x86 x86_64"
if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
@@ -21,7 +21,7 @@ fi
SECONDARY_ARCHITECTURES="x86"
PROVIDES="
cmake = $portVersion compat >= 3.0
cmake$secondaryArchSuffix = $portVersion compat >= 3.0
cmd:cmake = $portVersion compat >= 3.0
cmd:ccmake = $portVersion compat >= 3.0
cmd:cpack = $portVersion compat >= 3.0
@@ -45,8 +45,8 @@ BUILD_PREREQUIRES="
cmd:make
cmd:sed
"
PATCHES="cmake-3.0.0_rc1.patchset"
SOURCE_DIR="cmake-3.0.0-rc3"
PATCHES="cmake-3.0.0_rc6.patchset"
SOURCE_DIR="cmake-3.0.0-rc6"
BUILD()
{
./configure --prefix=$prefix \

39
dev-util/cmake/patches/cmake-3.0.0_rc1.patchset → dev-util/cmake/patches/cmake-3.0.0_rc6.patchset
View File

@@ -1,4 +1,4 @@
From cec0c89807f9215ea077b7e9c14dc9d053919bd6 Mon Sep 17 00:00:00 2001
From d0a76bec3bee73af9c9d78155f4349767c36cf3b Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Mon, 3 Mar 2014 15:47:08 +0100
Subject: Allow use of elf relocation on Haiku.
@@ -119,7 +119,7 @@ index 0000000..6b868bb
1.8.3.4
From a9a536582f3d035673438734cf6872871fce3605 Mon Sep 17 00:00:00 2001
From 17c717fe8893ccfd6afa625fce620e4f61d87036 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Mon, 3 Mar 2014 15:51:49 +0100
Subject: Add HPKG generation support to CPack.
@@ -1065,7 +1065,7 @@ index 0000000..ffa803d
1.8.3.4
From 8637f997646e2e3af5e1cc2506a217c712dec978 Mon Sep 17 00:00:00 2001
From 7e671315610ade4309c6c1e9bc151e2ad82beeac Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Mon, 3 Mar 2014 15:57:05 +0100
Subject: Haiku: Fix compiler detection when using distcc.
@@ -1146,7 +1146,7 @@ index 825f851..af6697a 100644
1.8.3.4
From a0951c88746d915cc54fb9261ca4c9e56a22898c Mon Sep 17 00:00:00 2001
From 7193c39809d8c4a17fca2a77fc4f1ec0341dc97a Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Mon, 3 Mar 2014 16:01:23 +0100
Subject: Adjust header search paths for some modules.
@@ -1220,7 +1220,7 @@ index 3f58ac1..c48fcbe 100644
1.8.3.4
From 963b8828af64669032a8b03363e9e25844646bfc Mon Sep 17 00:00:00 2001
From 087148b32a8ce3da98670da32848a93b106f8a60 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Mon, 3 Mar 2014 16:10:05 +0100
Subject: Update CPU frequency detection code.
@@ -1229,10 +1229,10 @@ The scheduler branch in Haiku changed the API for this.
(patch already submitted upstream)
diff --git a/Source/kwsys/SystemInformation.cxx b/Source/kwsys/SystemInformation.cxx
index 5f20853..9c26380 100644
index ec3a133..0708044 100644
--- a/Source/kwsys/SystemInformation.cxx
+++ b/Source/kwsys/SystemInformation.cxx
@@ -4698,11 +4698,28 @@ bool SystemInformationImplementation::QueryHaikuInfo()
@@ -4685,11 +4685,28 @@ bool SystemInformationImplementation::QueryHaikuInfo()
{
#if defined(__HAIKU__)
@@ -1267,7 +1267,7 @@ index 5f20853..9c26380 100644
1.8.3.4
From e8af83035ae75596f931c7e8a2b5b47d8160933a Mon Sep 17 00:00:00 2001
From 01177b87e917b3c66b13838caaa69710ff879bb3 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Mon, 10 Mar 2014 14:11:01 +0100
Subject: Fix the architecture detection regexp again.
@@ -1293,3 +1293,26 @@ index af6697a..920ae8f 100644
--
1.8.3.4
From 0158e13fa60eee2b2fcb916ed0903e49d0c58f23 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
--
1.8.3.4