From patchwork Sun Jun 3 16:35:37 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Martin X-Patchwork-Id: 162567 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id 2042EB6FC8 for ; Mon, 4 Jun 2012 02:36:18 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 39BCD32064; Sun, 3 Jun 2012 16:36:15 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id RifPAZL33DAJ; Sun, 3 Jun 2012 16:36:12 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id AB8FB30ECB; Sun, 3 Jun 2012 16:36:12 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id EE0658F753 for ; Sun, 3 Jun 2012 16:36:10 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id F101B8F8F6 for ; Sun, 3 Jun 2012 16:36:10 +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 lOvi+ZmKLYZH for ; Sun, 3 Jun 2012 16:36:09 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-ee0-f43.google.com (mail-ee0-f43.google.com [74.125.83.43]) by whitealder.osuosl.org (Postfix) with ESMTPS id 5A2108F8F1 for ; Sun, 3 Jun 2012 16:36:09 +0000 (UTC) Received: by eeke50 with SMTP id e50so1987800eek.16 for ; Sun, 03 Jun 2012 09:36:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=vAPwN7Q/Bj1CpWMvB+IVQwILOilFt2JSqztQxgaG7gE=; b=VMgZAl53WYqPCuHtPlq7HubtReZgPU0XBvzB7mEdMaYoK5dNSkx7dirIUaGmXLWqzx rR5meVqjgYxDXv/uSW344pSaqC+BRbtwqG25K3hxRjyUuBe4mPQOmmlE/oorz3zzF5xC kNzy833M6nHejsQGd/JzTCwIRFTr40xHKpnUZCqMXTypvXUibJt5TXz4OQHbJXKTEOEl FTkNzr9Bnc6Ag2MU2mAkq84aR5eu/fERM0//Y5r5vTYHQ2meOVYXL4GELHiHfBqcbm+C BJfWdwMLssOXjTzDDxWD+L6gTB0j2ztoG1bTYwxJbmpsTTnnhdeIaONCsajUkLdaqL/g siOw== Received: by 10.14.185.137 with SMTP id u9mr3961638eem.220.1338741367475; Sun, 03 Jun 2012 09:36:07 -0700 (PDT) Received: from smartin-de.aldebaran.lan ([87.240.75.74]) by mx.google.com with ESMTPS id s47sm27987760eef.4.2012.06.03.09.36.05 (version=SSLv3 cipher=OTHER); Sun, 03 Jun 2012 09:36:06 -0700 (PDT) From: Samuel Martin To: buildroot@busybox.net Date: Sun, 3 Jun 2012 18:35:37 +0200 Message-Id: <1338741337-12019-1-git-send-email-s.martin49@gmail.com> X-Mailer: git-send-email 1.7.10.3 Subject: [Buildroot] [PATCH 1/1] libnfc: make example build optional X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 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-bounces@busybox.net This patch converts libnfc to CMAKETARGET and makes example build optional. Fixes http://autobuild.buildroot.org/results/a963924b15e185d0144809a98feac52dec0d1cc3 Signed-off-by: Samuel Martin --- package/libnfc/Config.in | 5 +++++ package/libnfc/libnfc-make-examples-optional.patch | 22 ++++++++++++++++++++ package/libnfc/libnfc.mk | 16 ++++++++++++-- 3 files changed, 41 insertions(+), 2 deletions(-) create mode 100644 package/libnfc/libnfc-make-examples-optional.patch diff --git a/package/libnfc/Config.in b/package/libnfc/Config.in index 42418e0..3d67d58 100644 --- a/package/libnfc/Config.in +++ b/package/libnfc/Config.in @@ -6,3 +6,8 @@ config BR2_PACKAGE_LIBNFC Public platform independent Near Field Communication (NFC) library. http://www.libnfc.org/ + +config BR2_PACKAGE_LIBNFC_EXAMPLES + bool "build libnfc examples" + depends on BR2_PACKAGE_LIBNFC + select BR2_PACKAGE_READLINE diff --git a/package/libnfc/libnfc-make-examples-optional.patch b/package/libnfc/libnfc-make-examples-optional.patch new file mode 100644 index 0000000..da8bc3f --- /dev/null +++ b/package/libnfc/libnfc-make-examples-optional.patch @@ -0,0 +1,22 @@ +--- libnfc-1.5.1.orig/CMakeLists.txt 2012-06-03 17:57:20.308085744 +0200 ++++ libnfc-1.5.1/CMakeLists.txt 2012-06-03 18:13:37.502570332 +0200 +@@ -27,6 +27,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOUR + SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules/") + + # Options ++SET(BUILD_EXAMPLES OFF CACHE BOOL "Build examples") + SET(LIBNFC_DEBUG_OUTPUT OFF CACHE BOOL "Debug output of communication with the NFC chip") + IF(LIBNFC_DEBUG_OUTPUT) + ADD_DEFINITIONS(-DDEBUG -g3) +@@ -101,7 +102,10 @@ ENDIF(LIBUSB_INCLUDE_DIRS) + ADD_SUBDIRECTORY(libnfc) + ADD_SUBDIRECTORY(include) + ADD_SUBDIRECTORY(utils) +-ADD_SUBDIRECTORY(examples) ++ ++IF(BUILD_EXAMPLES) ++ ADD_SUBDIRECTORY(examples) ++ENDIF(BUILD_EXAMPLES) + + # Binary Package + IF(WIN32) diff --git a/package/libnfc/libnfc.mk b/package/libnfc/libnfc.mk index f1028b1..54cc5f9 100644 --- a/package/libnfc/libnfc.mk +++ b/package/libnfc/libnfc.mk @@ -11,6 +11,18 @@ LIBNFC_INSTALL_STAGING = YES LIBNFC_DEPENDENCIES = host-pkg-config libusb libusb-compat # N.B. The acr122 driver requires pcsc-lite. -LIBNFC_CONF_OPT = --with-drivers=arygon,pn53x_usb +LIBNFC_CONF_OPT += \ + -DLIBNFC_DRIVER_ACR122=OFF \ + -DLIBNFC_DRIVER_ARYGON=ON \ + -DLIBNFC_DRIVER_PN532_UART=OFF \ + -DLIBNFC_DRIVER_PN532_USB=ON \ + -DLIBNFC_SERIAL_AUTOPROBE_ENABLED=OFF -$(eval $(call AUTOTARGETS)) +ifeq ($(BR2_PACKAGE_LIBNFC_EXAMPLES),y) +LIBNFC_CONF_OPT += -DBUILD_EXAMPLES=ON +LIBNFC_DEPENDENCIES += readline +else +LIBNFC_CONF_OPT += -DBUILD_EXAMPLES=OFF +endif + +$(eval $(call CMAKETARGETS))