As we discussed in the last meeting, we reset the ports tree and began from scratch, even though this change involves porting all the packages. Starting small and growing gradually, this approach will reduce build times and consequently lower energy consumption in a world affected by climate change. We will add new ports as users needs arise; ok h3artbl33d@
This commit is contained in:
parent
83a0aaf92c
commit
9a3af55370
59377 changed files with 98673 additions and 4712155 deletions
|
@ -1,7 +1,7 @@
|
|||
Index: Source/cmFileCommand.cxx
|
||||
--- Source/cmFileCommand.cxx.orig
|
||||
+++ Source/cmFileCommand.cxx
|
||||
@@ -1763,6 +1763,13 @@ bool HandleDownloadCommand(std::vector<std::string> co
|
||||
@@ -1816,6 +1816,13 @@ bool HandleDownloadCommand(std::vector<std::string> co
|
||||
++i;
|
||||
std::string file;
|
||||
|
||||
|
@ -15,7 +15,7 @@ Index: Source/cmFileCommand.cxx
|
|||
long timeout = 0;
|
||||
long inactivity_timeout = 0;
|
||||
std::string logVar;
|
||||
@@ -2173,6 +2180,12 @@ bool HandleUploadCommand(std::vector<std::string> cons
|
||||
@@ -2226,6 +2233,12 @@ bool HandleUploadCommand(std::vector<std::string> cons
|
||||
cmExecutionStatus& status)
|
||||
{
|
||||
#if !defined(CMAKE_BOOTSTRAP)
|
||||
|
|
|
@ -3,7 +3,7 @@ Disable find_package QUIET option in openbsd ports builds.
|
|||
Index: Source/cmFindPackageCommand.cxx
|
||||
--- Source/cmFindPackageCommand.cxx.orig
|
||||
+++ Source/cmFindPackageCommand.cxx
|
||||
@@ -712,7 +712,13 @@ bool cmFindPackageCommand::InitialPass(std::vector<std
|
||||
@@ -711,7 +711,13 @@ bool cmFindPackageCommand::InitialPass(std::vector<std
|
||||
std::vector<std::size_t> moduleArgs;
|
||||
for (std::size_t i = 1u; i < args.size(); ++i) {
|
||||
if (args[i] == "QUIET") {
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
Index: Source/cmGeneratorTarget.cxx
|
||||
--- Source/cmGeneratorTarget.cxx.orig
|
||||
+++ Source/cmGeneratorTarget.cxx
|
||||
@@ -5186,6 +5186,50 @@ cmGeneratorTarget::Names cmGeneratorTarget::GetLibrary
|
||||
@@ -5269,6 +5269,50 @@ cmGeneratorTarget::Names cmGeneratorTarget::GetLibrary
|
||||
targetNames.Output =
|
||||
cmStrCat(components.prefix, targetNames.Base, components.suffix);
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
Index: Source/cmGlobalGenerator.cxx
|
||||
--- Source/cmGlobalGenerator.cxx.orig
|
||||
+++ Source/cmGlobalGenerator.cxx
|
||||
@@ -2798,6 +2798,9 @@ void cmGlobalGenerator::AddGlobalTarget_Test(
|
||||
@@ -2861,6 +2861,9 @@ void cmGlobalGenerator::AddGlobalTarget_Test(
|
||||
cmCustomCommandLine singleLine;
|
||||
singleLine.push_back(cmSystemTools::GetCTestCommand());
|
||||
singleLine.push_back("--force-new-ctest-process");
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
Index: Source/cmInstallCommand.cxx
|
||||
--- Source/cmInstallCommand.cxx.orig
|
||||
+++ Source/cmInstallCommand.cxx
|
||||
@@ -669,6 +669,9 @@ bool HandleTargetsMode(std::vector<std::string> const&
|
||||
@@ -658,6 +658,9 @@ bool HandleTargetsMode(std::vector<std::string> const&
|
||||
}
|
||||
|
||||
// Select the mode for installing symlinks to versioned shared libraries.
|
||||
|
@ -11,7 +11,7 @@ Index: Source/cmInstallCommand.cxx
|
|||
cmInstallTargetGenerator::NamelinkModeType namelinkMode =
|
||||
cmInstallTargetGenerator::NamelinkModeNone;
|
||||
if (libraryArgs.GetNamelinkOnly()) {
|
||||
@@ -684,6 +687,12 @@ bool HandleTargetsMode(std::vector<std::string> const&
|
||||
@@ -673,6 +676,12 @@ bool HandleTargetsMode(std::vector<std::string> const&
|
||||
} else if (archiveArgs.GetNamelinkSkip()) {
|
||||
importlinkMode = cmInstallTargetGenerator::NamelinkModeSkip;
|
||||
}
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
Index: Source/cmMessenger.cxx
|
||||
--- Source/cmMessenger.cxx.orig
|
||||
+++ Source/cmMessenger.cxx
|
||||
@@ -62,7 +62,7 @@ static bool printMessagePreamble(MessageType t, std::o
|
||||
@@ -63,7 +63,7 @@ static bool printMessagePreamble(MessageType t, std::o
|
||||
if (t == MessageType::FATAL_ERROR) {
|
||||
msg << "CMake Error";
|
||||
} else if (t == MessageType::INTERNAL_ERROR) {
|
||||
|
@ -10,7 +10,7 @@ Index: Source/cmMessenger.cxx
|
|||
} else if (t == MessageType::LOG) {
|
||||
msg << "CMake Debug Log";
|
||||
} else if (t == MessageType::DEPRECATION_ERROR) {
|
||||
@@ -115,19 +115,6 @@ static void displayMessage(MessageType t, std::ostring
|
||||
@@ -116,19 +116,6 @@ static void displayMessage(MessageType t, std::ostring
|
||||
|
||||
// Add a terminating blank line.
|
||||
msg << "\n";
|
||||
|
|
26
devel/cmake/patches/patch-Source_cmQtAutoGenInitializer_cxx
Normal file
26
devel/cmake/patches/patch-Source_cmQtAutoGenInitializer_cxx
Normal file
|
@ -0,0 +1,26 @@
|
|||
CMake >= 3.27 exports the CXX std to moc. This is a workaround for
|
||||
a moc parsing bug that happens parsing headers from libc++ < 14 when
|
||||
the CXX std > 17.
|
||||
|
||||
usr/include/c++/v1/concept:318:1: error: Parse error at "::"
|
||||
|
||||
Moc should theoretically be able to parse this. [1] Not exactly sure
|
||||
why it's failing. Upstream bug report [2]
|
||||
|
||||
[1] https://code.qt.io/cgit/qt/qtbase.git/tree/src/tools/moc/moc.cpp?h=6.6.0#n631
|
||||
[2] https://bugreports.qt.io/browse/QTBUG-117765
|
||||
|
||||
Index: Source/cmQtAutoGenInitializer.cxx
|
||||
--- Source/cmQtAutoGenInitializer.cxx.orig
|
||||
+++ Source/cmQtAutoGenInitializer.cxx
|
||||
@@ -1809,6 +1809,10 @@ bool cmQtAutoGenInitializer::SetupWriteAutogenInfo()
|
||||
if (this->Moc.PredefsCmd.size() >= 3) {
|
||||
this->Moc.PredefsCmd.insert(this->Moc.PredefsCmd.begin() + 1,
|
||||
CompileOptionValue);
|
||||
+#if (defined(__FreeBSD__) && __FreeBSD_version < 1302000) || defined(__OpenBSD__)
|
||||
+ this->Moc.PredefsCmd.insert(this->Moc.PredefsCmd.begin() + 1,
|
||||
+ "-D_LIBCPP_HAS_NO_CONCEPTS");
|
||||
+#endif
|
||||
}
|
||||
}
|
||||
info.SetArray("MOC_PREDEFS_CMD", this->Moc.PredefsCmd);
|
|
@ -1,7 +1,7 @@
|
|||
Index: Source/cmTarget.cxx
|
||||
--- Source/cmTarget.cxx.orig
|
||||
+++ Source/cmTarget.cxx
|
||||
@@ -476,7 +476,7 @@ TargetProperty const StaticTargetProperties[] = {
|
||||
@@ -477,7 +477,7 @@ TargetProperty const StaticTargetProperties[] = {
|
||||
{ "INSTALL_NAME_DIR"_s, IC::CanCompileSources },
|
||||
{ "INSTALL_REMOVE_ENVIRONMENT_RPATH"_s, IC::CanCompileSources },
|
||||
{ "INSTALL_RPATH"_s, ""_s, IC::CanCompileSources },
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue