Skip to content

contrib: fix debian-otel build failure on loongarch64 #45

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

contrib: fix debian-otel build failure on loongarch64 #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions contrib/src/abseil-cpp/36c4b7940b84cb809d5d6bf0bc513c9b23834711.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
From 36c4b7940b84cb809d5d6bf0bc513c9b23834711 Mon Sep 17 00:00:00 2001
From: Ma Aiguo <[email protected]>
Date: Mon, 21 Feb 2022 21:04:57 +0800
Subject: [PATCH] Fit for build on loong64 architecture

---
absl/debugging/internal/examine_stack.cc | 2 ++
1 file changed, 2 insertions(+)

diff --git a/absl/debugging/internal/examine_stack.cc b/absl/debugging/internal/examine_stack.cc
index 589a3ef367d..2fbfea8e53f 100644
--- a/absl/debugging/internal/examine_stack.cc
+++ b/absl/debugging/internal/examine_stack.cc
@@ -82,6 +82,8 @@ void* GetProgramCounter(void* vuc) {
return reinterpret_cast<void*>(context->uc_mcontext.gregs[16]);
#elif defined(__e2k__)
return reinterpret_cast<void*>(context->uc_mcontext.cr0_hi);
+#elif defined(__loongarch__)
+ return reinterpret_cast<void*>(context->uc_mcontext.__pc);
#else
#error "Undefined Architecture."
#endif
1 change: 1 addition & 0 deletions contrib/src/abseil-cpp/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,6 @@ abseil-cpp: abseil-cpp-$(ABSEIL_VERSION).tar.gz .sum-abseil-cpp
$(UNPACK)
$(APPLY) $(SRC)/abseil-cpp/b957f0ccd00481cd4fd663d8320aa02ae0564f18.patch
$(APPLY) $(SRC)/abseil-cpp/4500c2fada4e952037c59bd65e8be1ba0b29f21e.patch
$(APPLY) $(SRC)/abseil-cpp/36c4b7940b84cb809d5d6bf0bc513c9b23834711.patch
$(MOVE)

1 change: 1 addition & 0 deletions debian/Makefile.module-otel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ MODULE_SOURCES_otel= nginx-otel-$(NGINX_OTEL_VERSION)-$(NGINX_OTEL_GITHASH).t

MODULE_PATCHES_otel= $(CONTRIB)/src/abseil-cpp/b957f0ccd00481cd4fd663d8320aa02ae0564f18.patch \
$(CONTRIB)/src/abseil-cpp/4500c2fada4e952037c59bd65e8be1ba0b29f21e.patch \
$(CONTRIB)/src/abseil-cpp/36c4b7940b84cb809d5d6bf0bc513c9b23834711.patch \
$(CONTRIB)/src/grpc/grpc-cmake-no-re2.patch

MODULE_CONFARGS_otel= --add-dynamic-module=$(MODSRC_PREFIX)nginx-otel-$(NGINX_OTEL_GITHASH)/
Expand Down