move sed commands to a patch file; add TEST_FLAGS to bpf.mk for criterion CLI

Author: tony-ricciardi

docker/Dockerfile

@@ -40,24 +40,10 @@ RUN cd pyth-client && ./scripts/build.sh
 RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs \
   | sh -s -- -y --default-toolchain none
 
-# Copy solana sdk to modify makefile and header.
+# Copy solana sdk and apply patch.
 RUN mkdir solana
 RUN cp -a /usr/bin/sdk solana
-
-# Enable all clang warnings.
-RUN sed -i \
-  's/-Werror/-Wall -Wextra -Wconversion -Werror/g' \
-  solana/sdk/bpf/c/bpf.mk
-
-# Disallow missing symbols in ld.
-RUN sed -i \
-  's/-z notext/-z notext -z defs/g' \
-  solana/sdk/bpf/c/bpf.mk
-
-# https://github.com/solana-labs/solana/issues/21198
-RUN sed -i \
-  's/\(^uint64_t sol_invoke_signed_c(\)/__attribute__(( weak )) \1/g' \
-  solana/sdk/bpf/c/inc/solana_sdk.h
+RUN ./pyth-client/scripts/patch-solana.sh
 
 # Build and test the oracle program.
 RUN cd pyth-client && ./scripts/build-bpf.sh program

scripts/build-bpf.sh

@@ -8,12 +8,17 @@
 
 set -eu
 
-BUILD_DIR="$( cd "${1:-program}" && pwd )"
+BUILD_DIR="$( cd "${1:-.}" && pwd )"
 
 if [[ ! -f "${BUILD_DIR}/makefile" ]]
 then
-  >&2 echo "Not a makefile dir: ${BUILD_DIR}"
-  exit 1
+  if [[ -f "${BUILD_DIR}/program/makefile" ]]
+  then
+    BUILD_DIR="${BUILD_DIR}/program"
+  else
+    >&2 echo "Not a makefile dir: ${BUILD_DIR}"
+    exit 1
+  fi
 fi
 
 if ! which cargo 2> /dev/null
@@ -25,6 +30,7 @@ fi
 set -x
 
 cd "${BUILD_DIR}"
-make V=1 clean
-make V=1 "${@:2}"
+export V="${V:-1}"
+make clean
+make "${@:2}"
 sha256sum ../target/*.so

scripts/patch-solana.sh

@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+#
+# Patch BPF makefile and solana_sdk.h:
+# - Build with `-Wall -Wextra -Wconversion`.
+# - Link with `-z defs` and mark `sol_invoke_signed_c` as weak.
+# - Add TEST_FLAGS for criterion CLI.
+#
+
+set -eu
+
+THIS_DIR="$( dirname "${BASH_SOURCE[0]}" )"
+THIS_DIR="$( cd "${THIS_DIR}" && pwd )"
+SOLANA="${SOLANA:-$THIS_DIR/../../solana}"
+SOLANA="$( cd "${SOLANA}" && pwd )"
+
+set -x
+cd "${SOLANA}"
+patch -p1 -i "${THIS_DIR}/solana.patch"

scripts/solana.patch

@@ -0,0 +1,56 @@
+diff --git a/sdk/bpf/c/bpf.mk b/sdk/bpf/c/bpf.mk
+index 4b3039db1..018e8deb4 100644
+--- a/sdk/bpf/c/bpf.mk
++++ b/sdk/bpf/c/bpf.mk
+@@ -14,6 +14,12 @@ TEST_PREFIX ?= test_
+ OUT_DIR ?= ./out
+ OS := $(shell uname)
+ 
++ifeq ($(V),1)
++TEST_FLAGS ?= --verbose
++else
++TEST_FLAGS ?=
++endif
++
+ LLVM_DIR = $(LOCAL_PATH)../dependencies/bpf-tools/llvm
+ LLVM_SYSTEM_INC_DIRS := $(LLVM_DIR)/lib/clang/12.0.1/include
+ COMPILER_RT_DIR = $(LOCAL_PATH)../dependencies/bpf-tools/rust/lib/rustlib/bpfel-unknown-unknown/lib
+@@ -31,6 +37,9 @@ SYSTEM_INC_DIRS := \
+   $(LLVM_SYSTEM_INC_DIRS) \
+ 
+ C_FLAGS := \
++  -Wall \
++  -Wextra \
++  -Wconversion \
+   -Werror \
+   -O2 \
+   -fno-builtin \
+@@ -59,6 +68,7 @@ BPF_CXX_FLAGS := \
+   -march=bpfel+solana
+ 
+ BPF_LLD_FLAGS := \
++  -z defs \
+   -z notext \
+   -shared \
+   --Bdynamic \
+@@ -195,7 +205,7 @@ endef
+ define TEST_EXEC_RULE
+ $1: $2
+ 	LD_LIBRARY_PATH=$(TESTFRAMEWORK_RPATH) \
+-	$2$(\n)
++	$2 $(TEST_FLAGS)$(\n)
+ endef
+ 
+ .PHONY: $(INSTALL_SH)
+diff --git a/sdk/bpf/c/inc/solana_sdk.h b/sdk/bpf/c/inc/solana_sdk.h
+index b5cad9833..b3b496123 100644
+--- a/sdk/bpf/c/inc/solana_sdk.h
++++ b/sdk/bpf/c/inc/solana_sdk.h
+@@ -565,6 +565,7 @@ uint64_t sol_try_find_program_address(
+ /**
+  * Internal cross-program invocation function
+  */
++__attribute__(( weak ))
+ uint64_t sol_invoke_signed_c(
+   const SolInstruction *instruction,
+   const SolAccountInfo *account_infos,