From 7501fcfe8b3ca87ba5735e62862428a5fbde6837 Mon Sep 17 00:00:00 2001
From: David Given <dg@cowlark.com>
Date: Wed, 1 May 2024 00:18:18 +0200
Subject: [PATCH 1/2] Looks like compiling protobuf files now requires access
 to the protobuf libraries.

---
 build/protobuf.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/build/protobuf.py b/build/protobuf.py
index b499fc43..3d1f75b1 100644
--- a/build/protobuf.py
+++ b/build/protobuf.py
@@ -11,7 +11,7 @@
 )
 from build.c import cxxlibrary
 from types import SimpleNamespace
-import build.pkg
+from build.pkg import package
 
 emit(
     """
@@ -22,6 +22,7 @@
 """
 )
 
+lib = package(name="protobuf_lib", package="protobuf")
 
 @Rule
 def proto(self, name, srcs: Targets = None, deps: Targets = None):
@@ -67,6 +68,6 @@ def protocc(self, name, srcs: Targets = None, deps: Targets = None):
     cxxlibrary(
         replaces=self,
         srcs=[r],
-        deps=targetswithtraitsof(deps, "cheaders"),
+        deps=targetswithtraitsof(deps, "cheaders") + [lib],
         hdrs=headers,
     )

From b805b86ddbca50fc7298f26ddaca846845a09a83 Mon Sep 17 00:00:00 2001
From: David Given <dg@cowlark.com>
Date: Wed, 1 May 2024 00:25:10 +0200
Subject: [PATCH 2/2] Fix truncate arg ordering because of stupid OSX.

---
 scripts/encodedecodetest.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/encodedecodetest.sh b/scripts/encodedecodetest.sh
index 8bb152c2..8d5bb9ea 100755
--- a/scripts/encodedecodetest.sh
+++ b/scripts/encodedecodetest.sh
@@ -21,7 +21,7 @@ if [ ! -s $destfile ]; then
 	exit 1
 fi
 
-truncate $srcfile -r $destfile
+truncate -r $destfile $srcfile
 if ! cmp $srcfile $destfile; then
 	echo "Comparison failed!" >&2
 	exit 1