[oe-commits] [meta-openembedded] 01/36: gperftools: Fix build on musl/mips

git at git.openembedded.org git at git.openembedded.org
Thu Feb 1 16:01:19 UTC 2018


This is an automated email from the git hooks/post-receive script.

armin_kuster pushed a commit to branch rocko
in repository meta-openembedded.

commit 7b404fd996285ac27eef7fb2b6ab03ea5a8e6f60
Author: Khem Raj <raj.khem at gmail.com>
AuthorDate: Mon Oct 16 21:26:40 2017 -0700

    gperftools: Fix build on musl/mips
    
    Signed-off-by: Khem Raj <raj.khem at gmail.com>
    Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
    (cherry picked from commit 738bea45bc51d9a78a3d46ee8c18390427ccd547)
    Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
 .../recipes-support/gperftools/gperftools/sgidef.patch  | 17 +++++++++++++++++
 meta-oe/recipes-support/gperftools/gperftools_2.6.1.bb  |  1 +
 2 files changed, 18 insertions(+)

diff --git a/meta-oe/recipes-support/gperftools/gperftools/sgidef.patch b/meta-oe/recipes-support/gperftools/gperftools/sgidef.patch
new file mode 100644
index 0000000..7e1a23b
--- /dev/null
+++ b/meta-oe/recipes-support/gperftools/gperftools/sgidef.patch
@@ -0,0 +1,17 @@
+sgidef.h does not exist on musl and its not needed to compile
+
+Signed-off-by: Khem Raj <raj.khem at gmail.com>
+Upstream-Status: Pending
+Index: git/src/base/linux_syscall_support.h
+===================================================================
+--- git.orig/src/base/linux_syscall_support.h
++++ git/src/base/linux_syscall_support.h
+@@ -164,7 +164,7 @@ extern "C" {
+ #include <endian.h>
+ #include <fcntl.h>
+ 
+-#ifdef __mips__
++#if defined(__mips__) && defined(__glibc__)
+ /* Include definitions of the ABI currently in use.                          */
+ #include <sgidefs.h>
+ #endif
diff --git a/meta-oe/recipes-support/gperftools/gperftools_2.6.1.bb b/meta-oe/recipes-support/gperftools/gperftools_2.6.1.bb
index 8ce376c..ecac6c5 100644
--- a/meta-oe/recipes-support/gperftools/gperftools_2.6.1.bb
+++ b/meta-oe/recipes-support/gperftools/gperftools_2.6.1.bb
@@ -12,6 +12,7 @@ SRC_URI = "git://github.com/gperftools/gperftools \
            file://0001-include-fcntl.h-for-loff_t-definition.patch \
            file://0001-disbale-heap-checkers-and-debug-allocator-on-musl.patch \
            file://disable_libunwind_aarch64.patch \
+           file://sgidef.patch \
            "
 
 inherit autotools

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the Openembedded-commits mailing list