mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-05-30 00:50:00 +00:00
Code Issues Projects Releases Wiki Activity

oscam: respect *flags set from OE

Browse Source 
* build with -mfloat-abi=hard are failing with:
  sysroots/foo/usr/include/gnu/stubs.h:7:29: fatal error: gnu/stubs-soft.h: No such file or directory
  because cmake wasn't respecting *flags set from OE

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Martin Jansa
2015-08-23 12:49:17 +02:00
parent d6ee00bce0
commit 9f37b85bc8
2 changed files with 41 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-multimedia/recipes-dvb/oscam/oscam/respect-cflags.patch
+38
View File
@@ -0,0 +1,38 @@
Upstream-Status: Backport
http://www.streamboard.tv/oscam/changeset/10068
http://www.streamboard.tv/oscam/changeset/10070
Index: /CMakeLists.txt
===================================================================
--- a/CMakeLists.txt (revision 10067)
+++ b/CMakeLists.txt (revision 10068)
@@ -625,8 +625,8 @@
list(GET GCC_VERSION_COMPONENTS 0 GCC_MINOR)
add_definitions ("-W -Wall ")
- set (CMAKE_C_FLAGS "-Wall -O2")
- set (CMAKE_CXX_FLAGS "-Wall -O2")
- set (CMAKE_C_FLAGS_DEBUG "-O0 -ggdb")
- set (CMAKE_CXX_FLAGS_DEBUG "-O0 -ggdb")
+ set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -O2")
+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -O2")
+ set (CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0 -ggdb")
+ set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0 -ggdb")
endif (CMAKE_COMPILER_IS_GNUCC)
# some optimisations
Index: /csctapi/CMakeLists.txt
===================================================================
--- a/csctapi/CMakeLists.txt (revision 10069)
+++ b/csctapi/CMakeLists.txt (revision 10070)
@@ -6,8 +6,8 @@
list(GET GCC_VERSION_COMPONENTS 0 GCC_MINOR)
add_definitions ("-W -Wall ")
- set (CMAKE_C_FLAGS "-Wall -O2")
- set (CMAKE_CXX_FLAGS "-Wall -O2")
- set (CMAKE_C_FLAGS_DEBUG "-O0 -ggdb")
- set (CMAKE_CXX_FLAGS_DEBUG "-O0 -ggdb")
+ set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -O2")
+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -O2")
+ set (CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0 -ggdb")
+ set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0 -ggdb")
endif (CMAKE_COMPILER_IS_GNUCC)
# Mac extra removes to avoid ranlib warnings in some situations
meta-multimedia/recipes-dvb/oscam/oscam_svn.bb
+3 -1
View File
@@ -6,7 +6,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
DEPENDS = "libusb1 openssl pcsc-lite" DEPENDS = "libusb1 openssl pcsc-lite"
SRC_URI = "svn://www.streamboard.tv/svn/oscam;module=trunk;protocol=http" SRC_URI = "svn://www.streamboard.tv/svn/oscam;module=trunk;protocol=http \
file://respect-cflags.patch \
"
SRCREV = "9164" SRCREV = "9164"
PV = "1.10+${SRCPV}" PV = "1.10+${SRCPV}"