From patchwork Sat Dec 21 00:06:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 182325 Delivered-To: patch@linaro.org Received: by 2002:a92:1f98:0:0:0:0:0 with SMTP id f24csp1202075ilf; Fri, 20 Dec 2019 16:07:48 -0800 (PST) X-Google-Smtp-Source: APXvYqwrJRxz9B4IFzUDU8xTxkBDwSPwdkD9NueXym4LRrlxrzliTjidhmBQR6JmCwzOAuspeKCr X-Received: by 2002:a62:1613:: with SMTP id 19mr19724402pfw.7.1576886868838; Fri, 20 Dec 2019 16:07:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576886868; cv=none; d=google.com; s=arc-20160816; b=VZJ9tUhh5G4XkL+PXONUORM/TLE+zNEBg3Lpjz0pJB5fzuxsqZPahN38UrhojrtOVw fs9YMxD4vloMM6axbTOq4CCrBYo0MHjI6DF8fomV93hLPHgABwnr/OahhGoBcCwrHx5G Zk1EGn1LO3/NxtlF/1LACWJuDEFmfCuzVWhMSD43Bxzz3mK4IVlisHc/HypA0aiOb6tH EgY7VRo0J0V2t1aTVirl+IqOkZS+sreGv/lrKwJCZrprE8mZGefueQSbMjvkFWX/5G3g dBnpuO0w90DY8+o7nPgC0ceOY7ijyIUaWI9LAcw8MQKoIdfN2VSkqn4hewgedEjc3PD/ /GpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:delivered-to; bh=d2bau0cX6EAz2PsfX9UsZeO37Samv7TZcPLdicv3fN4=; b=E32DZVPGVQKNwTVz+9lMg2i0DNttn6AkRc/RH6NvEkG8i5dndDAA/KKQvf1Yjr16FA np9xanCpzbpVd1N73i2eRYcYd9r3W+Zi59Yvk5OJG+YnLxr3BapHtTf5lb8OZfh2H5il 0uK4Y+wWPSH+ultwNWXp1j+NwUefWvNMGZ3g+zcM7pu09w977+2GBvWh0FS8CDvSbube g5itAo67CQlHPHrN5lwUpisfeRnpLyP9EmM2BTyp35KO98wUT10DW83olDP1a4k0KPUZ NKmkFWYnhQq2PCIq3qECl4qu+d9K2o25QBVhYybYoi6Op7Jnm8Qsewx4gEqDJQg7l2Ov l+OA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=g8sm1azE; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id h97si9776438pjb.11.2019.12.20.16.07.47; Fri, 20 Dec 2019 16:07:47 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=g8sm1azE; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id E0DDB7FD03; Sat, 21 Dec 2019 00:07:40 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) by mail.openembedded.org (Postfix) with ESMTP id 530FB7FC14 for ; Sat, 21 Dec 2019 00:06:47 +0000 (UTC) Received: by mail-pl1-f173.google.com with SMTP id c13so4790867pls.0 for ; Fri, 20 Dec 2019 16:06:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=fjP2Dwg2+rbDMgD2e6n/M6afHQI68v/jFSNHQnKhGHQ=; b=g8sm1azE0N7JNbonpqlQU2e+gUZEM8xvvrZLZsk18CT/CAT8wlpCGekV0uVEZGmfL3 xEBr55PruIJSBF/vRPQ4qFouYVa0ieN6vIPKLIyGNnd9mGvg1vZ7bWqci+kBQg5PO1TA 67Y/aQODlMPW/bIcjC1C4AYfTiUXq88l0ywGTqv2XOn+vwvKmffYMpmg2YlAauRyyBWv 9NPuMfAnfk1Qc7SuHu2M6eOoeB0aYbzG6krKYT2y3FCnLR/iJiIslsraQ6ZW4OE6vMxO Wo35RY9zrp+3E04R2LJCFK1TGkJivwDmmjjBDAdXJ9S8K6CLciajjHDGYBPDnCysHmB8 gnHQ== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=fjP2Dwg2+rbDMgD2e6n/M6afHQI68v/jFSNHQnKhGHQ=; b=T4eaQHjNxrlQRxPVf5x1fSFgdL/BN9HG36N2GWeWdQNIKlWVI4TDTba6scTcP8UJzk 5HxBv1gUT2nPXkjfR4FqQg32Zatd2SjHfG/3y2KqeCRnj6v/8U/DTN5xso2AcRLKIrYj 5V65tD4r0CYCx9zC9kFd50xOeX2FULKakMDXevKeKgKQOnoGjioyOsmsMR0IAASgA07H M5//Dxu9raPweSs3P+3+7Bq6HLCPdl0l2AGgWT2k6yxeh9GLAL99oCE2+MHLYT4Ibouj gDRVSlidRyuj12315SbDZeP58mfffVTJL9AdBKDHVrRJp3NFNgh4MveHG8PzNqEsoWF3 tL7A== X-Gm-Message-State: APjAAAUByXDd6HkdElNeYA6fz+rhsH6oFUOM+iF1LVKYU140JnNzSm// cCQtrUKKkqJ0adv22ntm1I1sl7+4Gg4= X-Received: by 2002:a17:90a:e389:: with SMTP id b9mr19034758pjz.7.1576886808048; Fri, 20 Dec 2019 16:06:48 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:4e0::36e9]) by smtp.gmail.com with ESMTPSA id d4sm11701624pjz.12.2019.12.20.16.06.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Dec 2019 16:06:47 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Fri, 20 Dec 2019 16:06:15 -0800 Message-Id: <20191221000635.1573390-3-raj.khem@gmail.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191221000635.1573390-1-raj.khem@gmail.com> References: <20191221000635.1573390-1-raj.khem@gmail.com> MIME-Version: 1.0 Subject: [oe] [meta-oe][PATCH 03/23] cli11: Fix multilib build X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Signed-off-by: Khem Raj --- meta-oe/recipes-support/cli11/cli11_1.8.0.bb | 1 + ...stallDirs-instead-of-hard-coded-path.patch | 39 +++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 meta-oe/recipes-support/cli11/files/0001-Use-GNUInstallDirs-instead-of-hard-coded-path.patch -- 2.24.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-support/cli11/cli11_1.8.0.bb b/meta-oe/recipes-support/cli11/cli11_1.8.0.bb index 404545d5e7..dd129cbec9 100644 --- a/meta-oe/recipes-support/cli11/cli11_1.8.0.bb +++ b/meta-oe/recipes-support/cli11/cli11_1.8.0.bb @@ -8,6 +8,7 @@ PV .= "+git${SRCPV}" SRC_URI += "gitsm://github.com/CLIUtils/CLI11 \ file://0001-Add-CLANG_TIDY-check.patch \ + file://0001-Use-GNUInstallDirs-instead-of-hard-coded-path.patch \ " S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-support/cli11/files/0001-Use-GNUInstallDirs-instead-of-hard-coded-path.patch b/meta-oe/recipes-support/cli11/files/0001-Use-GNUInstallDirs-instead-of-hard-coded-path.patch new file mode 100644 index 0000000000..4541cd929d --- /dev/null +++ b/meta-oe/recipes-support/cli11/files/0001-Use-GNUInstallDirs-instead-of-hard-coded-path.patch @@ -0,0 +1,39 @@ +From 8c51221f748bca1483fe1141e584867d2ff34a07 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 19 Dec 2019 16:26:39 -0800 +Subject: [PATCH] Use GNUInstallDirs instead of hard-coded path + +Upstream-Status: Submitted [https://github.com/CLIUtils/CLI11/pull/373] +Signed-off-by: Khem Raj +--- + CMakeLists.txt | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7073a0b..5236fd2 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -120,17 +120,18 @@ endif() + configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/CLI11ConfigVersion.cmake.in" + "${CMAKE_CURRENT_BINARY_DIR}/CLI11ConfigVersion.cmake" @ONLY) + ++include(GNUInstallDirs) + # These installs only make sense for a local project + if(CUR_PROJ) + # Make version available in the install + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/CLI11ConfigVersion.cmake" +- DESTINATION lib/cmake/CLI11) ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/CLI11) + + # Install the export target as a file + install(EXPORT CLI11Targets + FILE CLI11Config.cmake + NAMESPACE CLI11:: +- DESTINATION lib/cmake/CLI11) ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/CLI11) + + # Use find_package on the installed package + export(TARGETS CLI11 +-- +2.24.1 +