Skip to contentSkip to conversation

yp-tools: Ignore cpp warnings as errors

PATCH In review Khem Raj 2 participants 9 messages Sep 22, 2017

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/7 yp-tools: Ignore cpp warnings as errors

-Wno-error=\#Warnings is too clang'ish, gcc doesnt like it use an option that common for both compilers

---
 meta-networking/recipes-support/nis/yp-tools_4.2.2.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-networking/recipes-support/nis/yp-tools_4.2.2.bb +1 -1
index a3f0a7698..9ac973812 100644
@@ -33,7 +33,7 @@ CACHED_CONFIGUREVARS += "ac_cv_prog_STRIP=/bin/true"
 EXTRA_OECONF = " \
                 --disable-rpath --disable-domainname \
                "
-CFLAGS_append_libc-musl = " -Wno-error=\#warnings"
+CFLAGS_append_libc-musl = " -Wno-error=cpp"
 
 FILES_${PN} += " ${libdir}/yp-nis/*.so.*.* ${libdir}/yp-nis/pkgconfig/"
 FILES_${PN}-dbg += " ${libdir}/yp-nis/.debug"
Signature · 1 line
2.14.1
author
#1 lore raw

PATCH 2/7 openl2tp: Fix build with musl/libtirpc

---
 ...api.c-include-rpc-clnt.h-for-resultproc_t.patch | 31 ++++++++++++++++++++++
 .../recipes-protocols/openl2tp/openl2tp_1.8.bb     |  1 +
 2 files changed, 32 insertions(+)
 create mode 100644 meta-networking/recipes-protocols/openl2tp/openl2tp/0001-l2tp_api.c-include-rpc-clnt.h-for-resultproc_t.patch
meta-networking/recipes-protocols/openl2tp/openl2tp/0001-l2tp_api.c-include-rpc-clnt.h-for-resultproc_t.patch new file +31 -0
new file mode 100644
index 000000000..a11a97ebd
@@ -0,0 +1,31 @@
+From 8f299df4dd1ca857e34859c377a29b183c630961 Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Thu, 21 Sep 2017 13:05:03 -0700
+Subject: [PATCH] l2tp_api.c: include rpc/clnt.h for 'resultproc_t'
+
+Fixes
+
+| /mnt/a/oe/build/tmp/work/mips32r2-bec-linux-musl/openl2tp/1.8-r0/recipe-sysroot/usr/include/tirpc/rpc/pmap_clnt.h:81:12: error: unknown type name 'resultproc_t'; did you mean 'rpcproc_t'?                                                 |             resultproc_t);                                                                                                                                                                                                                  |             ^~~~~~~~~~~~
+
+Signed-off-by: Khem Raj <[email protected]>
+---
+Upstream-Status: Pending
+
+ l2tp_api.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/l2tp_api.c b/l2tp_api.c
+index f0946fd..f77881c 100644
+--- a/l2tp_api.c
++++ b/l2tp_api.c
+@@ -26,6 +26,7 @@
+ #include <sys/types.h>
+ #include <rpc/types.h>
+ #include <rpc/xdr.h>
++#include <rpc/clnt.h>
+ #include <rpc/pmap_clnt.h>
+ //#include <netinet/in.h>
+ 
+-- 
+2.14.1
+
meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb +1 -0
index 0395199e7..bbde8a337 100644
@@ -36,6 +36,7 @@ SRC_URI = "ftp://ftp.openl2tp.org/releases/${BP}/${BP}.tar.gz \
 SRC_URI_append_libc-musl = "\
            file://0004-Adjust-for-linux-kernel-headers-assumptions-on-glibc.patch \
            file://0002-user-ipv6-structures.patch \
+           file://0001-l2tp_api.c-include-rpc-clnt.h-for-resultproc_t.patch \
            "
 SRC_URI[md5sum] = "e3d08dedfb9e6a9a1e24f6766f6dadd0"
 SRC_URI[sha256sum] = "1c97704d4b963a87fbc0e741668d4530933991515ae9ab0dffd11b5444f4860f"
Signature · 1 line
2.14.1
author
#2 lore raw

PATCH 3/7 network-manager-applet: Disable gobject-introspection on musl

In reply to Khem Raj

It segfaults qemu

---
 .../network-manager-applet/network-manager-applet_1.4.4.bb              | 2 ++
 1 file changed, 2 insertions(+)
meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.4.4.bb +2 -0
index 8cec305ef..14b336a1e 100644
@@ -17,6 +17,8 @@ SRC_URI[archive.sha256sum] = "693846eeae0986e79eb1cedfbc499f132f27a9976ef189a0f1
 PACKAGECONFIG[modemmanager] = "--with-wwan,--without-wwan,modemmanager"
 PACKAGECONFIG ??= ""
 
+GI_DATA_ENABLED_libc-musl = "False"
+
 do_configure_append() {
     # Sigh... --enable-compile-warnings=no doesn't actually turn off -Werror
     for i in $(find ${B} -name "Makefile") ; do
Signature · 1 line
2.14.1
author
#3 lore raw

PATCH 4/7 toybox: Upgrade to 0.7.4

In reply to Khem Raj

enable parallel build

---
 .../recipes-core/toybox/{toybox_0.7.3.bb => toybox_0.7.4.bb}   | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)
 rename meta-oe/recipes-core/toybox/{toybox_0.7.3.bb => toybox_0.7.4.bb} (87%)
meta-oe/recipes-core/toybox/toybox_0.7.4.bb renamed from meta-oe/recipes-core/toybox/toybox_0.7.3.bb +4 -6
similarity index 87%
rename from meta-oe/recipes-core/toybox/toybox_0.7.3.bb
rename to meta-oe/recipes-core/toybox/toybox_0.7.4.bb
index 0cd44ff64..76a7af459 100644
@@ -2,12 +2,10 @@ SUMMARY = "Toybox combines common utilities together into a single executable."
 HOMEPAGE = "http://www.landley.net/toybox/"
 DEPENDS = "attr"
 
-SRC_URI = " \
-    http://www.landley.net/toybox/downloads/${BPN}-${PV}.tar.gz \
+SRC_URI = "http://www.landley.net/toybox/downloads/${BPN}-${PV}.tar.gz \
 "
-
-SRC_URI[md5sum] = "6fa2a001402cb067ba541e0d8948da50"
-SRC_URI[sha256sum] = "e6469b508224e0d2e4564dda05c4bb47aef5c28bf29d6c983bcdc6e3a0cd29d6"
+SRC_URI[md5sum] = "55ea59a31c7da9510c8fabe70f4bc561"
+SRC_URI[sha256sum] = "49d74ca897501e5c981516719870fe08581726f5c018abe35ef52c6f0de113e7"
 
 LICENSE = "BSD-0-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=f0b8b3dd6431bcaa245da0a08bd0d511"
@@ -16,7 +14,7 @@ SECTION = "base"
 
 TOYBOX_BIN = "generated/unstripped/toybox"
 
-EXTRA_OEMAKE = 'HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}"'
+EXTRA_OEMAKE = 'HOSTCC="${BUILD_CC}" CPUS=${@oe.utils.cpu_count()}'
 
 do_configure() {
     oe_runmake defconfig
Signature · 1 line
2.14.1
#4 lore raw

Re: [meta-oe][PATCH 4/7] toybox: Upgrade to 0.7.4

Quoted 32 lines · Khem Raj

enable parallel build

---
 .../recipes-core/toybox/{toybox_0.7.3.bb => toybox_0.7.4.bb}   | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)
 rename meta-oe/recipes-core/toybox/{toybox_0.7.3.bb => toybox_0.7.4.bb} (87%)
meta-oe/recipes-core/toybox/toybox_0.7.4.bb renamed from meta-oe/recipes-core/toybox/toybox_0.7.3.bb +3 -5
similarity index 87%
rename from meta-oe/recipes-core/toybox/toybox_0.7.3.bb
rename to meta-oe/recipes-core/toybox/toybox_0.7.4.bb
index 0cd44ff64..76a7af459 100644
@@ -2,12 +2,10 @@ SUMMARY = "Toybox combines common utilities together into a single executable."
 HOMEPAGE = "http://www.landley.net/toybox/"
 DEPENDS = "attr"
 
-SRC_URI = " \
-    http://www.landley.net/toybox/downloads/${BPN}-${PV}.tar.gz \
+SRC_URI = "http://www.landley.net/toybox/downloads/${BPN}-${PV}.tar.gz \
 "
-
-SRC_URI[md5sum] = "6fa2a001402cb067ba541e0d8948da50"
-SRC_URI[sha256sum] = "e6469b508224e0d2e4564dda05c4bb47aef5c28bf29d6c983bcdc6e3a0cd29d6"
+SRC_URI[md5sum] = "55ea59a31c7da9510c8fabe70f4bc561"
+SRC_URI[sha256sum] = "49d74ca897501e5c981516719870fe08581726f5c018abe35ef52c6f0de113e7"
 
 LICENSE = "BSD-0-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=f0b8b3dd6431bcaa245da0a08bd0d511"

meta-oe/recipes-core/toybox/toybox_0.7.4.bb SECTION = "base" · line 17

Quoted 5 lines
meta-oe/recipes-core/toybox/toybox_0.7.4.bb renamed from meta-oe/recipes-core/toybox/toybox_0.7.3.bb +1 -1
@@ -16,7 +14,7 @@ SECTION = "base"
 
 TOYBOX_BIN = "generated/unstripped/toybox"
 
-EXTRA_OEMAKE = 'HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}"'
+EXTRA_OEMAKE = 'HOSTCC="${BUILD_CC}" CPUS=${@oe.utils.cpu_count()}'

Is dropping ${BUILD_CFLAGS} and ${BUILD_LDFLAGS} from HOSTCC intentional?

Quoted 10 lines
meta-oe/recipes-core/toybox/toybox_0.7.4.bb renamed from meta-oe/recipes-core/toybox/toybox_0.7.3.bb +0 -1
 do_configure() {
     oe_runmake defconfig
--

2.14.1

--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

author
#5 lore raw

Re: [meta-oe][PATCH 4/7] toybox: Upgrade to 0.7.4

Quoted 34 lines · Andre McCurdy
Quoted 33 lines · Khem Raj

enable parallel build

---
 .../recipes-core/toybox/{toybox_0.7.3.bb => toybox_0.7.4.bb}   | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)
 rename meta-oe/recipes-core/toybox/{toybox_0.7.3.bb => toybox_0.7.4.bb} (87%)
meta-oe/recipes-core/toybox/toybox_0.7.4.bb renamed from meta-oe/recipes-core/toybox/toybox_0.7.3.bb +3 -5
similarity index 87%
rename from meta-oe/recipes-core/toybox/toybox_0.7.3.bb
rename to meta-oe/recipes-core/toybox/toybox_0.7.4.bb
index 0cd44ff64..76a7af459 100644
@@ -2,12 +2,10 @@ SUMMARY = "Toybox combines common utilities together into a single executable."
 HOMEPAGE = "http://www.landley.net/toybox/"
 DEPENDS = "attr"
 
-SRC_URI = " \
-    http://www.landley.net/toybox/downloads/${BPN}-${PV}.tar.gz \
+SRC_URI = "http://www.landley.net/toybox/downloads/${BPN}-${PV}.tar.gz \
 "
-
-SRC_URI[md5sum] = "6fa2a001402cb067ba541e0d8948da50"
-SRC_URI[sha256sum] = "e6469b508224e0d2e4564dda05c4bb47aef5c28bf29d6c983bcdc6e3a0cd29d6"
+SRC_URI[md5sum] = "55ea59a31c7da9510c8fabe70f4bc561"
+SRC_URI[sha256sum] = "49d74ca897501e5c981516719870fe08581726f5c018abe35ef52c6f0de113e7"
 
 LICENSE = "BSD-0-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=f0b8b3dd6431bcaa245da0a08bd0d511"
@@ -16,7 +14,7 @@ SECTION = "base"
 
Quoted 6 lines

meta-oe/recipes-core/toybox/toybox_0.7.4.bb SECTION = "base" · line 17

Quoted 4 lines
meta-oe/recipes-core/toybox/toybox_0.7.4.bb renamed from meta-oe/recipes-core/toybox/toybox_0.7.3.bb +1 -1
 TOYBOX_BIN = "generated/unstripped/toybox"
 
-EXTRA_OEMAKE = 'HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}"'
+EXTRA_OEMAKE = 'HOSTCC="${BUILD_CC}" CPUS=${@oe.utils.cpu_count()}'

Is dropping ${BUILD_CFLAGS} and ${BUILD_LDFLAGS} from HOSTCC intentional?

yes it is intentional. This allows the native programs to build with dev files from native system. Instead of creating a hybrid of OE's native sysroot with build system provided one.

Quoted 11 lines
Quoted 11 lines
meta-oe/recipes-core/toybox/toybox_0.7.4.bb renamed from meta-oe/recipes-core/toybox/toybox_0.7.3.bb +0 -1
 do_configure() {
     oe_runmake defconfig
--

2.14.1

--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

author
#6 lore raw

PATCH 5/7 nbench-byte: Update SRC_URI to fossies.org

In reply to Khem Raj

Current SRC_URI responds with 404

Fix
WARNING: nbench-byte-2.2.3-r0 do_fetch: Failed to fetch URL http://www.tux.org/~mayer/linux/nbench-byte-2.2.3.tar.gz, attempting MIRRORS if available

---
 meta-oe/recipes-benchmark/nbench-byte/nbench-byte_2.2.3.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
meta-oe/recipes-benchmark/nbench-byte/nbench-byte_2.2.3.bb +2 -1
index 56272d985..da2cb4b32 100644
@@ -1,3 +1,4 @@
+SUMMARY = "A CPU benchmark utility"
 DESCRIPTION = "BYTE Magazine's native benchmarks (also called BYTEmark) \
 designed to expose the capabilities of a system's CPU, FPU, \
 and memory system."
@@ -6,7 +7,7 @@ LICENSE = "nbench-byte"
 LIC_FILES_CHKSUM = "file://README;beginline=57;endline=66;md5=020ef579f8fa5746b7e307a54707834f"
 SECTION = "console/utils"
 
-SRC_URI = "http://www.tux.org/~mayer/linux/${BP}.tar.gz \
+SRC_URI = "https://fossies.org/linux/misc/${BP}.tar.gz \
            file://nbench_32bits.patch \
            file://Makefile-add-more-dependencies-to-pointer.h.patch"
 
Signature · 1 line
2.14.1
author
#7 lore raw

PATCH v3 6/7 leveldb: Fix parallel build

In reply to Khem Raj

Add build parallelism, since we do not use oe_runmake

---
Changes in V3: Fix parallel build

 .../leveldb/0001-Makefile-Fix-parallel-build.patch | 35 ++++++++++++++++++++++
 meta-oe/recipes-extended/leveldb/leveldb_git.bb    |  3 +-
 2 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 meta-oe/recipes-extended/leveldb/leveldb/0001-Makefile-Fix-parallel-build.patch
meta-oe/recipes-extended/leveldb/leveldb/0001-Makefile-Fix-parallel-build.patch new file +35 -0
new file mode 100644
index 000000000..5068654e2
@@ -0,0 +1,35 @@
+From c85978e77725ef233543370d24e23f853f449170 Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Thu, 21 Sep 2017 17:47:02 -0700
+Subject: [PATCH] Makefile: Fix parallel build
+
+Sometimes mkdir $(SHARED_OUTDIR)/db races with compiler which is
+creating .o file in the same directory $(SHARED_OUTDIR)/db/db_bench.o
+
+Fixes error like
+
+| mkdir out-static
+| mkdir out-shared/db
+| Assembler messages:
+| Fatal error: can't create out-shared/db/db_bench.o: No such file or directory
+
+Signed-off-by: Khem Raj <[email protected]>
+---
+Upstream-Status: Submitted
+
+ Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+Index: git/Makefile
+===================================================================
+--- git.orig/Makefile
++++ git/Makefile
+@@ -386,7 +386,7 @@ $(STATIC_OUTDIR)/write_batch_test:db/wri
+ $(STATIC_OUTDIR)/memenv_test:$(STATIC_OUTDIR)/helpers/memenv/memenv_test.o $(STATIC_OUTDIR)/libmemenv.a $(STATIC_OUTDIR)/libleveldb.a $(TESTHARNESS)
+ 	$(XCRUN) $(CXX) $(LDFLAGS) $(STATIC_OUTDIR)/helpers/memenv/memenv_test.o $(STATIC_OUTDIR)/libmemenv.a $(STATIC_OUTDIR)/libleveldb.a $(TESTHARNESS) -o $@ $(LIBS)
+ 
+-$(SHARED_OUTDIR)/db_bench:$(SHARED_OUTDIR)/db/db_bench.o $(SHARED_LIBS) $(TESTUTIL)
++$(SHARED_OUTDIR)/db_bench:$(SHARED_OUTDIR)/db $(SHARED_OUTDIR)/db/db_bench.o $(SHARED_LIBS) $(TESTUTIL)
+ 	$(XCRUN) $(CXX) $(LDFLAGS) $(CXXFLAGS) $(PLATFORM_SHARED_CFLAGS) $(SHARED_OUTDIR)/db/db_bench.o $(TESTUTIL) $(SHARED_OUTDIR)/$(SHARED_LIB3) -o $@ $(LIBS)
+ 
+ .PHONY: run-shared
meta-oe/recipes-extended/leveldb/leveldb_git.bb +2 -1
index dfe4b459a..8fec89c6f 100644
@@ -10,6 +10,7 @@ PV = "1.20+git${SRCPV}"
 SRC_URI = "git://github.com/google/${BPN}.git \
            file://0001-build_detect_platform-Check-for-__SSE4_2__.patch \
            file://0002-makefile-build-SHARED_MEMENVLIB.patch \
+           file://0001-Makefile-Fix-parallel-build.patch \
            "
 
 S = "${WORKDIR}/git"
@@ -19,7 +20,7 @@ inherit utils
 do_compile() {
     # do not use oe_runmake. oe_runmake pass to make compilation arguments and override
     # leveldb makefile variable CFLAGS and broke leveldb build.
-    CFLAGS="${CFLAGS}" make || die
+    CFLAGS="${CFLAGS}" make ${PARALLEL_MAKE}|| die
 }
 
 do_install() {
Signature · 1 line
2.14.1
author
#8 lore raw

PATCH 7/7 breakpad: Fix build with musl/mips

In reply to Khem Raj
---
 .../breakpad/breakpad/mcontext.patch               | 77 ++++++++++++++++++++++
 .../breakpad/breakpad/mips_asm_sgidefs.patch       |  9 ++-
 meta-oe/recipes-devtools/breakpad/breakpad_git.bb  |  3 +
 3 files changed, 88 insertions(+), 1 deletion(-)
 create mode 100644 meta-oe/recipes-devtools/breakpad/breakpad/mcontext.patch
meta-oe/recipes-devtools/breakpad/breakpad/mcontext.patch new file +77 -0
new file mode 100644
index 000000000..42e073b94
@@ -0,0 +1,77 @@
+map the mcontext_t structure for musl
+
+Upstream-Status: Inappropriate[need to consider Android]
+
+Signed-off-by: Khem Raj <[email protected]>
+Index: git/src/client/linux/dump_writer_common/thread_info.cc
+===================================================================
+--- git.orig/src/client/linux/dump_writer_common/thread_info.cc
++++ git/src/client/linux/dump_writer_common/thread_info.cc
+@@ -229,7 +229,6 @@ void ThreadInfo::FillCPUContext(RawConte
+ }
+ 
+ #elif defined(__mips__)
+-
+ uintptr_t ThreadInfo::GetInstructionPointer() const {
+   return mcontext.pc;
+ }
+@@ -263,8 +262,11 @@ void ThreadInfo::FillCPUContext(RawConte
+   out->cause = 0; // Not stored in mcontext
+ 
+   for (int i = 0; i < MD_FLOATINGSAVEAREA_MIPS_FPR_COUNT; ++i)
++#ifdef __GLIBC__
+     out->float_save.regs[i] = mcontext.fpregs.fp_r.fp_fregs[i]._fp_fregs;
+-
++#else
++    out->float_save.regs[i] = mcontext.fpregs[i];
++#endif
+   out->float_save.fpcsr = mcontext.fpc_csr;
+ #if _MIPS_SIM == _ABIO32
+   out->float_save.fir = mcontext.fpc_eir;
+Index: git/src/client/linux/dump_writer_common/ucontext_reader.cc
+===================================================================
+--- git.orig/src/client/linux/dump_writer_common/ucontext_reader.cc
++++ git/src/client/linux/dump_writer_common/ucontext_reader.cc
+@@ -247,8 +247,11 @@ void UContextReader::FillCPUContext(RawC
+   out->cause = 0;  // Not reported in signal context.
+ 
+   for (int i = 0; i < MD_FLOATINGSAVEAREA_MIPS_FPR_COUNT; ++i)
++#ifdef __GLIBC__
+     out->float_save.regs[i] = uc->uc_mcontext.fpregs.fp_r.fp_dregs[i];
+-
++#else
++    out->float_save.regs[i] = uc->uc_mcontext.fpregs[i];
++#endif
+   out->float_save.fpcsr = uc->uc_mcontext.fpc_csr;
+ #if _MIPS_SIM == _ABIO32
+   out->float_save.fir = uc->uc_mcontext.fpc_eir;  // Unused.
+Index: git/src/client/linux/minidump_writer/linux_core_dumper.cc
+===================================================================
+--- git.orig/src/client/linux/minidump_writer/linux_core_dumper.cc
++++ git/src/client/linux/minidump_writer/linux_core_dumper.cc
+@@ -196,7 +196,7 @@ bool LinuxCoreDumper::EnumerateThreads()
+         info.tgid = status->pr_pgrp;
+         info.ppid = status->pr_ppid;
+ #if defined(__mips__)
+-#if defined(__ANDROID__)
++#if defined(__ANDROID__) || !defined(__GLIBC__)
+         for (int i = EF_R0; i <= EF_R31; i++)
+           info.mcontext.gregs[i - EF_R0] = status->pr_reg[i];
+ #else  // __ANDROID__
+Index: git/src/tools/linux/md2core/minidump-2-core.cc
+===================================================================
+--- git.orig/src/tools/linux/md2core/minidump-2-core.cc
++++ git/src/tools/linux/md2core/minidump-2-core.cc
+@@ -516,8 +516,12 @@ ParseThreadRegisters(CrashedProcess::Thr
+   thread->mcontext.lo3 = rawregs->lo[2];
+ 
+   for (int i = 0; i < MD_FLOATINGSAVEAREA_MIPS_FPR_COUNT; ++i) {
++#ifdef __GLIBC__
+     thread->mcontext.fpregs.fp_r.fp_fregs[i]._fp_fregs =
+         rawregs->float_save.regs[i];
++#else
++    thread->mcontext.fpregs[i] = rawregs->float_save.regs[i];
++#endif
+   }
+ 
+   thread->mcontext.fpc_csr = rawregs->float_save.fpcsr;
meta-oe/recipes-devtools/breakpad/breakpad/mips_asm_sgidefs.patch +8 -1
index 678f63d74..19bb56044 100644
@@ -2,7 +2,7 @@ Index: lss/linux_syscall_support.h
 ===================================================================
 --- lss.orig/linux_syscall_support.h
 +++ lss/linux_syscall_support.h
-@@ -118,15 +118,7 @@ extern "C" {
+@@ -118,21 +118,13 @@ extern "C" {
  #include <endian.h>
  
  #ifdef __mips__
@@ -18,3 +18,10 @@ Index: lss/linux_syscall_support.h
  #endif
  #endif
  
+ /* The Android NDK's <sys/stat.h> #defines these macros as aliases
+  * to their non-64 counterparts. To avoid naming conflict, remove them. */
+-#ifdef __ANDROID__
++#if defined(__ANDROID__) || (defined(__linux__) && !defined(__glibc__))
+   /* These are restored by the corresponding #pragma pop_macro near
+    * the end of this file. */
+ # pragma push_macro("stat64")
meta-oe/recipes-devtools/breakpad/breakpad_git.bb +3 -0
index 1ddd6b565..a17759eb4 100644
@@ -40,11 +40,14 @@ SRC_URI = "git://github.com/google/breakpad;name=breakpad \
            file://0004-elf_reader.cc-include-sys-reg.h-to-get-__WORDSIZE-on.patch \
            file://0005-md2core-Replace-basename.patch \
            file://0002-Use-_fpstate-instead-of-_libc_fpstate-on-linux.patch \
+           file://mcontext.patch \
            file://0001-lss-Match-syscalls-to-match-musl.patch;patchdir=src/third_party/lss \
            file://mips_asm_sgidefs.patch;patchdir=src/third_party/lss \
 "
 S = "${WORKDIR}/git"
 
+CXXFLAGS += "-D_GNU_SOURCE"
+
 COMPATIBLE_MACHINE_powerpc = "(!.*ppc).*"
 
 do_install_append() {
Signature · 1 line
2.14.1