vasilito
48a924c561
The libredox 0.1.19 / redox_syscall 0.9.1 bump left 45 recipe lockfiles pinning libredox 0.1.18+rb0.3.1 and redox_syscall 0.9.0+rb0.3.1. The cookbook builds with --locked, so every affected recipe died with error: cannot update the lock file .../Cargo.lock because --locked was passed to prevent this which is what took out redox-driver-sys -- and with it every Red Bear driver -- during the redbear-full build. Regenerating the fork lockfiles was not enough; the recipes that consume the forks as path deps carry their own. This is step 6 of local/docs/FORK-BUMP-PATCHING-POLICY.md applied to the recipe layer. Also drop the hardcoded GCC version in recipes/libs/libstdcxx-v3: the literal include/c++/13.2.0 stopped resolving the moment the cross toolchain moved to 16.1.0, leaving -I pointing at a directory that does not exist. Now resolves the newest installed C++ header directory and fails loudly if there is none. Same failure class as the hardcoded 13.2.0 in mk/prefix.mk. Note: a few recipe-level Cargo.lock files (redox-driver-pci, cpufreqd, redbear-acmd/-ecmd/-ftdi) sit beside a recipe.toml whose [source] is path = "source", so they are not build inputs; redox-driver-pci's even references a redox-driver-core/Cargo.toml that does not exist. They are left alone rather than given meaning they do not have. redox-driver-sys now cooks clean.
112 lines
3.1 KiB
C++
112 lines
3.1 KiB
C++
/* C++ modules. Experimental! -*- c++ -*-
|
|
Copyright (C) 2017-2026 Free Software Foundation, Inc.
|
|
Written by Nathan Sidwell <nathan@acm.org> while at FaceBook
|
|
|
|
This file is part of GCC.
|
|
|
|
GCC is free software; you can redistribute it and/or modify it
|
|
under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 3, or (at your option)
|
|
any later version.
|
|
|
|
GCC is distributed in the hope that it will be useful, but
|
|
WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with GCC; see the file COPYING3. If not see
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
#ifndef GXX_RESOLVER_H
|
|
#define GXX_RESOLVER_H 1
|
|
|
|
// Mapper interface for client and server bits
|
|
#include "cody.hh"
|
|
// C++
|
|
#if !IN_GCC
|
|
#include <string>
|
|
#include <map>
|
|
#endif
|
|
|
|
// This is a GCC class, so GCC coding conventions on new bits.
|
|
class module_resolver : public Cody::Resolver
|
|
{
|
|
public:
|
|
using parent = Cody::Resolver;
|
|
using module_map = std::map<std::string, std::string>;
|
|
|
|
private:
|
|
std::string repo;
|
|
std::string ident;
|
|
module_map map;
|
|
int fd_repo = -1;
|
|
bool default_map = true;
|
|
bool default_translate = true;
|
|
|
|
public:
|
|
module_resolver (bool map = true, bool xlate = false);
|
|
virtual ~module_resolver () override;
|
|
|
|
public:
|
|
void set_default_map (bool d)
|
|
{
|
|
default_map = d;
|
|
}
|
|
void set_default_translate (bool d)
|
|
{
|
|
default_translate = d;
|
|
}
|
|
void set_ident (char const *i)
|
|
{
|
|
ident = i;
|
|
}
|
|
bool set_repo (std::string &&repo, bool force = false);
|
|
bool add_mapping (std::string &&module, std::string &&file,
|
|
bool force = false);
|
|
|
|
// Return +ve line number of error, or -ve errno
|
|
int read_tuple_file (int fd, char const *prefix, bool force = false);
|
|
int read_tuple_file (int fd, std::string const &prefix,
|
|
bool force = false)
|
|
{
|
|
return read_tuple_file (fd, prefix.empty () ? nullptr : prefix.c_str (),
|
|
force);
|
|
}
|
|
|
|
public:
|
|
// Virtual overriders, names are controlled by Cody::Resolver
|
|
using parent::ConnectRequest;
|
|
virtual module_resolver *ConnectRequest (Cody::Server *, unsigned version,
|
|
std::string &agent,
|
|
std::string &ident)
|
|
override;
|
|
using parent::ModuleRepoRequest;
|
|
virtual int ModuleRepoRequest (Cody::Server *) override;
|
|
using parent::ModuleExportRequest;
|
|
virtual int ModuleExportRequest (Cody::Server *s, Cody::Flags,
|
|
std::string &module)
|
|
override;
|
|
using parent::ModuleImportRequest;
|
|
virtual int ModuleImportRequest (Cody::Server *s, Cody::Flags,
|
|
std::string &module)
|
|
override;
|
|
using parent::IncludeTranslateRequest;
|
|
virtual int IncludeTranslateRequest (Cody::Server *s, Cody::Flags,
|
|
std::string &include)
|
|
override;
|
|
|
|
using parent::ModuleCompiledRequest;
|
|
virtual int ModuleCompiledRequest (Cody::Server *s, Cody::Flags Flags,
|
|
std::string &Module) override;
|
|
|
|
private:
|
|
using parent::GetCMISuffix;
|
|
virtual char const *GetCMISuffix () override;
|
|
|
|
private:
|
|
int cmi_response (Cody::Server *s, std::string &module);
|
|
};
|
|
|
|
#endif
|