From patchwork Mon Sep 4 17:03:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aleksander Morgado X-Patchwork-Id: 809770 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=aleksander-es.20150623.gappssmtp.com header.i=@aleksander-es.20150623.gappssmtp.com header.b="cU5elQJ2"; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xmGQP64Y8z9t16 for ; Tue, 5 Sep 2017 03:03:41 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 3A813860D9; Mon, 4 Sep 2017 17:03:39 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id vPyKRL595VYW; Mon, 4 Sep 2017 17:03:38 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id F15128607B; Mon, 4 Sep 2017 17:03:37 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id A33A71C0674 for ; Mon, 4 Sep 2017 17:03:36 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 9C161861C9 for ; Mon, 4 Sep 2017 17:03:36 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id m227dQaC9YAN for ; Mon, 4 Sep 2017 17:03:33 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com [74.125.82.67]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 7973F861BE for ; Mon, 4 Sep 2017 17:03:33 +0000 (UTC) Received: by mail-wm0-f67.google.com with SMTP id r75so844319wmf.1 for ; Mon, 04 Sep 2017 10:03:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=aleksander-es.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=pLKNBu96JnkCbkfe50ZPQMf3flLFUfevZsbS42bfB0o=; b=cU5elQJ2VqRsvxG++zhP6D6nWq1ywPmvmsW9NysGg+ioj4F1Ywca/Qtr5ld6jM0xOV xsPnywfwM6hQhOpZDu0fC7ORjaepsV7Y44RMXIUycbFTLh5rPA8pAr3m+NbQMTPaMtQl uFwRXVuFTcuad5wUyNkjQQOJUH9w5gSfQUGUPgrOXjL2+tn9Li0yBpAJAJzUxUX30nO5 KuWIDnv+LubH7SgUe9IJdca+HwTa9XzNKDymz3GfCfqk7UKscPi6OAMRuz6dy8B0FtIk PUe+tMwbnZYoezlziC+r5mUT7AwrPas6e/AmggVwMoljngXae1+Nf801C8K6DStGB9ub i8jw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=pLKNBu96JnkCbkfe50ZPQMf3flLFUfevZsbS42bfB0o=; b=az5L5yQrUT6sNVGvbmKBv/URgxL5+VeFAQ/XEY7IWC7Q1Zg3lpa0Q49z0xLYxOADNg Az1heO5f4PdD29j2UMK7RfW5ZqPV4CpxTi/J8G+6yzRULkVv6R75UvxSajxa907f3YiK eWNMLFvr0GUV8ddaCUHXqBmX7+rstH+muGvSAWwtUWmEL59KvsuGaS4R3v+WIZHnclAF S0/FzDs8EVOB14QIJL1OkIyfsChcZzPMla+LfT9Z/5h8vIv4QnBxxxGp5Di7zrobrjTG SCXjeb65Sz7In6gNpnE45jhtJsV94Mtw4avy6TVJdEeY+byLH/LG0wAFPOzAD6NiXKv+ HaQA== X-Gm-Message-State: AHPjjUjbzXDEpypbU+n1Z9vfj77MzI1Ju9awX06UvZlridxed86MnU54 T8+O822ho/5Nooaak0syjw== X-Google-Smtp-Source: ADKCNb4lrslUd9LUsh1XmoE8cPjQtwrQ4e+R09GjAaITD6RnIEQi7WW1dtjEGHmAF/6b+AKBXMeqFw== X-Received: by 10.28.94.85 with SMTP id s82mr673297wmb.13.1504544611379; Mon, 04 Sep 2017 10:03:31 -0700 (PDT) Received: from localhost.localdomain (116.red-83-40-186.dynamicip.rima-tde.net. [83.40.186.116]) by smtp.gmail.com with ESMTPSA id w6sm6373593wra.25.2017.09.04.10.03.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Sep 2017 10:03:30 -0700 (PDT) From: Aleksander Morgado To: buildroot@buildroot.org Date: Mon, 4 Sep 2017 19:03:24 +0200 Message-Id: <20170904170324.5426-1-aleksander@aleksander.es> X-Mailer: git-send-email 2.13.1 Cc: thomas.petazzoni@free-electrons.com, Aleksander Morgado Subject: [Buildroot] [PATCH] libmbim: udev is optional X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Don't require udev/libgudev when building libmbim, just make it optional. If there is udev support in the setup, require libgudev and configure using --with-udev explicitly; otherwise just --without-udev. Signed-off-by: Aleksander Morgado --- package/libmbim/Config.in | 16 +++++++++++----- package/libmbim/libmbim.mk | 9 ++++++++- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/package/libmbim/Config.in b/package/libmbim/Config.in index 4f8059264..35fceca67 100644 --- a/package/libmbim/Config.in +++ b/package/libmbim/Config.in @@ -2,8 +2,6 @@ config BR2_PACKAGE_LIBMBIM bool "libmbim" depends on BR2_USE_WCHAR # libglib2 depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 - depends on BR2_PACKAGE_HAS_UDEV - select BR2_PACKAGE_LIBGUDEV select BR2_PACKAGE_LIBGLIB2 help libmbim is a glib-based library for talking to WWAN modems and @@ -12,6 +10,14 @@ config BR2_PACKAGE_LIBMBIM http://www.freedesktop.org/wiki/Software/libmbim/ -comment "libmbim needs udev /dev management and a toolchain w/ wchar, threads" - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_PACKAGE_HAS_UDEV +if BR2_PACKAGE_LIBMBIM +config BR2_PACKAGE_LIBMBIM_UDEV + bool "udev support" + depends on BR2_PACKAGE_HAS_UDEV + select BR2_PACKAGE_LIBGUDEV + help + This option enables udev support in libmbim +endif + +comment "libmbim needs a toolchain w/ wchar, threads" + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/libmbim/libmbim.mk b/package/libmbim/libmbim.mk index 33e500e53..03291a27f 100644 --- a/package/libmbim/libmbim.mk +++ b/package/libmbim/libmbim.mk @@ -11,9 +11,16 @@ LIBMBIM_LICENSE = LGPL-2.0+ (library), GPL-2.0+ (programs) LIBMBIM_LICENSE_FILES = COPYING LIBMBIM_INSTALL_STAGING = YES -LIBMBIM_DEPENDENCIES = libglib2 udev libgudev +LIBMBIM_DEPENDENCIES = libglib2 # we don't want -Werror LIBMBIM_CONF_OPTS = --enable-more-warnings=no +ifeq ($(BR2_PACKAGE_LIBMBIM_UDEV),y) +LIBMBIM_DEPENDENCIES += libgudev +LIBMBIM_CONF_OPTS += --with-udev +else +LIBMBIM_CONF_OPTS += --without-udev +endif + $(eval $(autotools-package))