oscam: respect *flags set from OE
PATCH 1/4 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
--- .../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
meta-multimedia/recipes-dvb/oscam/oscam/respect-cflags.patch new file +38 -0
@@ -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
meta-multimedia/recipes-dvb/oscam/oscam_svn.bb +3 -1
@@ -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}"
Signature · 1 line
2.6.1
PATCH 2/4 gupnp-igd: fix missing dependencies
* 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]
--- meta-multimedia/recipes-connectivity/gupnp/gupnp-igd_0.2.2.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-multimedia/recipes-connectivity/gupnp/gupnp-igd_0.2.2.bb +1 -1
@@ -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"
Signature · 1 line
2.6.1
PATCH 3/4 tcpdump: add PACKAGECONFIG for smi
In reply to Martin Jansa* 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
--- meta-networking/recipes-support/tcpdump/tcpdump_4.6.1.bb | 1 + 1 file changed, 1 insertion(+)
meta-networking/recipes-support/tcpdump/tcpdump_4.6.1.bb +1 -0
@@ -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"
Signature · 1 line
2.6.1
PATCH 4/4 geoclue: add PACKAGECONFIG for geoip
In reply to Martin Jansa--- meta-oe/recipes-navigation/geoclue/geoclue_2.0.0.bb | 2 ++ 1 file changed, 2 insertions(+)
meta-oe/recipes-navigation/geoclue/geoclue_2.0.0.bb +2 -0
@@ -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 \
Signature · 1 line
2.6.1
all 4 merged to staging
- armin
Quoted 71 lines · Martin Jansa
* 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 OESigned-off-by Martin Jansa <[email protected]>--- .../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.patchmeta-multimedia/recipes-dvb/oscam/oscam/respect-cflags.patch new file +38
-0@@ -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 situationsmeta-multimedia/recipes-dvb/oscam/oscam_svn.bb +3
-1@@ -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}"