Static amalgamated build of lighttpd

amalgamate.mjs

@@ -8,8 +8,40 @@ function amalgamatedPath(extension) {
     return pathLib.resolve(`lighttpd.amalgamated.${extension}`);
 }
 
+// Definitions that conflict between multiple module files,
+// so we rename them to a per-module name using #define
+const PER_FILE_ALIASES = [
+    "cpk",
+    "plugin_config",
+    "plugin_data",
+    "handler_ctx",
+    "handler_ctx_init",
+    "handler_ctx_free",
+    "mkdir_recursive",
+    "proxy_forwarded_t",
+    "PROXY_FORWARDED_NONE",
+    "PROXY_FORWARDED_FOR",
+    "PROXY_FORWARDED_PROTO",
+    "PROXY_FORWARDED_HOST",
+    "PROXY_FORWARDED_BY",
+    "PROXY_FORWARDED_REMOTE_USER",
+];
+
+function includePath(path) {
+    const file = pathLib.basename(path, '.c');
+    let lines = [];
+    if (file.startsWith('mod_')) {
+        for (const alias of PER_FILE_ALIASES) {
+            lines.push(`#undef ${alias}`);
+            lines.push(`#define ${alias} ${file}_${alias}`);
+        }
+    }
+    lines.push(`#include "${path}"`);
+    return lines.join("\n");
+}
+
 const commands = JSON.parse((await fsp.readFile("compile_commands.json")).toString())
-    .filter(e => pathLib.relative(".", e.directory) === "build")
+    .filter(e => pathLib.relative(".", e.directory) === "src")
     .filter(e => ![
         // These are for other binaries and so have their own `main`s, which conflict.
         "lemon.c",
@@ -22,7 +54,7 @@ const includes = [
     "src/algo_xxhash.c",
     ...commands.map(e => pathLib.relative(".", e.file))
 ]
-    .map(path => `#include "${path}"`)
+    .map(includePath)
     .join("\n")
     ;
 
@@ -32,6 +64,8 @@ const flags = [...new Set(
             ["cc"].length, // Slice off the compiler invocation (not a flag).
             -["-o", "obj", "-c", "src"].length, // Slice off the file-specific args that aren't flags.
         )
+        // Single-quote every flag because some of them might contain quotes
+        .map(flag => `'${flag}'`)
     )
 )];
 
@@ -42,7 +76,7 @@ const directory = directories[0];
 const amalgamated = {
     exe: {
         directory,
-        arguments: ["cc", ...flags, "-o", amalgamatedPath("exe"), amalgamatedPath("c"), "-lpcre2-8", "-ldl", "-Wl,-export-dynamic"],
+        arguments: ["cc", ...flags, "-o", amalgamatedPath("exe"), amalgamatedPath("c"), "-lpcre2-8", "-ldl", "-lz", "-lcrypt"],
         file: amalgamatedPath("c"),
     },
     ii: {

amalgamate.sh

@@ -4,10 +4,9 @@ set -euox pipefail
 
 rust_dir=lighttpd_rust_amalgamated
 
-cmake -Wno-dev
-make clean
-bear -- make lighttpd
-make mod_{indexfile,dirlisting,staticfile}
+LIGHTTPD_STATIC=yes ./configure -C --enable-static=yes
+make -C src parsers versionstamp
+bear -- make -C src lighttpd
 ./amalgamate.mjs | "${SHELL}" -euox pipefail
 c2rust transpile --overwrite-existing --emit-build-files --binary lighttpd_amalgamated --output-dir ${rust_dir} amalgamated.compile_commands.json
 cp {rust,${rust_dir}}/build.rs

lighttpd_rust_amalgamated/Cargo.toml

@@ -3,8 +3,6 @@ name = "lighttpd_rust_amalgamated"
 version = "0.1.0"
 edition = "2021"
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
 [dependencies]
-c2rust-bitfields = "0.17.0"
-libc = "0.2.140"
+c2rust-bitfields = "0.18.0"
+libc = "0.2.154"

lighttpd_rust_amalgamated/build.rs

@@ -3,6 +3,7 @@ fn main() {
     // add unix dependencies below
     // println!("cargo:rustc-flags=-l readline");
     println!("cargo:rustc-link-lib=pcre2-8");
+    println!("cargo:rustc-link-lib=z");
     println!("cargo:rustc-link-lib=crypt");
     println!("cargo:rustc-link-arg=-Wl,-export-dynamic");
 }