Skip to content

Commit

Permalink
fix: windows環境で、borning sslのビルドが失敗する
Browse files Browse the repository at this point in the history
stringヘッダーをincludeしていないためと思われる
borning sslにパッチを当てると、再度ビルド出来なくなるため、パッチを戻す処理を追加

Signed-off-by: Zenichi Amano <crow.misia@gmail.com>
  • Loading branch information
crow-misia committed Sep 6, 2024
1 parent faca347 commit e73f646
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 1 deletion.
3 changes: 2 additions & 1 deletion build/common.mk
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,8 @@ common-patch:
cd $(SRC_DIR) && \
patch -p1 < $(PATCH_DIR)/nacl_armv6_2.patch && \
patch -p2 < $(PATCH_DIR)/4k.patch && \
patch -p2 < $(PATCH_DIR)/add_licenses.patch
patch -p2 < $(PATCH_DIR)/add_licenses.patch && \
patch -p2 < $(PATCH_DIR)/borning_ssl_missing_string_header.patch

.PHONY: common-package
common-package: copy
Expand Down
10 changes: 10 additions & 0 deletions patch/borning_ssl_missing_string_header.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
--- a/src/third_party/boringssl/src/pki/string_util.h
+++ b/src/third_party/boringssl/src/pki/string_util.h
@@ -6,6 +6,7 @@
#define BSSL_PKI_STRING_UTIL_H_

#include <cstdint>
+#include <string>
#include <string_view>
#include <vector>

5 changes: 5 additions & 0 deletions scripts/fetch_webrtc.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,11 @@ if [ -f $WEBRTC_DIR/.gclient ]; then
git reset --hard;
git clean -xdf;
fi
if [ -d $WEBRTC_DIR/src/third_party/boringssl/src ]; then
cd $WEBRTC_DIR/src/third_party/boringssl/src;
git reset --hard;
git clean -xdf;
fi
if [ -d $WEBRTC_DIR/src/build ]; then
cd $WEBRTC_DIR/src/build;
git reset --hard;
Expand Down

0 comments on commit e73f646

Please sign in to comment.