diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2015-08-23 12:49:17 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-10-13 13:48:19 +0200 |
commit | d9eff6abb930be202a9df49a259d820cbfc860a1 (patch) | |
tree | 2d940d1095d6531ef8d21f45d221bfc693b55a93 /meta-multimedia/recipes-dvb/oscam/oscam/respect-cflags.patch | |
parent | e16d1f71301a80e5ea4891b077d5fee36a6354fa (diff) | |
download | meta-openembedded-d9eff6abb930be202a9df49a259d820cbfc860a1.tar.gz |
oscam: respect *flags set from OE
* 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>
Diffstat (limited to 'meta-multimedia/recipes-dvb/oscam/oscam/respect-cflags.patch')
-rw-r--r-- | meta-multimedia/recipes-dvb/oscam/oscam/respect-cflags.patch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/meta-multimedia/recipes-dvb/oscam/oscam/respect-cflags.patch b/meta-multimedia/recipes-dvb/oscam/oscam/respect-cflags.patch new file mode 100644 index 000000000..179d04a55 --- /dev/null +++ b/meta-multimedia/recipes-dvb/oscam/oscam/respect-cflags.patch | |||
@@ -0,0 +1,38 @@ | |||
1 | Upstream-Status: Backport | ||
2 | http://www.streamboard.tv/oscam/changeset/10068 | ||
3 | http://www.streamboard.tv/oscam/changeset/10070 | ||
4 | |||
5 | Index: /CMakeLists.txt | ||
6 | =================================================================== | ||
7 | --- a/CMakeLists.txt (revision 10067) | ||
8 | +++ b/CMakeLists.txt (revision 10068) | ||
9 | @@ -625,8 +625,8 @@ | ||
10 | list(GET GCC_VERSION_COMPONENTS 0 GCC_MINOR) | ||
11 | add_definitions ("-W -Wall ") | ||
12 | - set (CMAKE_C_FLAGS "-Wall -O2") | ||
13 | - set (CMAKE_CXX_FLAGS "-Wall -O2") | ||
14 | - set (CMAKE_C_FLAGS_DEBUG "-O0 -ggdb") | ||
15 | - set (CMAKE_CXX_FLAGS_DEBUG "-O0 -ggdb") | ||
16 | + set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -O2") | ||
17 | + set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -O2") | ||
18 | + set (CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0 -ggdb") | ||
19 | + set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0 -ggdb") | ||
20 | endif (CMAKE_COMPILER_IS_GNUCC) | ||
21 | # some optimisations | ||
22 | Index: /csctapi/CMakeLists.txt | ||
23 | =================================================================== | ||
24 | --- a/csctapi/CMakeLists.txt (revision 10069) | ||
25 | +++ b/csctapi/CMakeLists.txt (revision 10070) | ||
26 | @@ -6,8 +6,8 @@ | ||
27 | list(GET GCC_VERSION_COMPONENTS 0 GCC_MINOR) | ||
28 | add_definitions ("-W -Wall ") | ||
29 | - set (CMAKE_C_FLAGS "-Wall -O2") | ||
30 | - set (CMAKE_CXX_FLAGS "-Wall -O2") | ||
31 | - set (CMAKE_C_FLAGS_DEBUG "-O0 -ggdb") | ||
32 | - set (CMAKE_CXX_FLAGS_DEBUG "-O0 -ggdb") | ||
33 | + set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -O2") | ||
34 | + set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -O2") | ||
35 | + set (CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0 -ggdb") | ||
36 | + set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0 -ggdb") | ||
37 | endif (CMAKE_COMPILER_IS_GNUCC) | ||
38 | # Mac extra removes to avoid ranlib warnings in some situations | ||