* [PATCH][meta-oe][dizzy 1/4] oscam: respect *flags set from OE
@ 2015-10-16 13:58 Martin Jansa
2015-10-16 13:58 ` [PATCH][meta-oe][dizzy 2/4] gupnp-igd: fix missing dependencies Martin Jansa
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Martin Jansa @ 2015-10-16 13:58 UTC (permalink / raw)
To: openembedded-devel
* 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}"
--
2.6.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH][meta-oe][dizzy 2/4] gupnp-igd: fix missing dependencies
2015-10-16 13:58 [PATCH][meta-oe][dizzy 1/4] oscam: respect *flags set from OE Martin Jansa
@ 2015-10-16 13:58 ` Martin Jansa
2015-10-16 13:58 ` [PATCH][meta-oe][dizzy 3/4] tcpdump: add PACKAGECONFIG for smi Martin Jansa
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Martin Jansa @ 2015-10-16 13:58 UTC (permalink / raw)
To: openembedded-devel
* add gobject-introspection-stub-native to fix:
| doc/Makefile.am:70: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS')
| libgupnp-igd/Makefile.am:65: error: HAVE_INTROSPECTION does not appear in AM_CONDITIONAL
* add sqlite3 to fix:
WARNING: QA Issue: gupnp-igd rdepends on libsqlite3, but it isn't a build dependency? [build-deps]
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta-multimedia/recipes-connectivity/gupnp/gupnp-igd_0.2.2.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-multimedia/recipes-connectivity/gupnp/gupnp-igd_0.2.2.bb b/meta-multimedia/recipes-connectivity/gupnp/gupnp-igd_0.2.2.bb
index 112bc4b..667f7ef 100644
--- a/meta-multimedia/recipes-connectivity/gupnp/gupnp-igd_0.2.2.bb
+++ b/meta-multimedia/recipes-connectivity/gupnp/gupnp-igd_0.2.2.bb
@@ -3,7 +3,7 @@ LICENSE = "LGPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
file://libgupnp-igd/gupnp-simple-igd.c;beginline=1;endline=21;md5=aa292c0d9390463a6e1055dc5fc68e80"
-DEPENDS = "glib-2.0 gupnp"
+DEPENDS = "glib-2.0 gupnp gobject-introspection-stub-native sqlite3"
SRC_URI = "http://download.gnome.org/sources/${BPN}/0.2/${BPN}-${PV}.tar.xz"
SRC_URI[md5sum] = "f881323304185c02634034e3bda714ba"
--
2.6.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH][meta-oe][dizzy 3/4] tcpdump: add PACKAGECONFIG for smi
2015-10-16 13:58 [PATCH][meta-oe][dizzy 1/4] oscam: respect *flags set from OE Martin Jansa
2015-10-16 13:58 ` [PATCH][meta-oe][dizzy 2/4] gupnp-igd: fix missing dependencies Martin Jansa
@ 2015-10-16 13:58 ` Martin Jansa
2015-10-16 13:58 ` [PATCH][meta-oe][dizzy 4/4] geoclue: add PACKAGECONFIG for geoip Martin Jansa
2015-10-16 19:07 ` [PATCH][meta-oe][dizzy 1/4] oscam: respect *flags set from OE akuster808
3 siblings, 0 replies; 5+ messages in thread
From: Martin Jansa @ 2015-10-16 13:58 UTC (permalink / raw)
To: openembedded-devel
* libsmi is autodetected in configure, but in most cases disabled because of
cross-compilation so keep it explicitly disabled
* resolves following difference in builds with and without libsmi built
before tcpdump:
4.7.4-r0-with/temp/log.do_configure:checking smi.h usability... yes
4.7.4-r0-with/temp/log.do_configure:checking smi.h presence... yes
4.7.4-r0-with/temp/log.do_configure:checking for smi.h... yes
4.7.4-r0-with/temp/log.do_configure:checking for smiInit in -lsmi... yes
4.7.4-r0-with/temp/log.do_configure:checking whether to enable libsmi... not when cross-compiling
4.7.4-r0-without/temp/log.do_configure:checking smi.h usability... no
4.7.4-r0-without/temp/log.do_configure:checking smi.h presence... no
4.7.4-r0-without/temp/log.do_configure:checking for smi.h... no
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta-networking/recipes-support/tcpdump/tcpdump_4.6.1.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta-networking/recipes-support/tcpdump/tcpdump_4.6.1.bb b/meta-networking/recipes-support/tcpdump/tcpdump_4.6.1.bb
index 1fdaf30..1919b87 100644
--- a/meta-networking/recipes-support/tcpdump/tcpdump_4.6.1.bb
+++ b/meta-networking/recipes-support/tcpdump/tcpdump_4.6.1.bb
@@ -24,6 +24,7 @@ CACHED_CONFIGUREVARS = "ac_cv_linux_vers=${ac_cv_linux_vers=2}"
PACKAGECONFIG ??= "openssl ipv6"
PACKAGECONFIG[openssl] = "--with-crypto=yes, --without-openssl --without-crypto, openssl"
PACKAGECONFIG[ipv6] = "--enable-ipv6, --disable-ipv6,"
+PACKAGECONFIG[smi] = "--with-smi, --without-smi,libsmi"
EXTRA_AUTORECONF += " -I m4"
--
2.6.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH][meta-oe][dizzy 4/4] geoclue: add PACKAGECONFIG for geoip
2015-10-16 13:58 [PATCH][meta-oe][dizzy 1/4] oscam: respect *flags set from OE Martin Jansa
2015-10-16 13:58 ` [PATCH][meta-oe][dizzy 2/4] gupnp-igd: fix missing dependencies Martin Jansa
2015-10-16 13:58 ` [PATCH][meta-oe][dizzy 3/4] tcpdump: add PACKAGECONFIG for smi Martin Jansa
@ 2015-10-16 13:58 ` Martin Jansa
2015-10-16 19:07 ` [PATCH][meta-oe][dizzy 1/4] oscam: respect *flags set from OE akuster808
3 siblings, 0 replies; 5+ messages in thread
From: Martin Jansa @ 2015-10-16 13:58 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta-oe/recipes-navigation/geoclue/geoclue_2.0.0.bb | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta-oe/recipes-navigation/geoclue/geoclue_2.0.0.bb b/meta-oe/recipes-navigation/geoclue/geoclue_2.0.0.bb
index a0305fb..5e3d04e 100644
--- a/meta-oe/recipes-navigation/geoclue/geoclue_2.0.0.bb
+++ b/meta-oe/recipes-navigation/geoclue/geoclue_2.0.0.bb
@@ -20,6 +20,8 @@ SRC_URI = " \
SRC_URI[md5sum] = "401ff99d530b177c62afacef0a33efd9"
SRC_URI[sha256sum] = "4a82f184e55a163d86e0ad69bbe1bba9960bb5094220fe1f01350bceda8c67a1"
+PACKAGECONFIG[geoip] = "--enable-geoip-server,--disable-geoip-server,geoip"
+
EXTRA_OECONF += " \
--with-dbus-service-user=root \
--with-dbus-sys-dir=${sysconfdir}/dbus-1/system.d \
--
2.6.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH][meta-oe][dizzy 1/4] oscam: respect *flags set from OE
2015-10-16 13:58 [PATCH][meta-oe][dizzy 1/4] oscam: respect *flags set from OE Martin Jansa
` (2 preceding siblings ...)
2015-10-16 13:58 ` [PATCH][meta-oe][dizzy 4/4] geoclue: add PACKAGECONFIG for geoip Martin Jansa
@ 2015-10-16 19:07 ` akuster808
3 siblings, 0 replies; 5+ messages in thread
From: akuster808 @ 2015-10-16 19:07 UTC (permalink / raw)
To: openembedded-devel
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}"
>
>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2015-10-16 19:07 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-10-16 13:58 [PATCH][meta-oe][dizzy 1/4] oscam: respect *flags set from OE Martin Jansa
2015-10-16 13:58 ` [PATCH][meta-oe][dizzy 2/4] gupnp-igd: fix missing dependencies Martin Jansa
2015-10-16 13:58 ` [PATCH][meta-oe][dizzy 3/4] tcpdump: add PACKAGECONFIG for smi Martin Jansa
2015-10-16 13:58 ` [PATCH][meta-oe][dizzy 4/4] geoclue: add PACKAGECONFIG for geoip Martin Jansa
2015-10-16 19:07 ` [PATCH][meta-oe][dizzy 1/4] oscam: respect *flags set from OE akuster808
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox