Re: [PATCH][meta-oe][dizzy 1/4] oscam: respect *flags set from OE

[akuster808 <akuster808@gmail.com>]

all 4 merged to staging

- armin

On 10/16/2015 06:58 AM, Martin Jansa wrote:
> * 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>
> ---
>  .../recipes-dvb/oscam/oscam/respect-cflags.patch   | 38 ++++++++++++++++++++++
>  meta-multimedia/recipes-dvb/oscam/oscam_svn.bb     |  4 ++-
>  2 files changed, 41 insertions(+), 1 deletion(-)
>  create mode 100644 meta-multimedia/recipes-dvb/oscam/oscam/respect-cflags.patch
> 
> 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 0000000..179d04a
> --- /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
> diff --git a/meta-multimedia/recipes-dvb/oscam/oscam_svn.bb b/meta-multimedia/recipes-dvb/oscam/oscam_svn.bb
> index c4a4d99..cac517f 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"
>  
>  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}"
>  
>