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

cmake: fix install dirs, let FindPackage search in data/

Browse Source 
fix x86 build
This commit is contained in:
Jerome Duval
2021-10-20 15:19:51 +02:00
parent 5673551715
commit 896c8d0dd1
2 changed files with 59 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
dev-util/cmake/cmake-3.21.3.recipe
View File

@@ -7,7 +7,7 @@ of your choice."
HOMEPAGE="https://cmake.org/"
COPYRIGHT="2002-2021 Kitware, Inc., Insight Consortium"
LICENSE="CMake"
REVISION="1"
REVISION="2"
SOURCE_URI="https://cmake.org/files/v3.21/cmake-$portVersion.tar.gz"
CHECKSUM_SHA256="d14d06df4265134ee42c4d50f5a60cb8b471b7b6a47da8e5d914d49dd783794f"
SOURCE_DIR="cmake-$portVersion"
@@ -73,11 +73,11 @@ BUILD_PREREQUIRES="
"
defineDebugInfoPackage cmake$secondaryArchSuffix \
$binDir/ccmake \
$binDir/cmake \
$binDir/cpack \
$binDir/ctest \
"$(getPackagePrefix gui)/$relativeBinDir"/cmake-gui
$prefix/bin/ccmake \
$prefix/bin/cmake \
$prefix/bin/cpack \
$prefix/bin/ctest \
"$(getPackagePrefix gui)/bin"/cmake-gui
BUILD()
{
@@ -101,10 +101,7 @@ INSTALL()
make 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}
rm -rf $prefix/share
rm -rf $dataDir/{emacs,vim}
# GUI
packageEntries "gui" \

59
dev-util/cmake/patches/cmake-3.21.3.patchset
View File

@@ -1,4 +1,4 @@
From 2fd15a1c4f61ddfce3815e987004babc127c954d Mon Sep 17 00:00:00 2001
From 1b3e721bb854f2a0e4083ced3b2654f1f66a2cbd 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.
@@ -47,7 +47,7 @@ index 9a474e3..d55b856 100644
2.30.2
From f4fa1c53a141f1a8072008987c3a3f881c531556 Mon Sep 17 00:00:00 2001
From 1dc5dfcefd65f3a35b2c12aeb53cb0b9e970aefa 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.
@@ -70,7 +70,7 @@ index 283a3eb..8fd73f2 100644
2.30.2
From 8ae5f8b1b118b476e61a5a0d8c5477c852212a6e Mon Sep 17 00:00:00 2001
From 6147f7c4ec0414755a214b51d33a197f399007eb 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
@@ -94,7 +94,7 @@ index dc5ed0b..0fceaa8 100755
2.30.2
From 6ccb36fb17d036fb99bb48d2eb1259cd31ee48db Mon Sep 17 00:00:00 2001
From 70c110f38cbc585bf57e9528e8b3bcffa01f93ed 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
@@ -129,7 +129,7 @@ index e6d61ee..9d9bba9 100644
2.30.2
From a5251156fab1ba563ce893162f91a369c6d4a120 Mon Sep 17 00:00:00 2001
From e54ae0dfc52e15d6f39f0bfff5c3281c24676f4e 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.
@@ -154,7 +154,7 @@ index b8e3ba6..08b11a4 100644
2.30.2
From 6e3ecb7124d9481037e453e973da367ad85453a8 Mon Sep 17 00:00:00 2001
From 12a3896bb9dbd39eb0f49e5ad2a4ab6e8dca096f Mon Sep 17 00:00:00 2001
From: Augustin Cavalier <waddlesplash@gmail.com>
Date: Fri, 21 Feb 2020 15:38:39 -0500
Subject: Modules/Haiku: Set CMAKE_SYSTEM_FRAMEWORK_PATH.
@@ -178,7 +178,7 @@ index 08b11a4..9a8ae60 100644
2.30.2
From e1de5a3d22a7ac68b32907e77a4bea2822551a25 Mon Sep 17 00:00:00 2001
From 7ad86704b376309a990b43273cb9170215d2b1b8 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Thu, 15 Apr 2021 21:09:12 +0200
Subject: disable dependency tracking for older GNU compilers
@@ -202,3 +202,48 @@ index 928e726..87d0167 100644
--
2.30.2
From 3d806e79d74e07bf8208b4e2f650b757edf9c18e Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Wed, 20 Oct 2021 14:28:22 +0200
Subject: Haiku: fix install dirs, let FindPackage search in data/
diff --git a/Source/CMakeInstallDestinations.cmake b/Source/CMakeInstallDestinations.cmake
index e82bec3..7e5f577 100644
--- a/Source/CMakeInstallDestinations.cmake
+++ b/Source/CMakeInstallDestinations.cmake
@@ -1,11 +1,11 @@
# Keep formatting here consistent with bootstrap script expectations.
-if(BEOS)
+if(BEOS OR HAIKU)
set(CMAKE_BIN_DIR_DEFAULT "bin") # HAIKU
- set(CMAKE_DATA_DIR_DEFAULT "share/cmake-${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}") # HAIKU
+ set(CMAKE_DATA_DIR_DEFAULT "data/cmake-${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}") # HAIKU
set(CMAKE_DOC_DIR_DEFAULT "documentation/doc/cmake-${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}") # HAIKU
set(CMAKE_INFO_DIR_DEFAULT "documentation/info") # HAIKU
set(CMAKE_MAN_DIR_DEFAULT "documentation/man") # HAIKU
- set(CMAKE_XDGDATA_DIR_DEFAULT "share") # HAIKU
+ set(CMAKE_XDGDATA_DIR_DEFAULT "data") # HAIKU
elseif(CYGWIN)
set(CMAKE_BIN_DIR_DEFAULT "bin") # CYGWIN
set(CMAKE_DATA_DIR_DEFAULT "share/cmake-${CMake_VERSION}") # CYGWIN
diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx
index fba736e..c437582 100644
--- a/Source/cmFindPackageCommand.cxx
+++ b/Source/cmFindPackageCommand.cxx
@@ -2317,7 +2317,11 @@ bool cmFindPackageCommand::SearchPrefix(std::string const& prefix_in)
common.emplace_back("libx32");
}
common.emplace_back("lib");
+#ifdef __HAIKU__
+ common.emplace_back("data");
+#else
common.emplace_back("share");
+#endif
// PREFIX/(lib/ARCH|lib*|share)/cmake/(Foo|foo|FOO).*/
{
--
2.30.2