CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages 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>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
Martin Jansa 2015-10-16 15:58:27 +02:00 committed by Armin Kuster
parent 7f1df52e94
commit 44a8d09d15
2 changed files with 41 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
meta-multimedia/recipes-dvb/oscam/oscam/respect-cflags.patch Normal file
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

4
meta-multimedia/recipes-dvb/oscam/oscam_svn.bb
View File

@ -6,7 +6,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
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"
PV = "1.10+${SRCPV}"