From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by dpdk.org (Postfix) with ESMTP id 6D2242C36 for ; Tue, 2 Oct 2018 15:06:57 +0200 (CEST) Received: by mail-wm1-f66.google.com with SMTP id z204-v6so1298777wmc.5 for ; Tue, 02 Oct 2018 06:06:57 -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=9dWwDVQruqP1wpxgE1yNj4TE8+nRd97dMcOtVh98gC8=; b=hx0rSgtZMJ0BgfSi2KuYMWgnDbEPRg3d1IxLCTGxIJlmGjlhToqu057QR+W/GBBJ85 SF+QNvgduf5G/UpbMLMJD+chR4poSNwyRiSjwFxs3GBT/RTmse5CMmv8iMAjB3n5sAdX ZEwxb1snjIgzOjKOTGMyP9wLgqZL/21i4pzYEfENn9dZKAcSTKfmb8tGpfasCuAD1tjp JaTleiELE8C3GrJwYChkYrQI8f1DRvSBPKWDRA8Nfx90cjF6yYSv3DthTkNgiKVyq4Ui 0cGK28xvXiu3lNj7tqN1dE05VYw1gIFJOyYPbLUzJ8uIueqwHRbGtcQ0xaqwwE8nRUHC V1Tw== X-Gm-Message-State: ABuFfoiylBgJBXiV0MrfX0s8TyYPEKF1ovw31D0cHFvmqVlHbjNImbT6 G1qatFIaY0C0fkf6w4mTbfRV3GtC X-Google-Smtp-Source: ACcGV63GhvL1d1Yik3wviLYdqR9QWuNqcGnWadThWfNdsxVFkn67elzt6Qf6xjV9of6JGfgK8EgsyA== X-Received: by 2002:a1c:4d09:: with SMTP id o9-v6mr1728963wmh.134.1538485616706; Tue, 02 Oct 2018 06:06:56 -0700 (PDT) Received: from localhost ([2001:1be0:110d:fcfe:ed7d:79a1:9a42:d85f]) by smtp.gmail.com with ESMTPSA id p9-v6sm11045971wmc.37.2018.10.02.06.06.55 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 02 Oct 2018 06:06:55 -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 14:06:45 +0100 Message-Id: <20181002130646.14919-1-bluca@debian.org> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20180928175803.12955-1-bluca@debian.org> References: <20180928175803.12955-1-bluca@debian.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v2 1/2] build: change default PMD installation subdir to dpdk/pmds-XX.YY 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 13:06:57 -0000 As part of the effort of consolidating the DPDK installation bits and pieces across distros, set the default directory of lib/ where PMDs get installed to dpdk/pmds-XX.YY. It's necessary to have a versioned subdirectory as multiple ABI revisions might be installed at the same time, so having a fixed name will cause trouble with the autoload feature. Small refactor with parsing and saving the major version to a variable, since it's now used in 3 different places. Signed-off-by: Luca Boccassi --- drivers/meson.build | 6 ++---- lib/meson.build | 6 ++---- meson.build | 8 +++++++- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/drivers/meson.build b/drivers/meson.build index 47b4215a30..3a6c4bf656 100644 --- a/drivers/meson.build +++ b/drivers/meson.build @@ -98,10 +98,8 @@ foreach class:driver_classes lib_version = '@0@.1'.format(version) so_version = '@0@'.format(version) else - pver = meson.project_version().split('.') - lib_version = '@0@.@1@'.format(pver.get(0), - pver.get(1)) - so_version = lib_version + lib_version = major_version + so_version = major_version endif # now build the static driver diff --git a/lib/meson.build b/lib/meson.build index 3acc67e6ed..bed492a4ec 100644 --- a/lib/meson.build +++ b/lib/meson.build @@ -88,10 +88,8 @@ foreach l:libraries lib_version = '@0@.1'.format(version) so_version = '@0@'.format(version) else - prj_ver = meson.project_version().split('.') - lib_version = '@0@.@1@'.format( - prj_ver.get(0), prj_ver.get(1)) - so_version = lib_version + lib_version = major_version + so_version = major_version endif # first build static lib diff --git a/meson.build b/meson.build index c9af33532d..4bd04b9de3 100644 --- a/meson.build +++ b/meson.build @@ -15,7 +15,13 @@ dpdk_libraries = [] dpdk_drivers = [] dpdk_extra_ldflags = [] -driver_install_path = join_paths(get_option('libdir'), 'dpdk/drivers') +# set the major version, which might be used by drivers and libraries +# depending on the configuration options +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) eal_pmd_path = join_paths(get_option('prefix'), driver_install_path) # configure the build, and make sure configs here and in config folder are -- 2.19.0