diff options
| author |   Martin Jansa <Martin.Jansa@gmail.com> | 2015-08-23 12:49:17 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-08-31 19:17:08 +0200 |
| commit | 9f37b85bc88916aa0ac959176f77d7ce88827d0c (patch) | |
| tree | d2fb490329cf9b2d7ded390567d6e94251091d0a /meta-multimedia/recipes-dvb/oscam/oscam | |
| parent | d6ee00bce06220f5bffe8d539a11f9a8410b3541 (diff) | |
| download | meta-openembedded-contrib-9f37b85bc88916aa0ac959176f77d7ce88827d0c.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')
| -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 0000000000..179d04a559 --- /dev/null +++ b/meta-multimedia/recipes-dvb/oscam/oscam/respect-cflags.patch @@ -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 |