From patchwork Sat Jan 12 09:41:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Seiderer X-Patchwork-Id: 1023856 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.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gmx.net Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43cFBW3qRbz9s55 for ; Sat, 12 Jan 2019 20:42:11 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 05E0F860A2; Sat, 12 Jan 2019 09:42:09 +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 62ldwUM9l2Pa; Sat, 12 Jan 2019 09:42:07 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 9B5C585722; Sat, 12 Jan 2019 09:42:07 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 8080F1BF2CE for ; Sat, 12 Jan 2019 09:42:06 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 7E06722816 for ; Sat, 12 Jan 2019 09:42:06 +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 cCYzdKKIJOlf for ; Sat, 12 Jan 2019 09:42:03 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mout.gmx.net (mout.gmx.net [212.227.15.18]) by silver.osuosl.org (Postfix) with ESMTPS id 895EA2154B for ; Sat, 12 Jan 2019 09:42:02 +0000 (UTC) Received: from localhost.localdomain ([188.110.60.75]) by mail.gmx.com (mrgmx002 [212.227.17.190]) with ESMTPSA (Nemesis) id 0MBnvD-1gan0U2A4N-00AkVu; Sat, 12 Jan 2019 10:41:57 +0100 From: Peter Seiderer To: buildroot@buildroot.org Date: Sat, 12 Jan 2019 10:41:53 +0100 Message-Id: <20190112094153.9168-1-ps.report@gmx.net> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-Provags-ID: V03:K1:Kt7Wzi7wsjFzr3DfJELGtaElBaiFp8qBfxBjV+t3+GjKy8FI2ZK PuMn6+HPWWgZwoSAznp+lS6jNTEuZoxvrwLG1a2wbfWQ4iUkRoO6I9YNKZ7Day/1CpW3r8M NKHofJDQfN5GwZwYoaoJyOG/CW8YeQgIrvPe3VKeIy5QdqJBcLHJR+hSIAHHT80b0bsHCKt DUIfMvzGVJwHSiIOHReBg== X-UI-Out-Filterresults: notjunk:1; V03:K0:PLxpv1q1v2c=:UED74/nQk/M7IjxkYfgK3c jCE7wDKOFj2TXIFIdWnt74AXpwGHFtmth8I5Neo5Nb1QoieFVIvifMUlhO4SS3Wy0PJCwFKNl jc8Ecf+d9vkfZrkF/ydEPUP4TqVUREkxUZFc36CMYMy25tWg98Bi6MMs91946uYMgykn/fhGF FhVsGKT3MWQ4yfZ2FRWO1IgUZo48dOuGkUFlk2qsBmgLazx+RIoKH/LLx0ZUNAXF4bRYUhjJQ GVs1JZ0avpMumtITLWzSCb6NFPPmjvXkVtsJNP2kJmMb4yKF6J/kCyHEx4B0piVNsJgIEz6Ha +s8GM6ovqAhbfBhSQmcUnRu/nI0xiqe02rSAKE9OSO5+R8H3fVKfQ6NXGyhMJd8GtqzpBNmy2 ayGcbfqHmOKRFiMGzPLzI25i/bMzexP7IA7behEmAanuGhg+xgSA8Z9RMt5YrGqR1ZQzvNQpT EBr2ev5wTS6XW+9DMtM+X7CZOGXdyCAq2sUWyn7EopAf5we8sb2LVr4inpU0KP0flLTjPhijk AAANztQ5Nzuww9SgljdSStRP4nTq/zEpTuCd+XM2CLHiwwutI6S9JwCXX37QXquoT3+U2LQHl xapG/zYwna5dvgGJFRRH1p1QCB+HTTBMsqrWztaUo4VfXingyJ/+lpeZZQAzObrBeuAoDyV6h ygtK9eQln/dPd54iuJrZvG2mRWrmv8y63Qxhn+pVpS0O5nUL4DK3y+Fa5YwrgdgDFkvAjk77b Q5r2wC59ke0Ki8XUMQUO1q2GvWulQU/hVWzcYsV61huKRcVDrwT+Skstncu1GsbJuCTsMRvaH o0h5FNrgjeLfCzIOuIscrMVulFeZfxiZqVc2soSc+cyxieM3UE28lmGiDp8TDn+qmuxQEOcTy 7T2fwlilpy752h3Ju/CgHZ/LHutxDDKqW3zyrB5ck= Subject: [Buildroot] [PATCH v2] libinput: drop C++ dependency 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: "Yann E . MORIN" Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" The meson C++ dependency is only used for a build-time header inclusion test, add patch dropping hard meson C++ dependency and build the header inclusion test only in case C++ compiler is available. Fixes [1]: The Meson build system Version: 0.49.0 Source dir: .../build/libinput-1.12.5 Build dir: .../build/libinput-1.12.5/build Build type: cross build Project name: libinput Project version: 1.12.5 Native C compiler: cc (gcc 4.8.4 "cc (Ubuntu 4.8.4-2ubuntu1~14.04.4) 4.8.4") Cross C compiler: .../host/bin/riscv64-buildroot-linux-gnu-gcc (gcc 7.4.0) meson.build:1:0: ERROR: Unknown compiler(s): [['.../host/bin/riscv64-buildroot-linux-gnu-g++']] The follow exceptions were encountered: Running ".../host/bin/riscv64-buildroot-linux-gnu-g++ --version" gave "[Errno 2] No such file or directory: '.../host/bin/riscv64-buildroot-linux-gnu-g++': '.../host/bin/riscv64-buildroot-linux-gnu-g++'" [1] http://autobuild.buildroot.net/results/bf4d3d360f635c3524a52b84a72d558770596ed0 Signed-off-by: Peter Seiderer --- Changes v1 -> v2: - change patch to disable c++ header inclusion teste only in case no c++ compiler is available (suggested by Yann E. MORIN) --- ...le-CPP-include-check-only-in-case-CP.patch | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 package/libinput/0001-meson.build-enable-CPP-include-check-only-in-case-CP.patch diff --git a/package/libinput/0001-meson.build-enable-CPP-include-check-only-in-case-CP.patch b/package/libinput/0001-meson.build-enable-CPP-include-check-only-in-case-CP.patch new file mode 100644 index 0000000000..c9a0652e40 --- /dev/null +++ b/package/libinput/0001-meson.build-enable-CPP-include-check-only-in-case-CP.patch @@ -0,0 +1,49 @@ +From 57383dc900e76e65ce5e5dc95f776e086100344d Mon Sep 17 00:00:00 2001 +From: Peter Seiderer +Date: Sat, 12 Jan 2019 10:22:38 +0100 +Subject: [PATCH] meson.build: enable CPP include check only in case CPP + compiler is available + +Drop hard meson C++/CPP dependency, only needed for the build-time +header inclusion test, build the test only in case C++/CPP compiler +is available. + +Signed-off-by: Peter Seiderer +--- + meson.build | 16 +++++++++------- + 1 file changed, 9 insertions(+), 7 deletions(-) + +diff --git a/meson.build b/meson.build +index a9c7c185..8183822e 100644 +--- a/meson.build ++++ b/meson.build +@@ -1,4 +1,4 @@ +-project('libinput', 'c', 'cpp', ++project('libinput', 'c', + version : '1.12.5', + license : 'MIT/Expat', + default_options : [ 'c_std=gnu99', 'warning_level=2' ], +@@ -641,12 +641,14 @@ executable('test-build-linker', + include_directories : [includes_src, includes_include], + dependencies : [ dep_libinput, dep_libinput_util ], + install : false) +-# test including from C++ +-executable('test-build-cxx', +- 'test/build-cxx.cc', +- dependencies : [dep_udev], +- include_directories : [includes_src, includes_include], +- install : false) ++# test including from C++ (in case CPP compiler is available) ++if add_languages('cpp', required: false) ++ executable('test-build-cxx', ++ 'test/build-cxx.cc', ++ dependencies : [dep_udev], ++ include_directories : [includes_src, includes_include], ++ install : false) ++endif + + # This is the test suite runner, we allow disabling that one because of + # dependencies +-- +2.20.1 +