mirror of
https://github.com/apple/swift-nio.git
synced 2026-05-20 20:30:36 +00:00
Add patch for `<stddef.h>` being included inside of extern "C" section
which is invalid in C++.
### Motivation:
When building with C++ interop enabled on Linux, `<stddef.h>` fails to
import because the C++ module `_Builtin_stddef.max_align_t` (which it
includes) is re-imported with C language linkage.
```
<module-includes>:1:10: note: in file included from <module-includes>:1:
1 | #include "/home/xtremek/Programming/xavgru12/meta-swift-project/poky/build-qemuarm64/tmp-glibc/work/cortexa57-oe-linux/swift-hello-world/1.0/build/checkouts/swift-nio/Sources/CNIOLLHTTP/include/CNIOLLHTTP.h"
| `- note: in file included from <module-includes>:1:
2 |
/home/xtremek/Programming/xavgru12/meta-swift-project/poky/build-qemuarm64/tmp-glibc/work/cortexa57-oe-linux/swift-hello-world/1.0/build/checkouts/swift-nio/Sources/CNIOLLHTTP/include/CNIOLLHTTP.h:20:10: note: in file included from /home/xtremek/Programming/xavgru12/meta-swift-project/poky/build-qemuarm64/tmp-glibc/work/cortexa57-oe-linux/swift-hello-world/1.0/build/checkouts/swift-nio/Sources/CNIOLLHTTP/include/CNIOLLHTTP.h:20:
18 | #define C_NIO_LLHTTP_SWIFT
19 |
20 | #include "c_nio_llhttp.h"
| `- note: in file included from /home/xtremek/Programming/xavgru12/meta-swift-project/poky/build-qemuarm64/tmp-glibc/work/cortexa57-oe-linux/swift-hello-world/1.0/build/checkouts/swift-nio/Sources/CNIOLLHTTP/include/CNIOLLHTTP.h:20:
21 |
22 | static inline llhttp_errno_t c_nio_llhttp_execute_swift(llhttp_t *parser,
/home/xtremek/Programming/xavgru12/meta-swift-project/poky/build-qemuarm64/tmp-glibc/work/cortexa57-oe-linux/swift-hello-world/1.0/build/checkouts/swift-nio/Sources/CNIOLLHTTP/include/c_nio_llhttp.h:559:10: note: in file included from /home/xtremek/Programming/xavgru12/meta-swift-project/poky/build-qemuarm64/tmp-glibc/work/cortexa57-oe-linux/swift-hello-world/1.0/build/checkouts/swift-nio/Sources/CNIOLLHTTP/include/c_nio_llhttp.h:559:
557 | extern "C" {
558 | #endif
559 | #include <stddef.h>
| `- note: in file included from /home/xtremek/Programming/xavgru12/meta-swift-project/poky/build-qemuarm64/tmp-glibc/work/cortexa57-oe-linux/swift-hello-world/1.0/build/checkouts/swift-nio/Sources/CNIOLLHTTP/include/c_nio_llhttp.h:559:
560 |
561 | #if defined(__wasm__)
<unknown>:0: error: could not build C module 'CNIOLLHTTP'
/home/xtremek/Programming/xavgru12/meta-swift-project/poky/build-qemuarm64/tmp-glibc/work/cortexa57-oe-linux/swift-hello-world/1.0/recipe-sysroot-native/usr/lib/clang/17/include/stddef.h:128:1: error: import of C++ module '_Builtin_stddef.max_align_t' appears within extern "C" language linkage specification
126 |
127 | #if defined(__need_max_align_t)
128 | #include <__stddef_max_align_t.h>
| `- error: import of C++ module '_Builtin_stddef.max_align_t' appears within extern "C" language linkage specification
129 | #undef __need_max_align_t
130 | #endif /* defined(__need_max_align_t) */
/home/xtremek/Programming/xavgru12/meta-swift-project/poky/build-qemuarm64/tmp-glibc/work/cortexa57-oe-linux/swift-hello-world/1.0/build/checkouts/swift-nio/Sources/CNIOLLHTTP/include/c_nio_llhttp.h:557:1: note: extern "C" language linkage specification begins here
555 | #define INCLUDE_LLHTTP_API_H_
556 | #ifdef __cplusplus
557 | extern "C" {
| `- note: extern "C" language linkage specification begins here
558 | #endif
```
### Modifications:
Added a patch to the `update_and_patch_llhttp.sh` file to move this
include to the correct location, and ran the script to actually apply it
to the included `c_nio_llhttp.h` file in the `CNIOLLHTTP` target.
### Result:
swift-nio compiles properly on a package with C++ interop
(`.interoperabilityMode(.Cxx)`) enabled in Linux.
@lhoward @Lukasa
167 lines
5.2 KiB
Bash
Executable File
167 lines
5.2 KiB
Bash
Executable File
#!/bin/bash
|
|
##===----------------------------------------------------------------------===##
|
|
##
|
|
## This source file is part of the SwiftNIO open source project
|
|
##
|
|
## Copyright (c) 2017-2025 Apple Inc. and the SwiftNIO project authors
|
|
## Licensed under Apache License v2.0
|
|
##
|
|
## See LICENSE.txt for license information
|
|
## See CONTRIBUTORS.txt for the list of SwiftNIO project authors
|
|
##
|
|
## SPDX-License-Identifier: Apache-2.0
|
|
##
|
|
##===----------------------------------------------------------------------===##
|
|
|
|
set -eu
|
|
|
|
here="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
|
|
|
case "$(uname -s)" in
|
|
Darwin)
|
|
sed="gsed"
|
|
;;
|
|
*)
|
|
sed="sed"
|
|
;;
|
|
esac
|
|
|
|
if ! hash ${sed} 2>/dev/null; then
|
|
echo "You need sed \"${sed}\" to run this script ..."
|
|
echo
|
|
echo "On macOS: brew install gnu-sed"
|
|
exit 42
|
|
fi
|
|
|
|
rm "$here"/*.c
|
|
|
|
tmpdir=$(mktemp -d /tmp/.llhttp_vendor_XXXXXX)
|
|
cd "$tmpdir"
|
|
git clone https://github.com/nodejs/llhttp.git
|
|
cd llhttp
|
|
npm install
|
|
make
|
|
|
|
cp "$tmpdir/llhttp/LICENSE" "$here"
|
|
cp "$tmpdir/llhttp/build/llhttp.h" "$here"
|
|
cp "$tmpdir/llhttp/build/c/llhttp.c" "$here"
|
|
cp "$tmpdir/llhttp/src/native/"*.c "$here"
|
|
|
|
cd "$here"
|
|
|
|
# The sed script in here has gotten a little unwieldy, we should consider doing
|
|
# something smarter. For now it's good enough.
|
|
for f in *.{c,h}; do
|
|
( echo "/* Additional changes for SwiftNIO:"
|
|
echo " - prefixed all symbols by 'c_nio_'"
|
|
echo "*/"
|
|
) > "c_nio_$f"
|
|
cat "$f" >> "$here/c_nio_$f"
|
|
rm "$f"
|
|
"$sed" -i \
|
|
-e 's#"llhttp.h"#"include/c_nio_llhttp.h"#g' \
|
|
-e 's/\b\(llhttp__after_headers_complete\)/c_nio_\1/g' \
|
|
-e 's/\b\(llhttp__after_message_complete\)/c_nio_\1/g' \
|
|
-e 's/\b\(llhttp__before_headers_complete\)/c_nio_\1/g' \
|
|
-e 's/\b\(llhttp__debug\)/c_nio_\1/g' \
|
|
-e 's/\b\(llhttp__internal\)/c_nio_\1/g' \
|
|
-e 's/\b\(llhttp__on_\)/c_nio_\1/g' \
|
|
-e 's/\b\(llhttp_errno_name\)/c_nio_\1/g' \
|
|
-e 's/\b\(llhttp_execute\)/c_nio_\1/g' \
|
|
-e 's/\b\(llhttp_finish\)/c_nio_\1/g' \
|
|
-e 's/\b\(llhttp_get_errno\)/c_nio_\1/g' \
|
|
-e 's/\b\(llhttp_get_error_pos\)/c_nio_\1/g' \
|
|
-e 's/\b\(llhttp_get_error_reason\)/c_nio_\1/g' \
|
|
-e 's/\b\(llhttp_get_http_major\)/c_nio_\1/g' \
|
|
-e 's/\b\(llhttp_get_http_minor\)/c_nio_\1/g' \
|
|
-e 's/\b\(llhttp_get_method\)/c_nio_\1/g' \
|
|
-e 's/\b\(llhttp_get_status_code\)/c_nio_\1/g' \
|
|
-e 's/\b\(llhttp_get_type\)/c_nio_\1/g' \
|
|
-e 's/\b\(llhttp_get_upgrade\)/c_nio_\1/g' \
|
|
-e 's/\b\(llhttp_init\)/c_nio_\1/g' \
|
|
-e 's/\b\(llhttp_message_needs_eof\)/c_nio_\1/g' \
|
|
-e 's/\b\(llhttp_method_name\)/c_nio_\1/g' \
|
|
-e 's/\b\(llhttp_pause\)/c_nio_\1/g' \
|
|
-e 's/\b\(llhttp_reset\)/c_nio_\1/g' \
|
|
-e 's/\b\(llhttp_resume\)/c_nio_\1/g' \
|
|
-e 's/\b\(llhttp_resume_after_upgrade\)/c_nio_\1/g' \
|
|
-e 's/\b\(llhttp_set_error_reason\)/c_nio_\1/g' \
|
|
-e 's/\b\(llhttp_set_lenient_chunked_length\)/c_nio_\1/g' \
|
|
-e 's/\b\(llhttp_set_lenient_data_after_close\)/c_nio_\1/g' \
|
|
-e 's/\b\(llhttp_set_lenient_headers\)/c_nio_\1/g' \
|
|
-e 's/\b\(llhttp_set_lenient_keep_alive\)/c_nio_\1/g' \
|
|
-e 's/\b\(llhttp_set_lenient_optional_crlf_after_chunk\)/c_nio_\1/g' \
|
|
-e 's/\b\(llhttp_set_lenient_optional_lf_after_cr\)/c_nio_\1/g' \
|
|
-e 's/\b\(llhttp_set_lenient_transfer_encoding\)/c_nio_\1/g' \
|
|
-e 's/\b\(llhttp_set_lenient_version\)/c_nio_\1/g' \
|
|
-e 's/\b\(llhttp_settings_init\)/c_nio_\1/g' \
|
|
-e 's/\b\(llhttp_should_keep_alive\)/c_nio_\1/g' \
|
|
-e 's/\b\(llhttp_status_name\)/c_nio_\1/g' \
|
|
-e 's/\b\(llhttp_set_lenient_spaces_after_chunk_size\)/c_nio_\1/g' \
|
|
-e 's/\b\(llhttp_set_lenient_optional_cr_before_lf\)/c_nio_\1/g' \
|
|
"$here/c_nio_$f"
|
|
done
|
|
|
|
mv "$here/c_nio_llhttp.h" "$here/include"
|
|
|
|
compiletmp=$(mktemp -d /tmp/.test_compile_XXXXXX)
|
|
|
|
for f in *.c; do
|
|
clang -o "$compiletmp/$f.o" -c "$here/$f"
|
|
num_non_nio=$(nm "$compiletmp/$f.o" | grep ' T ' | grep -cv c_nio || true)
|
|
|
|
test 0 -eq "$num_non_nio" || {
|
|
echo "ERROR: $num_non_nio exported non-prefixed symbols found"
|
|
nm "$compiletmp/$f.o" | grep ' T ' | grep -v c_nio
|
|
exit 1
|
|
}
|
|
done
|
|
|
|
patch -p1 -V none << 'EOF'
|
|
diff --git a/include/c_nio_llhttp.h b/include/c_nio_llhttp.h
|
|
index 071e828c6..1e5d99cec 100644
|
|
--- a/include/c_nio_llhttp.h
|
|
+++ b/include/c_nio_llhttp.h
|
|
@@ -11,11 +11,16 @@
|
|
|
|
#ifndef INCLUDE_LLHTTP_ITSELF_H_
|
|
#define INCLUDE_LLHTTP_ITSELF_H_
|
|
+#ifdef __cplusplus
|
|
+#include <cstdint>
|
|
+#else
|
|
+#include <stdint.h>
|
|
+#endif
|
|
+
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
-#include <stdint.h>
|
|
|
|
typedef struct c_nio_llhttp__internal_s c_nio_llhttp__internal_t;
|
|
struct c_nio_llhttp__internal_s {
|
|
EOF
|
|
|
|
patch -p1 -V none << 'EOF'
|
|
diff --git a/include/c_nio_llhttp.h b/include/c_nio_llhttp.h
|
|
index 1e5d99ce..39cf110a 100644
|
|
--- a/include/c_nio_llhttp.h
|
|
+++ b/include/c_nio_llhttp.h
|
|
@@ -553,10 +553,10 @@ typedef enum llhttp_status llhttp_status_t;
|
|
|
|
#ifndef INCLUDE_LLHTTP_API_H_
|
|
#define INCLUDE_LLHTTP_API_H_
|
|
+#include <stddef.h>
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
-#include <stddef.h>
|
|
|
|
#if defined(__wasm__)
|
|
#define LLHTTP_EXPORT __attribute__((visibility("default")))
|
|
EOF
|
|
|
|
rm -rf "$compiletmp"
|
|
rm -rf "$tmpdir"
|
|
|