diff options
Diffstat (limited to 'external/meta-openembedded/meta-oe/recipes-connectivity/libqmi')
| -rw-r--r-- | external/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi/0001-Detect-clang.patch | 85 | ||||
| -rw-r--r-- | external/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi/0001-qmi-network-Don-t-create-invalid-wds-start-network-w.patch | 41 | ||||
| -rw-r--r-- | external/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi_1.24.12.bb (renamed from external/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi_1.20.2.bb) | 9 |
3 files changed, 5 insertions, 130 deletions
diff --git a/external/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi/0001-Detect-clang.patch b/external/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi/0001-Detect-clang.patch deleted file mode 100644 index 7a3429b9..00000000 --- a/external/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi/0001-Detect-clang.patch +++ /dev/null @@ -1,85 +0,0 @@ -From 4cfb728804157e8f3c69e11ba4df449d8f76388f Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 20 Oct 2016 04:42:26 +0000 -Subject: [PATCH] Detect clang - -Check for clang compiler since we need to disable -unused-function warning for clang, at same time -pass werror when checking for compiler options if -werror is enabled so spurious options do not get -enabled. Only the ones that are supported by given -compiler are accepted. - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Upstream-Status: Pending - ---- - m4/compiler-warnings.m4 | 29 +++++++++++++++++++++++++---- - 1 file changed, 25 insertions(+), 4 deletions(-) - -diff --git a/m4/compiler-warnings.m4 b/m4/compiler-warnings.m4 -index de4a8b0..e4ba718 100644 ---- a/m4/compiler-warnings.m4 -+++ b/m4/compiler-warnings.m4 -@@ -2,10 +2,30 @@ AC_DEFUN([LIBQMI_COMPILER_WARNINGS], - [AC_ARG_ENABLE(more-warnings, - AS_HELP_STRING([--enable-more-warnings], [Possible values: no/yes/error]), - set_more_warnings="$enableval",set_more_warnings=error) -+ -+# Clang throws a lot of warnings when it does not understand a flag. Disable -+# this warning for now so other warnings are visible. -+AC_MSG_CHECKING([if compiling with clang]) -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [[ -+#ifndef __clang__ -+ not clang -+#endif -+ ]])], -+ [CLANG=yes], -+ [CLANG=no] -+) -+AC_MSG_RESULT([$CLANG]) -+AS_IF([test "x$CLANG" = "xyes"], [CLANG_FLAGS=-Wno-error=unused-function]) -+CFLAGS="$CFLAGS $CLANG_FLAGS" -+LDFLAGS="$LDFLAGS $CLANG_FLAGS" -+ - AC_MSG_CHECKING(for more warnings) - if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then - AC_MSG_RESULT(yes) - CFLAGS="-Wall -std=gnu89 $CFLAGS" -+ if test "x$set_more_warnings" = xerror; then -+ WERROR="-Werror" -+ fi - - for option in -Wmissing-declarations -Wmissing-prototypes \ - -Wdeclaration-after-statement -Wstrict-prototypes \ -@@ -17,22 +37,23 @@ if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then - -Wmissing-include-dirs -Waggregate-return \ - -Wformat-security -Wtype-limits; do - SAVE_CFLAGS="$CFLAGS" -- CFLAGS="$CFLAGS $option" -+ CFLAGS="$CFLAGS $option $WERROR" - AC_MSG_CHECKING([whether gcc understands $option]) - AC_TRY_COMPILE([], [], - has_option=yes, - has_option=no,) - if test $has_option = no; then - CFLAGS="$SAVE_CFLAGS" -+ else -+ CFLAGS="$SAVE_CFLAGS $option" - fi - AC_MSG_RESULT($has_option) - unset has_option - unset SAVE_CFLAGS - done -+ CFLAGS="$CFLAGS $WERROR" - unset option -- if test "x$set_more_warnings" = xerror; then -- CFLAGS="$CFLAGS -Werror" -- fi -+ unset WERROR - else - AC_MSG_RESULT(no) - fi --- -1.9.1 - diff --git a/external/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi/0001-qmi-network-Don-t-create-invalid-wds-start-network-w.patch b/external/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi/0001-qmi-network-Don-t-create-invalid-wds-start-network-w.patch deleted file mode 100644 index d230d680..00000000 --- a/external/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi/0001-qmi-network-Don-t-create-invalid-wds-start-network-w.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 8269f4d86927fbe19e78776a12736680fe9169b6 Mon Sep 17 00:00:00 2001 -From: Adrian Bunk <bunk@stusta.de> -Date: Mon, 1 Oct 2018 16:53:31 +0300 -Subject: [PATCH] qmi-network: Don't create invalid --wds-start-network when - APN is not set - -In 1.20.2 the warning for this was turned into an error. - -(cherry picked from commit 289d8ad6419895e2e1fba3d78a54a0db65da521d) ---- -Upstream-Status: Backport - - utils/qmi-network.in | 12 +++++++----- - 1 file changed, 7 insertions(+), 5 deletions(-) - -diff --git a/utils/qmi-network.in b/utils/qmi-network.in -index bf7bed9..a9e5299 100755 ---- a/utils/qmi-network.in -+++ b/utils/qmi-network.in -@@ -334,11 +334,13 @@ start_network () - - setup_data_format - -- START_NETWORK_ARGS="apn='$APN'" -- if [ -n "$APN_USER" ]; then -- START_NETWORK_ARGS="${START_NETWORK_ARGS},username='$APN_USER'" -- if [ -n "$APN_PASS" ]; then -- START_NETWORK_ARGS="${START_NETWORK_ARGS},password='$APN_PASS'" -+ if [ -n "$APN" ]; then -+ START_NETWORK_ARGS="apn='$APN'" -+ if [ -n "$APN_USER" ]; then -+ START_NETWORK_ARGS="${START_NETWORK_ARGS},username='$APN_USER'" -+ if [ -n "$APN_PASS" ]; then -+ START_NETWORK_ARGS="${START_NETWORK_ARGS},password='$APN_PASS'" -+ fi - fi - fi - --- -2.7.4 - diff --git a/external/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi_1.20.2.bb b/external/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi_1.24.12.bb index f0bc81cc..6f863854 100644 --- a/external/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi_1.20.2.bb +++ b/external/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi_1.24.12.bb @@ -12,12 +12,13 @@ DEPENDS = "glib-2.0 glib-2.0-native" inherit autotools pkgconfig bash-completion SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BPN}-${PV}.tar.xz \ - file://0001-qmi-network-Don-t-create-invalid-wds-start-network-w.patch \ - file://0001-Detect-clang.patch \ " -SRC_URI[md5sum] = "584214476ab75c394160cb85fbccaa1d" -SRC_URI[sha256sum] = "c73459ca8bfe1213f8047858d4946fc1f58e164d4f488a7a6904edee25e2ca44" + +SRC_URI[md5sum] = "7e6e49fddb9ae2b6fcde14619d6cfe49" +SRC_URI[sha256sum] = "2d3b91a2b8a882b17b16403c9ef7bdce522db4f0ceaa3e4dff76033885428b69" PACKAGECONFIG ??= "udev mbim" PACKAGECONFIG[udev] = ",--without-udev,libgudev" PACKAGECONFIG[mbim] = "--enable-mbim-qmux,--disable-mbim-qmux,libmbim" + +EXTRA_OECONF_append_toolchain-clang = " --enable-more-warnings=no" |