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 | |
parent | d6ee00bce06220f5bffe8d539a11f9a8410b3541 (diff) | |
download | meta-openembedded-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')
-rw-r--r-- | meta-multimedia/recipes-dvb/oscam/oscam/respect-cflags.patch | 38 | ||||
-rw-r--r-- | meta-multimedia/recipes-dvb/oscam/oscam_svn.bb | 4 |
2 files changed, 41 insertions, 1 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 | ||
diff --git a/meta-multimedia/recipes-dvb/oscam/oscam_svn.bb b/meta-multimedia/recipes-dvb/oscam/oscam_svn.bb index c4a4d99a4..cac517ff5 100644 --- a/meta-multimedia/recipes-dvb/oscam/oscam_svn.bb +++ b/meta-multimedia/recipes-dvb/oscam/oscam_svn.bb | |||
@@ -6,7 +6,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" | |||
6 | 6 | ||
7 | DEPENDS = "libusb1 openssl pcsc-lite" | 7 | DEPENDS = "libusb1 openssl pcsc-lite" |
8 | 8 | ||
9 | SRC_URI = "svn://www.streamboard.tv/svn/oscam;module=trunk;protocol=http" | 9 | SRC_URI = "svn://www.streamboard.tv/svn/oscam;module=trunk;protocol=http \ |
10 | file://respect-cflags.patch \ | ||
11 | " | ||
10 | SRCREV = "9164" | 12 | SRCREV = "9164" |
11 | PV = "1.10+${SRCPV}" | 13 | PV = "1.10+${SRCPV}" |
12 | 14 | ||