mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-22 19:50:05 +02:00
cmake: bump version
move to dev-build more tests failed in this version for some reason
This commit is contained in:
Jerome Duval
@@ -1,95 +0,0 @@
|
||||
resource app_flags B_SINGLE_LAUNCH;
|
||||
|
||||
resource app_version {
|
||||
major = @MAJOR@,
|
||||
middle = @MIDDLE@,
|
||||
minor = @MINOR@,
|
||||
|
||||
variety = B_APPV_FINAL,
|
||||
internal = 0,
|
||||
|
||||
short_info = "@APP_NAME@",
|
||||
long_info = "@LONG_INFO@"
|
||||
};
|
||||
|
||||
resource app_signature "@APP_SIGNATURE@";
|
||||
|
||||
resource vector_icon {
|
||||
$"6E6369660A0401910501020106020000003CAA64BE49020000004940004A3000"
|
||||
$"7B7588ADFFCEE5FF0200060338D3D73CD11EBCD11E38D3D74CD11E46C66600BF"
|
||||
$"DEF4BCFFFFFFFFE7EEFB020006023A55C2BAC23D3AC23D3A55C2C95828C82EE1"
|
||||
$"00010101FF5296CB0322A7F002000602364B28B6B874365CEF35FBE94E2193C8"
|
||||
$"492E00C61423FFDC2B410200060236801EB6F747369380362BF44CE6C64A1CC7"
|
||||
$"00197CF1FF20BCFA02000602384C11B8B98A385DE037FD7F4E71344B671E0042"
|
||||
$"A603FF78DA06020016023C335C3AD23DBAD23D3C335C4988A3499C7A00FDFF8D"
|
||||
$"1C0606FF075A425A42CAA3415E3FCB2C40CB2CBF165A3DCAA3BED1593E574058"
|
||||
$"3F58C0045A4259C0475A4242020B3B593B59BE05C9FA3D5BBE4ACA3DBEF7CA15"
|
||||
$"BFCBC93CBF61C9A9C071C9A9455BC117CA15C2DAC8FBC514C5EFC3F7C775C78D"
|
||||
$"C4AB6046CA06C367CBD5455B43CB2C44CAC6C1365D45CB09C179C7FC494451C4"
|
||||
$"A94D41C7963B593EC8A53B593B593B593B590607FE1FB57B3EB9B8C3EFB7B944"
|
||||
$"BBB651BD73C935BD73C935C1D1C6B3CA8DC1AFC62FC431C6F3BEC8402FC359BB"
|
||||
$"E1BC5334B57B3EB8E739B57B3E3E0607FE1FB57B3EB9B8C3EFB7B944BBB651BD"
|
||||
$"73C935BD73C935C1D1C6B3CA8DC1AFC62FC431C6F3BEC8402FC359BBE1BC5334"
|
||||
$"B57B3EB8E739B57B3E3E0608FE7FB409BF4C33C3ADB75BC171BDEEC606C13DC8"
|
||||
$"03C13DC803C436C482CA27BD81C72EC102CA27BD81C116B91EC519BB3FBF06B8"
|
||||
$"063AB6BA3AB6BABA40B996B409BF4CB724BC71B409BF4CBF4C0608FE7FB409BF"
|
||||
$"4C33C3ADB75BC171BDEEC606C13DC803C13DC803C436C482CA27BD81C72EC102"
|
||||
$"CA27BD81C116B91EC519BB3FBF06B8063AB6BA3AB6BABA40B996B409BF4CB724"
|
||||
$"BC71B409BF4CBF4C00023A493A49BF7CC1364A39C19CBF164A39000236463646"
|
||||
$"BDE4C0044636C004BDE4463600022E402E40313D3737343A37370002363F363F"
|
||||
$"BD39BDE44134BEB0BC6D4134000338333833BCB2BAD53935BCD3BB1ABD39BB80"
|
||||
$"3B36BD7EBBA13B3600033A313A31BD9FB9E83C32BDE4BA09BE4ABA6F3D34BE6B"
|
||||
$"BAB43D340606FE07B3B3B54CB3B3B54CB3B3B54CB3B3B974B3B3C1C4B3B3BD9C"
|
||||
$"B3B3C1C4B3B3C1C4B3B3C1C4B3B3BD9CB3B3B54CB3B3B974B3B3B54CB54C0605"
|
||||
$"FF01BB9EBAF9BB9EBAF9BE1EBCAEC31FC019C09FBE64C4BBBF21C7F4BD31C657"
|
||||
$"BE29C3D7BC74BB9EBAF9BFBABBB6BB9EBAF9BAF90605FF01BB9EBAF9BB9EBAF9"
|
||||
$"BD0BBEE6BFE4C6C1BE77C2D4BFFEC3DFC033BE1AC019C0FCBEACBD0FBB9EBAF9"
|
||||
$"BD25BC04BB9EBAF9BAF90606FF05BFE2C6BCBFE2C6BCBFE2C6BEBFE2C6C3BFE2"
|
||||
$"C6C1BFE3C6C2BFE4C6C1BFE4C6C1BFE3C6BFBFE2C6BCBFE3C6BDBFE2C6BCC6BC"
|
||||
$"C6BC0606FF05C010C1F0C010C1F0C002C38BBFE4C6C1BFF3C526C294C391C7F4"
|
||||
$"BD31C544C061C552BEC6C010C1F0C2B1C05BC010C1F0C1F0C1F00606FE07AD41"
|
||||
$"B8DEAD41B8DEAD41B8DEAD41BD06AD41C556AD41C12EAD41C556AD41C556AD41"
|
||||
$"C556AD41C12EAD41B8DEAD41BD06AD41B8DEB8DE0606FE07A6DEA747A6DEA747"
|
||||
$"A6DEA747A6DEAB6EA6DEB3BDA6DEAF96A6DEB3BDA6DEB3BDA6DEB3BDA6DEAF96"
|
||||
$"A6DEA747A6DEAB6EA6DEA747A7470606FE07A811B89CA811B89CA811B89CA811"
|
||||
$"BCC4A811C513A811C0EBA811C513A811C513A811C513A811C0EBA811B89CA811"
|
||||
$"BCC4A811B89CB89C0606FE07A19DBC2EA19DBC2EA19DBC2EA19DC055A19DC8A5"
|
||||
$"A19DC47DA19DC8A5A19DC8A5A19DC8A5A19DC47DA19DBC2EA19DC055A19DBC2E"
|
||||
$"BC2E000332403240BA4EC0043342BA6FC047BAD5C0AD3543BB1AC0D035430003"
|
||||
$"3F493F49BF9DC377414ABFE1C39AC047C400424CC06AC443424C0606FF073449"
|
||||
$"344934C3FC314CBA6D4CB91C4C2E492EC3FE2EC2AC3146B91A46BA6C46344934"
|
||||
$"C2AB3449490223B97D3CB97D3CB890BE34B6F5BEF8B7B3BE7FB6F5BEF8B727BF"
|
||||
$"CDB6F0BF77B74CC007B797C07AB771C040B709C0E5B65FC226B69CC17AB61EC2"
|
||||
$"15B59CC1F3B5DDC204B53AC1D9B4C2C203B4C2C203B4A7C26DB499C350B499C2"
|
||||
$"DCB499C3C9B4C6C4AEB4A7C43FB4C6C4AEB5A0C4BBB53CC4D6B5E1C4A8B664C4"
|
||||
$"84B622C496B6A0C52EB79AC62BB70DC5C0B775C663B72BC6D4B750C69CB6F4C7"
|
||||
$"2AB6F8C7A9B6F8C7A9B7B4C822B97EC879B890C86CB97EC879B9CFC7B2B9CAC8"
|
||||
$"16B9D2C76DB9D8C6E2B9D5C72833C6DFBBCDC642BB3DC6A5BBF7C677BC4CC6E1"
|
||||
$"BC22C6ACBC8AC731BD03C756BD03C756BDB4C6C6BE95C530BE41C608BE95C530"
|
||||
$"BDF0C4A7BE4EC4CDBDB1C48EBD32C45BBD71C474BD4BC407BD57C350BD57C3AD"
|
||||
$"BD57C2F9BD35C251BD4CC2A3BD74C23ABDF1C20ABDB3C222BE52C1E6BE9AC17C"
|
||||
$"BE9AC17CBE47C0A2BD09BF4FBDBCBFE2BD09BF4FBC51BFC4BC93BF75BC27BFF9"
|
||||
$"BBD2C064BBFCC02EBB42C000B9D840BA95BFC2B9D5BF7AB9CFBEEFB9D2BF35B9"
|
||||
$"CABE89B97E3CB97E3CB97E3CB97D3CB97D3CB97D3CB97D3CB97D3CB97D3C0606"
|
||||
$"FF073449344934C3FC314CBA6D4CB91C4C2E492EC3FE2EC2AC3146B91A46BA6C"
|
||||
$"46344934C2AB3449490223B97D3CB97D3CB890BE34B6F5BEF8B7B3BE7FB6F5BE"
|
||||
$"F8B727BFCDB6F0BF77B74CC007B797C07AB771C040B709C0E5B65FC226B69CC1"
|
||||
$"7AB61EC215B59CC1F3B5DDC204B53AC1D9B4C2C203B4C2C203B4A7C26DB499C3"
|
||||
$"50B499C2DCB499C3C9B4C6C4AEB4A7C43FB4C6C4AEB5A0C4BBB53CC4D6B5E1C4"
|
||||
$"A8B664C484B622C496B6A0C52EB79AC62BB70DC5C0B775C663B72BC6D4B750C6"
|
||||
$"9CB6F4C72AB6F8C7A9B6F8C7A9B7B4C822B97EC879B890C86CB97EC879B9CFC7"
|
||||
$"B2B9CAC816B9D2C76DB9D8C6E2B9D5C72833C6DFBBCDC642BB3DC6A5BBF7C677"
|
||||
$"BC4CC6E1BC22C6ACBC8AC731BD03C756BD03C756BDB4C6C6BE95C530BE41C608"
|
||||
$"BE95C530BDF0C4A7BE4EC4CDBDB1C48EBD32C45BBD71C474BD4BC407BD57C350"
|
||||
$"BD57C3ADBD57C2F9BD35C251BD4CC2A3BD74C23ABDF1C20ABDB3C222BE52C1E6"
|
||||
$"BE9AC17CBE9AC17CBE47C0A2BD09BF4FBDBCBFE2BD09BF4FBC51BFC4BC93BF75"
|
||||
$"BC27BFF9BBD2C064BBFCC02EBB42C000B9D840BA95BFC2B9D5BF7AB9CFBEEFB9"
|
||||
$"D2BF35B9CABE89B97E3CB97E3CB97E3CB97D3CB97D3CB97D3CB97D3CB97D3CB9"
|
||||
$"7D3C0606FE079B3AAA979B3AAA979B3AAA979B3AAEBF9B3AB70E9B3AB2E69B3A"
|
||||
$"B70E9B3AB70E9B3AB70E9B3AB2E69B3AAA979B3AAEBF9B3AAA97AA97160A0002"
|
||||
$"0001000A0101021001178400040A020103000A0101041001178400040A030105"
|
||||
$"000A04030607081001178100040A0401091001178100040A01010A1001178100"
|
||||
$"040A01010B1001178100040A05010C000A06010D000A07010E000A08020F1000"
|
||||
$"0A050111000A050112000A050113000A050114000A0101151001178100040A01"
|
||||
$"01161001178100040A010217181001178400040A0902191A000A05011B00"
|
||||
};
|
||||
@@ -1,161 +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-2022 Kitware, Inc., Insight Consortium"
|
||||
LICENSE="CMake"
|
||||
REVISION="2"
|
||||
SOURCE_URI="https://cmake.org/files/v${portVersion%.*}/cmake-$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256="08f71a106036bf051f692760ef9558c0577c42ac39e96ba097e7662bd4158d8e"
|
||||
PATCHES="cmake-$portVersion.patchset"
|
||||
ADDITIONAL_FILES="cmake.rdef.in"
|
||||
|
||||
ARCHITECTURES="all !x86_gcc2 ?x86 ?arm"
|
||||
SECONDARY_ARCHITECTURES="x86"
|
||||
|
||||
portVersionCompat="$portVersion compat >= ${portVersion%%.*}"
|
||||
|
||||
PROVIDES="
|
||||
cmake$secondaryArchSuffix = $portVersionCompat
|
||||
cmd:ccmake = $portVersionCompat
|
||||
cmd:cmake = $portVersionCompat
|
||||
cmd:cpack = $portVersionCompat
|
||||
cmd:ctest = $portVersionCompat
|
||||
"
|
||||
REQUIRES="
|
||||
haiku$secondaryArchSuffix
|
||||
lib:libcurl$secondaryArchSuffix
|
||||
lib:libncurses$secondaryArchSuffix
|
||||
lib:librhash$secondaryArchSuffix
|
||||
lib:libstdc++$secondaryArchSuffix
|
||||
lib:libuv$secondaryArchSuffix
|
||||
lib:libz$secondaryArchSuffix
|
||||
"
|
||||
|
||||
SUMMARY_gui="$SUMMARY (gui)"
|
||||
DESCRIPTION_gui="$DESCRIPTION (gui)"
|
||||
|
||||
PROVIDES_gui="
|
||||
cmake${secondaryArchSuffix}_gui = $portVersion
|
||||
cmd:cmake_gui = $portVersionCompat
|
||||
"
|
||||
REQUIRES_gui="
|
||||
haiku$secondaryArchSuffix
|
||||
cmake$secondaryArchSuffix == $portVersion base
|
||||
lib:libcurl$secondaryArchSuffix
|
||||
lib:libQt5Core$secondaryArchSuffix
|
||||
lib:libQt5Gui$secondaryArchSuffix
|
||||
lib:libQt5Widgets$secondaryArchSuffix
|
||||
lib:librhash$secondaryArchSuffix
|
||||
lib:libstdc++$secondaryArchSuffix
|
||||
lib:libuv$secondaryArchSuffix
|
||||
lib:libz$secondaryArchSuffix
|
||||
"
|
||||
|
||||
BUILD_REQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
devel:libcurl$secondaryArchSuffix
|
||||
devel:libncurses$secondaryArchSuffix
|
||||
devel:libQt5Core$secondaryArchSuffix
|
||||
devel:libQt5Gui$secondaryArchSuffix
|
||||
devel:libQt5Widgets$secondaryArchSuffix
|
||||
devel:librhash$secondaryArchSuffix
|
||||
devel:libuv$secondaryArchSuffix
|
||||
devel:libz$secondaryArchSuffix
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
cmd:gcc$secondaryArchSuffix
|
||||
cmd:grep
|
||||
cmd:ld$secondaryArchSuffix
|
||||
cmd:libtoolize$secondaryArchSuffix
|
||||
cmd:make
|
||||
cmd:sed
|
||||
"
|
||||
|
||||
defineDebugInfoPackage cmake$secondaryArchSuffix \
|
||||
$prefix/bin/ccmake \
|
||||
$prefix/bin/cmake \
|
||||
$prefix/bin/cpack \
|
||||
$prefix/bin/ctest \
|
||||
"$(getPackagePrefix gui)/bin"/cmake-gui
|
||||
|
||||
BUILD()
|
||||
{
|
||||
# not an autotools configure
|
||||
./configure --prefix=$prefix \
|
||||
--datadir=/$relativeDataDir/cmake \
|
||||
--docdir=/$relativeDocDir \
|
||||
--mandir=/$relativeManDir \
|
||||
--xdgdatadir=/$relativeDataDir \
|
||||
--no-system-libs \
|
||||
--system-curl \
|
||||
--system-librhash \
|
||||
--system-libuv \
|
||||
--qt-gui \
|
||||
--parallel=${jobArgs#-j}
|
||||
|
||||
make $jobArgs
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
{
|
||||
make install
|
||||
|
||||
# No way to tell this to configure...
|
||||
rm -rf $dataDir/{applications,emacs,icons,mime,vim}
|
||||
|
||||
local MAJOR="`echo "$portVersion" | cut -d. -f1`"
|
||||
local MIDDLE="`echo "$portVersion" | cut -d. -f2`"
|
||||
local MINOR="`echo "$portVersion" | cut -d. -f3`"
|
||||
local APP_NAME="CMake-GUI"
|
||||
local LONG_INFO="$SUMMARY"
|
||||
local APP_SIGNATURE="application/x-vnd.cmake-gui"
|
||||
sed \
|
||||
-e "s|@MAJOR@|$MAJOR|" \
|
||||
-e "s|@MIDDLE@|$MIDDLE|" \
|
||||
-e "s|@MINOR@|$MINOR|" \
|
||||
-e "s|@LONG_INFO@|$LONG_INFO|" \
|
||||
-e "s|@APP_NAME@|$APP_NAME|" \
|
||||
-e "s|@APP_SIGNATURE@|$APP_SIGNATURE|" \
|
||||
$portDir/additional-files/cmake.rdef.in > cmake.rdef
|
||||
|
||||
addResourcesToBinaries cmake.rdef $prefix/bin/cmake-gui
|
||||
|
||||
addAppDeskbarSymlink $prefix/bin/cmake-gui CMake-GUI
|
||||
|
||||
# GUI
|
||||
packageEntries "gui" \
|
||||
$prefix/bin/cmake-gui \
|
||||
$dataDir/deskbar
|
||||
}
|
||||
|
||||
TEST()
|
||||
{
|
||||
#x86_64
|
||||
#97% tests passed, 19 tests failed out of 621
|
||||
# 6 - kwsys.testSystemTools (Failed)
|
||||
# 27 - FindPackageTest (Failed)
|
||||
# 59 - ExportImport (Failed)
|
||||
# 67 - StagingPrefix (Failed)
|
||||
# 82 - Module.ExternalData (Failed)
|
||||
# 143 - InstallMode-COPY (Failed)
|
||||
# 144 - InstallMode-REL_SYMLINK (Failed)
|
||||
# 145 - InstallMode-REL_SYMLINK_OR_COPY (Failed)
|
||||
# 146 - InstallMode-ABS_SYMLINK (Failed)
|
||||
# 147 - InstallMode-ABS_SYMLINK_OR_COPY (Failed)
|
||||
# 148 - InstallMode-SYMLINK (Failed)
|
||||
# 149 - InstallMode-SYMLINK_OR_COPY (Failed)
|
||||
# 253 - CTestTestTimeout (Failed)
|
||||
# 283 - CMakeLib.testUVProcessChain (Failed)
|
||||
# 401 - RunCMake.find_dependency (Failed)
|
||||
# 444 - RunCMake.file (Failed)
|
||||
# 482 - RunCMake.no_install_prefix (Failed)
|
||||
# 510 - RunCMake.CommandLine (Failed)
|
||||
# 545 - RunCMake.PrecompileHeaders (Failed)
|
||||
|
||||
cp bin/ctest Bootstrap.cmk/
|
||||
make test VERBOSE=1
|
||||
}
|
||||
@@ -1,50 +0,0 @@
|
||||
CMake was initially developed by Kitware with the following sponsorship:
|
||||
|
||||
* National Library of Medicine at the National Institutes of Health
|
||||
as part of the Insight Segmentation and Registration Toolkit (ITK).
|
||||
|
||||
* US National Labs (Los Alamos, Livermore, Sandia) ASC Parallel
|
||||
Visualization Initiative.
|
||||
|
||||
* National Alliance for Medical Image Computing (NAMIC) is funded by the
|
||||
National Institutes of Health through the NIH Roadmap for Medical Research,
|
||||
Grant U54 EB005149.
|
||||
|
||||
* Kitware, Inc.
|
||||
|
||||
The CMake copyright is as follows:
|
||||
|
||||
Copyright (c) 2002 Kitware, Inc., Insight Consortium
|
||||
All rights reserved.
|
||||
|
||||
Redistribution and use in source and binary forms, with or without
|
||||
modification, are permitted provided that the following conditions are
|
||||
met:
|
||||
|
||||
* Redistributions of source code must retain the above copyright notice,
|
||||
this list of conditions and the following disclaimer.
|
||||
|
||||
* Redistributions in binary form must reproduce the above copyright notice,
|
||||
this list of conditions and the following disclaimer in the documentation
|
||||
and/or other materials provided with the distribution.
|
||||
|
||||
* The names of Kitware, Inc., the Insight Consortium, or the names of
|
||||
any consortium members, or of any contributors, may not be used to
|
||||
endorse or promote products derived from this software without
|
||||
specific prior written permission.
|
||||
|
||||
* Modified source versions must be plainly marked as such, and must
|
||||
not be misrepresented as being the original software.
|
||||
|
||||
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS ``AS IS''
|
||||
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE FOR
|
||||
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
|
||||
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
|
||||
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
|
||||
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
See also the CMake web site: http://www.cmake.org for more information.
|
||||
@@ -1,222 +0,0 @@
|
||||
From 57fdc4dc274904f7ff9627f2fb8a6720d2344f5b 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 283a3eb..8fd73f2 100644
|
||||
--- a/Modules/FindLua51.cmake
|
||||
+++ b/Modules/FindLua51.cmake
|
||||
@@ -38,7 +38,7 @@ locations other than lua/
|
||||
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.42.0
|
||||
|
||||
|
||||
From 4864fdf5ccbdc8928c5b119d7ce8ed38f7bf8e3c 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 cc60425..c350fe4 100755
|
||||
--- a/bootstrap
|
||||
+++ b/bootstrap
|
||||
@@ -1771,6 +1771,9 @@ else
|
||||
uv_c_flags="${uv_c_flags} -D_XOPEN_SOURCE=700"
|
||||
libs="${libs} -lsocket"
|
||||
;;
|
||||
+ *Haiku*)
|
||||
+ libs="${libs} -lnetwork"
|
||||
+ ;;
|
||||
esac
|
||||
fi
|
||||
if test "x${bootstrap_system_libuv}" = "x"; then
|
||||
--
|
||||
2.42.0
|
||||
|
||||
|
||||
From f2a38c069f502b8a683c11bba3caa82abeeca832 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 d0b0e00..e7ed773 100644
|
||||
--- a/Utilities/cmlibuv/src/unix/core.c
|
||||
+++ b/Utilities/cmlibuv/src/unix/core.c
|
||||
@@ -1439,7 +1439,9 @@ int uv_os_getpriority(uv_pid_t pid, int* priority) {
|
||||
return UV_EINVAL;
|
||||
|
||||
errno = 0;
|
||||
+#ifndef __HAIKU__
|
||||
r = getpriority(PRIO_PROCESS, (int) pid);
|
||||
+#endif
|
||||
|
||||
if (r == -1 && errno != 0)
|
||||
return UV__ERR(errno);
|
||||
@@ -1453,8 +1455,10 @@ int uv_os_setpriority(uv_pid_t pid, int priority) {
|
||||
if (priority < UV_PRIORITY_HIGHEST || priority > UV_PRIORITY_LOW)
|
||||
return UV_EINVAL;
|
||||
|
||||
+#ifndef __HAIKU__
|
||||
if (setpriority(PRIO_PROCESS, (int) pid, priority) != 0)
|
||||
return UV__ERR(errno);
|
||||
+#endif
|
||||
|
||||
return 0;
|
||||
}
|
||||
--
|
||||
2.42.0
|
||||
|
||||
|
||||
From b2331642ce3f864684b5ce572a0f441507b4aef6 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.
|
||||
|
||||
|
||||
diff --git a/Modules/Platform/Haiku.cmake b/Modules/Platform/Haiku.cmake
|
||||
index 7d9a737..e5ccf3f 100644
|
||||
--- a/Modules/Platform/Haiku.cmake
|
||||
+++ b/Modules/Platform/Haiku.cmake
|
||||
@@ -35,6 +35,10 @@ execute_process(
|
||||
|
||||
string(REGEX MATCH "libraries: =?([^\n]*:)?/boot/system/develop/lib/([^/]*)/?(:?\n+)" _dummy "${_HAIKU_SEARCH_DIRS}\n")
|
||||
set(CMAKE_HAIKU_SECONDARY_ARCH "${CMAKE_MATCH_2}")
|
||||
+if(NOT CMAKE_HAIKU_SECONDARY_ARCH)
|
||||
+ string(REGEX MATCH "libraries: =?([^\n]*:)?/system/lib/([^/]*)/?(:?\n+)" _dummy "${_HAIKU_SEARCH_DIRS}\n")
|
||||
+ set(CMAKE_HAIKU_SECONDARY_ARCH "${CMAKE_MATCH_2}")
|
||||
+endif()
|
||||
|
||||
if(NOT CMAKE_HAIKU_SECONDARY_ARCH)
|
||||
set(CMAKE_HAIKU_SECONDARY_ARCH_SUBDIR "")
|
||||
--
|
||||
2.42.0
|
||||
|
||||
|
||||
From 128024cca4cdcdedade21d4253e3884eca1d2428 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.
|
||||
|
||||
|
||||
diff --git a/Modules/Platform/Haiku.cmake b/Modules/Platform/Haiku.cmake
|
||||
index e5ccf3f..c8f4b8d 100644
|
||||
--- a/Modules/Platform/Haiku.cmake
|
||||
+++ b/Modules/Platform/Haiku.cmake
|
||||
@@ -121,6 +121,9 @@ LIST(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
|
||||
|
||||
LIST(APPEND CMAKE_SYSTEM_LIBRARY_PATH ${CMAKE_HAIKU_DEVELOP_LIB_DIRECTORIES})
|
||||
|
||||
+# This is needed for find_package to search develop/lib/cmake/.
|
||||
+list(APPEND CMAKE_SYSTEM_FRAMEWORK_PATH /boot/system/develop /boot/system/non-packaged/develop)
|
||||
+
|
||||
if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
|
||||
set(CMAKE_INSTALL_PREFIX "/boot/system" CACHE PATH
|
||||
"Install path prefix, prepended onto install directories." FORCE)
|
||||
--
|
||||
2.42.0
|
||||
|
||||
|
||||
From 746e48696ac237600637fca1de2da3e8625067e0 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
|
||||
|
||||
|
||||
diff --git a/Modules/Compiler/GNU.cmake b/Modules/Compiler/GNU.cmake
|
||||
index d01054b..7a5271c 100644
|
||||
--- a/Modules/Compiler/GNU.cmake
|
||||
+++ b/Modules/Compiler/GNU.cmake
|
||||
@@ -49,7 +49,9 @@ macro(__compiler_gnu lang)
|
||||
# distcc does not transform -o to -MT when invoking the preprocessor
|
||||
# internally, as it ought to. Work around this bug by setting -MT here
|
||||
# even though it isn't strictly necessary.
|
||||
- set(CMAKE_DEPFILE_FLAGS_${lang} "-MD -MT <DEP_TARGET> -MF <DEP_FILE>")
|
||||
+ if(NOT CMAKE_${lang}_COMPILER_ID STREQUAL "GNU" OR NOT CMAKE_${lang}_COMPILER_VERSION VERSION_LESS 4.0)
|
||||
+ set(CMAKE_DEPFILE_FLAGS_${lang} "-MD -MT <DEP_TARGET> -MF <DEP_FILE>")
|
||||
+ endif()
|
||||
endif()
|
||||
|
||||
# define flags for linker depfile generation
|
||||
--
|
||||
2.42.0
|
||||
|
||||
|
||||
From 7f41bba792dddf88770207af92cce5b079972e15 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..0f8a620 100644
|
||||
--- a/Source/CMakeInstallDestinations.cmake
|
||||
+++ b/Source/CMakeInstallDestinations.cmake
|
||||
@@ -1,11 +1,11 @@
|
||||
# Keep formatting here consistent with bootstrap script expectations.
|
||||
if(BEOS)
|
||||
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 f863a51..0ebd876 100644
|
||||
--- a/Source/cmFindPackageCommand.cxx
|
||||
+++ b/Source/cmFindPackageCommand.cxx
|
||||
@@ -2680,7 +2680,11 @@ bool cmFindPackageCommand::SearchPrefix(std::string const& prefix_in)
|
||||
common.emplace_back("libx32"_s);
|
||||
}
|
||||
common.emplace_back("lib"_s);
|
||||
+#ifdef __HAIKU__
|
||||
+ common.emplace_back("data"_s);
|
||||
+#else
|
||||
common.emplace_back("share"_s);
|
||||
+#endif
|
||||
|
||||
auto cmnGen = cmEnumPathSegmentsGenerator{ common };
|
||||
auto cmakeGen = cmAppendPathSegmentGenerator{ "cmake"_s };
|
||||
--
|
||||
2.42.0
|
||||
|
||||
|
||||
From 649b089ef8fae1586fe5991d4d9357199160f52d Mon Sep 17 00:00:00 2001
|
||||
From: Jerome Duval <jerome.duval@gmail.com>
|
||||
Date: Wed, 23 Feb 2022 13:44:06 +0100
|
||||
Subject: Disable weak symbols; they do not seem to behave correctly.
|
||||
|
||||
|
||||
diff --git a/Utilities/cmzstd/lib/common/zstd_trace.h b/Utilities/cmzstd/lib/common/zstd_trace.h
|
||||
index 485cadf..95dc81b 100644
|
||||
--- a/Utilities/cmzstd/lib/common/zstd_trace.h
|
||||
+++ b/Utilities/cmzstd/lib/common/zstd_trace.h
|
||||
@@ -20,7 +20,7 @@ extern "C" {
|
||||
/* weak symbol support */
|
||||
#if !defined(ZSTD_HAVE_WEAK_SYMBOLS) && defined(__GNUC__) && \
|
||||
!defined(__APPLE__) && !defined(_WIN32) && !defined(__MINGW32__) && \
|
||||
- !defined(__CYGWIN__) && !defined(_AIX)
|
||||
+ !defined(__CYGWIN__) && !defined(_AIX) && !defined(__HAIKU__)
|
||||
# define ZSTD_HAVE_WEAK_SYMBOLS 1
|
||||
#else
|
||||
# define ZSTD_HAVE_WEAK_SYMBOLS 0
|
||||
--
|
||||
2.42.0
|
||||
|
||||
Reference in New Issue
Block a user