From patchwork Sun Dec 23 19:57:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Corbin X-Patchwork-Id: 1018078 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=embecosm.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=embecosm.com header.i=@embecosm.com header.b="Dh/x/L/a"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43NCpb5q8Gz9sDT for ; Mon, 24 Dec 2018 06:58:15 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 3959C2206D; Sun, 23 Dec 2018 19:58:13 +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 dYG20iqGX9JC; Sun, 23 Dec 2018 19:58:12 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 84CFD22001; Sun, 23 Dec 2018 19:58:12 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id D4CE91BF3A7 for ; Sun, 23 Dec 2018 19:58:10 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id D1CEE82398 for ; Sun, 23 Dec 2018 19:58: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 5XsM43ryXmBn for ; Sun, 23 Dec 2018 19:58:10 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by whitealder.osuosl.org (Postfix) with ESMTPS id CE54482383 for ; Sun, 23 Dec 2018 19:58:09 +0000 (UTC) Received: by mail-wr1-f66.google.com with SMTP id u4so10024723wrp.3 for ; Sun, 23 Dec 2018 11:58:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=pboJTmH626fxsC8lUseObVI+OKbApeFP+Vykd6wPkIg=; b=Dh/x/L/azfTHT9ej0Jy8ySFDz6zzRBeY50jqwcCpWd7z7XIrt7ZmgM1InXge+UAQZC WEJV+OsH3PTd5ZEloBODWBR6n26B+cMh3wLgX4SclzJg0OxxIzYreOsJuCc5sPYHw85Q PwCSoD/Y7VYDLTXn999IvU0Y8LZl2ocvPBwa29lDZGAMhGl2Zp9RQWb91S8X5HIva1i2 vSAXVdulX4xQUbxU/XKb/EaHDkJZdHLWy7ha6ZMzJc4ZR3W2oa+R+507c8SH04ivzv2O B+9qNjGfkzvsFhOIs8xJBdvCNMVXIE+Q5PPwthS8RXIJg3uYLzAYBw3M7XuQYM+y84dx jR7w== 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:mime-version :content-transfer-encoding; bh=pboJTmH626fxsC8lUseObVI+OKbApeFP+Vykd6wPkIg=; b=luo6Yb6MO8I1A9qZROAZRvUBHydSWzIwYijDc8EUP3BErAgj4eBWl/EbgKEOUDfVeJ ozNBGNGG2rYx/y0cA2QIwmVAqeDnlkp66HxQ5UrfZO8EAl95KyWdoyBL1Mfd6Zz1lj31 u3OeiSQ30Q8CXNdhCWz6nkmptjAlk3FX61ZAo4T6g3NwXnXsekCSPhsVoRSD/3flZ4oN vFbXZWiS0onUsFcfGmpOOMRS3vz5xjA+8NB0l55mF+7EjxcE1OMxYqHx2X3Chs09cEzP 1872hxUmpTJ2F0qI7oJL299Y10fbkZfzIPQ25n1M9bCITbc3fLhW+Zv3LoYIoUdzULjA 5z5w== X-Gm-Message-State: AJcUukfScvPepTwEp1BdFXOtK8LygZ0IombtzLI4kV37jVz3LvmhPHqB lBgcfxi8Q/GMrvoTlHXsoFWPMNdnHtpH/A== X-Google-Smtp-Source: ALg8bN5+Yog8Xoyyk+9A3sU550tpidf7T75KPc+b7H1xqX7+YwhlbQe0tamzRxiK582JsWWxfc+rZw== X-Received: by 2002:a5d:6889:: with SMTP id h9mr9514659wru.222.1545595087835; Sun, 23 Dec 2018 11:58:07 -0800 (PST) Received: from godzilla.lym.embecosm-corp.com (cust64-dsl91-135-5.idnet.net. [91.135.5.64]) by smtp.gmail.com with ESMTPSA id y34sm51501575wrd.68.2018.12.23.11.58.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 23 Dec 2018 11:58:07 -0800 (PST) From: Mark Corbin To: buildroot@buildroot.org Date: Sun, 23 Dec 2018 19:57:14 +0000 Message-Id: <20181223195714.17155-1-mark.corbin@embecosm.com> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/libftdi1: fix swig build error when using cmake 3.12 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Corbin , Daniel Sangue Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" The build fails with 'Unable to find' swig.swg and python.swg when using cmake version 3.12. This commit adds a patch from upstream libftdi. Fixes: http://autobuild.buildroot.net/results/cc54fec0cd6e35e99dde2f43e0eb28b9d628cd19 Signed-off-by: Mark Corbin Reviewed-by: "Yann E. MORIN" --- package/libftdi1/0004-cmake-find-swig.patch | 26 +++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 package/libftdi1/0004-cmake-find-swig.patch diff --git a/package/libftdi1/0004-cmake-find-swig.patch b/package/libftdi1/0004-cmake-find-swig.patch new file mode 100644 index 0000000000..25922cca53 --- /dev/null +++ b/package/libftdi1/0004-cmake-find-swig.patch @@ -0,0 +1,26 @@ +From fcda9c6a208d3a7fe651ef661b2eb6e462a89c17 Mon Sep 17 00:00:00 2001 +From: Eneas U de Queiroz +Date: Tue, 31 Jul 2018 17:44:57 -0300 +Subject: [PATCH] CMake: use find_package (SWIG) for cmake >= 3.0.0 + +There's a workaround for a bug (fixed in cmake 3.0.0) that does not +work in CMake 3.12. Only use the workaround with cmake < 3.0.0. + +Signed-off-by: Eneas U de Queiroz +[Mark: patch retrieved and updated from +http://developer.intra2net.com/git/?p=libftdi;a=commit;h=fcda9c6a208d3a7fe651ef661b2eb6e462a89c17] +Signed-off-by: Mark Corbin +--- +diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt +index 31ef1c6..eefc344 100644 +--- a/python/CMakeLists.txt ++++ b/python/CMakeLists.txt +@@ -3,7 +3,7 @@ option ( LINK_PYTHON_LIBRARY "Link against python libraries" ON ) + + if ( PYTHON_BINDINGS ) + # workaround for cmake bug #0013449 +- if ( NOT DEFINED CMAKE_FIND_ROOT_PATH ) ++ if ( NOT DEFINED CMAKE_FIND_ROOT_PATH OR CMAKE_VERSION VERSION_GREATER_EQUAL 3.0.0 ) + find_package ( SWIG ) + else () + find_program ( SWIG_EXECUTABLE NAMES swig2.0 swig )