All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [git commit branch/2022.02.x] package/libabseil-cpp: fix musl build on mips
@ 2022-07-19 15:09 Peter Korsgaard
  0 siblings, 0 replies; only message in thread
From: Peter Korsgaard @ 2022-07-19 15:09 UTC (permalink / raw)
  To: buildroot

commit: https://git.buildroot.net/buildroot/commit/?id=9363299e19a9b2a257edc0715e9f5b66e7a114d6
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x

Fix the following musl build failure on mips:

In file included from /nvmedata/autobuild/instance-15/output-1/build/libabseil-cpp-20211102.0/absl/base/internal/low_level_alloc.cc:26:
/nvmedata/autobuild/instance-15/output-1/build/libabseil-cpp-20211102.0/absl/base/internal/direct_mmap.h:49:10: fatal error: sgidefs.h: No such file or directory
   49 | #include <sgidefs.h>
      |          ^~~~~~~~~~~

Fixes:
 - http://autobuild.buildroot.org/results/3fa027e602bacb22316fb5d9b233baa0b0f0e845

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit 4e56904624cfaf148e0f45837cd9d565ef60c260)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 ...rnal-direct_mmap-h-fix-musl-build-on-mips.patch | 55 ++++++++++++++++++++++
 1 file changed, 55 insertions(+)

diff --git a/package/libabseil-cpp/0003-PR-1197-absl-base-internal-direct_mmap-h-fix-musl-build-on-mips.patch b/package/libabseil-cpp/0003-PR-1197-absl-base-internal-direct_mmap-h-fix-musl-build-on-mips.patch
new file mode 100644
index 0000000000..0f77236843
--- /dev/null
+++ b/package/libabseil-cpp/0003-PR-1197-absl-base-internal-direct_mmap-h-fix-musl-build-on-mips.patch
@@ -0,0 +1,55 @@
+From 53a90f079af7ab491530d432bb318a95371ba877 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: Thu, 16 Jun 2022 14:28:53 -0700
+Subject: [PATCH] PR #1197: absl/base/internal/direct_mmap.h: fix musl build on
+ mips
+
+Imported from GitHub PR https://github.com/abseil/abseil-cpp/pull/1197
+
+Fix the following musl build failure on mips:
+
+```
+In file included from /nvmedata/autobuild/instance-15/output-1/build/libabseil-cpp-20211102.0/absl/base/internal/low_level_alloc.cc:26:
+/nvmedata/autobuild/instance-15/output-1/build/libabseil-cpp-20211102.0/absl/base/internal/direct_mmap.h:49:10: fatal error: sgidefs.h: No such file or directory
+   49 | #include <sgidefs.h>
+      |          ^~~~~~~~~~~
+```
+
+Fixes:
+ - http://autobuild.buildroot.org/results/3fa027e602bacb22316fb5d9b233baa0b0f0e845
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Merge c9b5b5c5471213a871f7d6d1d2fc8f6899effbac into a184bab83ffcffc2aaac49a3900361158ab3890f
+
+Merging this change closes #1197
+
+COPYBARA_INTEGRATE_REVIEW=https://github.com/abseil/abseil-cpp/pull/1197 from ffontaine:master c9b5b5c5471213a871f7d6d1d2fc8f6899effbac
+PiperOrigin-RevId: 455467767
+Change-Id: I1905f7d70e914288bc1524a52adce3476a779fd8
+
+[Retrieved from:
+https://github.com/abseil/abseil-cpp/commit/53a90f079af7ab491530d432bb318a95371ba877]
+---
+ absl/base/internal/direct_mmap.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/absl/base/internal/direct_mmap.h b/absl/base/internal/direct_mmap.h
+index a01d61220..e492bb004 100644
+--- a/absl/base/internal/direct_mmap.h
++++ b/absl/base/internal/direct_mmap.h
+@@ -41,13 +41,13 @@
+ 
+ #ifdef __mips__
+ // Include definitions of the ABI currently in use.
+-#ifdef __BIONIC__
++#if defined(__BIONIC__) || !defined(__GLIBC__)
+ // Android doesn't have sgidefs.h, but does have asm/sgidefs.h, which has the
+ // definitions we need.
+ #include <asm/sgidefs.h>
+ #else
+ #include <sgidefs.h>
+-#endif  // __BIONIC__
++#endif  // __BIONIC__ || !__GLIBC__
+ #endif  // __mips__
+ 
+ // SYS_mmap and SYS_munmap are not defined in Android.
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2022-07-19 15:36 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-07-19 15:09 [Buildroot] [git commit branch/2022.02.x] package/libabseil-cpp: fix musl build on mips Peter Korsgaard

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.