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.
56 lines
2.1 KiB
C
56 lines
2.1 KiB
C
/* Symbol concatenation utilities.
|
|
|
|
Copyright (C) 1998-2026 Free Software Foundation, Inc.
|
|
|
|
This program 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 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program 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 this program; if not, write to the Free Software Foundation, Inc.,
|
|
51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */
|
|
|
|
#ifndef SYM_CAT_H
|
|
#define SYM_CAT_H
|
|
|
|
#if defined (__STDC__) || defined (ALMOST_STDC) || defined (HAVE_STRINGIZE)
|
|
#define CONCAT2(a,b) a##b
|
|
#define CONCAT3(a,b,c) a##b##c
|
|
#define CONCAT4(a,b,c,d) a##b##c##d
|
|
#define CONCAT5(a,b,c,d,e) a##b##c##d##e
|
|
#define CONCAT6(a,b,c,d,e,f) a##b##c##d##e##f
|
|
#define STRINGX(s) #s
|
|
#else
|
|
/* Note one should never pass extra whitespace to the CONCATn macros,
|
|
e.g. CONCAT2(foo, bar) because traditonal C will keep the space between
|
|
the two labels instead of concatenating them. Instead, make sure to
|
|
write CONCAT2(foo,bar). */
|
|
#define CONCAT2(a,b) a/**/b
|
|
#define CONCAT3(a,b,c) a/**/b/**/c
|
|
#define CONCAT4(a,b,c,d) a/**/b/**/c/**/d
|
|
#define CONCAT5(a,b,c,d,e) a/**/b/**/c/**/d/**/e
|
|
#define CONCAT6(a,b,c,d,e,f) a/**/b/**/c/**/d/**/e/**/f
|
|
#define STRINGX(s) "s"
|
|
#endif
|
|
|
|
#define XCONCAT2(a,b) CONCAT2(a,b)
|
|
#define XCONCAT3(a,b,c) CONCAT3(a,b,c)
|
|
#define XCONCAT4(a,b,c,d) CONCAT4(a,b,c,d)
|
|
#define XCONCAT5(a,b,c,d,e) CONCAT5(a,b,c,d,e)
|
|
#define XCONCAT6(a,b,c,d,e,f) CONCAT6(a,b,c,d,e,f)
|
|
|
|
/* Note the layer of indirection here is typically used to allow
|
|
stringification of the expansion of macros. I.e. "#define foo
|
|
bar", "XSTRING(foo)", to yield "bar". Be aware that this only
|
|
works for __STDC__, not for traditional C which will still resolve
|
|
to "foo". */
|
|
#define XSTRING(s) STRINGX(s)
|
|
|
|
#endif /* SYM_CAT_H */
|