mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-07-17 04:37:19 +00:00
mraa: Replace -fcommon with fix
Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
+31
@@ -0,0 +1,31 @@
|
|||||||
|
From dbb5961f106ec42cd70689d933674c9c37aedfe1 Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <besser82@fedoraproject.org>
|
||||||
|
Date: Mon, 13 Apr 2020 20:12:11 +0200
|
||||||
|
Subject: include: Declare gVERSION global as 'extern'.
|
||||||
|
|
||||||
|
Fixes build with '-fno-common'.
|
||||||
|
|
||||||
|
Upstream-Status: Submitted [https://github.com/eclipse/mraa/pull/1012]
|
||||||
|
Signed-off-by: Adrian Bunk <bunk@stusta.de>
|
||||||
|
---
|
||||||
|
include/version.h | 4 ++--
|
||||||
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/include/version.h b/include/version.h
|
||||||
|
index 47366ef..3a567a1 100644
|
||||||
|
--- a/include/version.h
|
||||||
|
+++ b/include/version.h
|
||||||
|
@@ -11,8 +11,8 @@
|
||||||
|
extern "C" {
|
||||||
|
#endif
|
||||||
|
|
||||||
|
-const char* gVERSION;
|
||||||
|
-const char* gVERSION_SHORT;
|
||||||
|
+extern const char* gVERSION;
|
||||||
|
+extern const char* gVERSION_SHORT;
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
}
|
||||||
|
--
|
||||||
|
2.17.1
|
||||||
|
|
||||||
@@ -10,6 +10,7 @@ PV = "2.1.0+git${SRCPV}"
|
|||||||
|
|
||||||
SRC_URI = "git://github.com/eclipse/${BPN}.git;protocol=http \
|
SRC_URI = "git://github.com/eclipse/${BPN}.git;protocol=http \
|
||||||
file://0001-cmake-Use-a-regular-expression-to-match-x86-architec.patch \
|
file://0001-cmake-Use-a-regular-expression-to-match-x86-architec.patch \
|
||||||
|
file://0001-include-Declare-gVERSION-global-as-extern.patch \
|
||||||
"
|
"
|
||||||
|
|
||||||
S = "${WORKDIR}/git"
|
S = "${WORKDIR}/git"
|
||||||
@@ -27,8 +28,6 @@ EXTRA_OECMAKE_append = " -DINSTALLTOOLS:BOOL=ON -DFIRMATA=ON -DCMAKE_SKIP_RPATH=
|
|||||||
-DPYTHON_INCLUDE_DIR=${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI} \
|
-DPYTHON_INCLUDE_DIR=${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI} \
|
||||||
"
|
"
|
||||||
|
|
||||||
CFLAGS += "-fcommon"
|
|
||||||
|
|
||||||
# Prepend mraa-utils to make sure bindir ends up in there
|
# Prepend mraa-utils to make sure bindir ends up in there
|
||||||
PACKAGES =+ "${PN}-utils"
|
PACKAGES =+ "${PN}-utils"
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user