From 014bb96647808e86ad633d2e3127aae6d19b2b9a Mon Sep 17 00:00:00 2001 From: Meghan Date: Sat, 14 Nov 2020 02:14:15 -0800 Subject: [PATCH] zig: add libyaml --- .circleci/config.yml | 1 + .gitmodules | 3 +++ build.zig | 5 +++++ src/util/c.zig | 3 +++ 4 files changed, 12 insertions(+) create mode 100644 .gitmodules create mode 100644 src/util/c.zig diff --git a/.circleci/config.yml b/.circleci/config.yml index efa6b098b8b346ba80971116048f4661db3bf0e8..dbfc90cabf60e12dd9cc760e90aa7d503ba11b06 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -25,6 +25,7 @@ jobs: - run: zig version - run: zig env - run: apk add jq grep + - run: apk add yaml-dev - run: ./build_all_zig.sh - store_artifacts: path: ./zig-cache/bin/ diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000000000000000000000000000000000000..14062d542bba6f8abe61e8e394b1e1f12930d96b --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "libs/yaml"] + path = libs/yaml + url = https://github.com/yaml/libyaml diff --git a/build.zig b/build.zig index 9b49657093419ba294ee615c37ba943248a751d7..95cd3df40b747d865dac5f6b5a4810736c53b848 100644 --- a/build.zig +++ b/build.zig @@ -17,6 +17,11 @@ pub fn build(b: *Builder) void { exe.setBuildMode(mode); exe.strip = true; + exe.linkLibC(); + + exe.addIncludeDir("./libs/yaml/include"); + exe.linkSystemLibrary("yaml"); + exe.install(); const run_cmd = exe.run(); diff --git a/src/util/c.zig b/src/util/c.zig new file mode 100644 index 0000000000000000000000000000000000000000..7c1029fe3eb6a0cd36722178f17d4955f0a50297 --- /dev/null +++ b/src/util/c.zig @@ -0,0 +1,3 @@ +usingnamespace @cImport({ + @cInclude("yaml.h"); +}); -- 2.54.0