From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by dpdk.org (Postfix) with ESMTP id 979D15F0D for ; Tue, 2 Oct 2018 17:26:02 +0200 (CEST) Received: by mail-wr1-f65.google.com with SMTP id n1-v6so2710103wrt.10 for ; Tue, 02 Oct 2018 08:26:02 -0700 (PDT) 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=sad1cJhcMrbrN8iOVo+Fb99NMF8lA1ZQQDPAtfQCP70=; b=rjcDa8+bgHbSRpLqxhe4ih4eMbPr57G6tss8aQ0nWCRBbG8J7XFNE4hakl3+V38eKJ DfkX4u03gfT/qeR5a4l205q6KpUZv2yEokge0Wx7fSmHXZPW9q6+2pNNdCh880ZY65Gt TpaVN9GZjdKVJyIm1g0Jiq44OK4srypSiI96LG6Jniuh7nTfVZ//8V0FdDtAYXODCIEI 1gfJ/TK56iuO8TBMTkRKfoEgWbv86uaXCg2wrGsHS7/lkL0cUyVA4mROPqiUhF2LeV4H hNYNhI9z30eZJjMRu1Bist0wv0BTyi5Uhwd/vR2T/35GmJecZkRApSZeVqUFAtWrmcJc i6mQ== X-Gm-Message-State: ABuFfoiKAbMWN/JNW40hQmoY3zF6vcrBCwu9pCracZmkOnC78dzmUTmE NM+ZCO3RfmzZzVCNO30qO4nuk4kC X-Google-Smtp-Source: ACcGV632o85NHa6m0v+poi2+/Z+BE0UURYS+oSviGChD7G+UIj084tUsr+MFJV+gkgxz21DeZPTQbw== X-Received: by 2002:adf:c793:: with SMTP id l19-v6mr5474544wrg.230.1538493961971; Tue, 02 Oct 2018 08:26:01 -0700 (PDT) Received: from localhost ([2a01:4b00:f419:6f00:8361:8946:ba2b:d556]) by smtp.gmail.com with ESMTPSA id l16-v6sm8671056wmc.38.2018.10.02.08.26.00 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 02 Oct 2018 08:26:00 -0700 (PDT) From: Luca Boccassi To: dev@dpdk.org Cc: bruce.richardson@intel.com, tredaelli@redhat.com, christian.ehrhardt@canonical.com, mvarlese@suse.de, Luca Boccassi Date: Tue, 2 Oct 2018 16:25:56 +0100 Message-Id: <20181002152556.17041-2-bluca@debian.org> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20181002152556.17041-1-bluca@debian.org> References: <20180928175803.12955-1-bluca@debian.org> <20181002152556.17041-1-bluca@debian.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v3 2/2] build: add drivers_install_subdir meson option X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Oct 2018 15:26:02 -0000 Allow users and packagers to override the default dpdk/drivers subdirectory where the PMDs get installed under $lib. Signed-off-by: Luca Boccassi --- v3: changed default value to and use string.contains rather than exact equivalence meson.build | 10 ++++++++-- meson_options.txt | 2 ++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 4bd04b9de3..2e3cbac587 100644 --- a/meson.build +++ b/meson.build @@ -20,8 +20,14 @@ dpdk_extra_ldflags = [] pver = meson.project_version().split('.') major_version = '@0@.@1@'.format(pver.get(0), pver.get(1)) -driver_install_path = join_paths(get_option('libdir'), 'dpdk', - 'pmds-' + major_version) +pmd_subdir_opt = get_option('drivers_install_subdir') +if pmd_subdir_opt.contains('') + driver_install_path = join_paths(get_option('libdir'), + 'dpdk', 'pmds-' + major_version) +else + driver_install_path = join_paths(get_option('libdir'), + pmd_subdir_opt) +endif eal_pmd_path = join_paths(get_option('prefix'), driver_install_path) # configure the build, and make sure configs here and in config folder are diff --git a/meson_options.txt b/meson_options.txt index d14bde892d..10b5416151 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,5 +1,7 @@ option('allow_invalid_socket_id', type: 'boolean', value: false, description: 'allow out-of-range NUMA socket id\'s for platforms that don\'t report the value correctly') +option('drivers_install_subdir', type: 'string', value: 'dpdk/pmds-', + description: 'Subdirectory of libdir where to install PMDs. Defaults to using a versioned subdirectory.') option('enable_driver_mlx_glue', type: 'boolean', value: false, description: 'Enable glue library for Mellanox PMDs') option('enable_kmods', type: 'boolean', value: true, -- 2.19.0