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 40AA37EE3 for ; Tue, 2 Oct 2018 18:21:12 +0200 (CEST) Received: by mail-wm1-f66.google.com with SMTP id b19-v6so2879873wme.3 for ; Tue, 02 Oct 2018 09:21:12 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:subject:from:to:cc:date:in-reply-to :references:content-transfer-encoding:mime-version; bh=lJMB7X6eQTtNNvMnV2UeMirGk7iQPRHeGyHD726OqO4=; b=hpJUXgZiYDYUtKaBN/1F8xAisOClVDzYy4/r4OOiTY9EtdhxnUXAJUydKZDsD6kg7E sIq2TeskYB7eZir8aHu2l+dMqJYktU0A4+sNiFucYbO1n/plu1AvBYw4Z/XtkDFRYG9N MosKgWMCpTp5/EVhPf8MGQgkXNJBY5iy/SxLkeUVxT2vH/aM4H7ZtyUEugFICH+aGKOS 87nWnxCyUfUD8/49j5DnIRHLins0nbpWnYScmBWRMxfKSy8YnqAu9yOSFgw90e6YUTja wm898EMmlR9Swtb/7ErsIl8tH9VJ+OOhSPy5CrNIRAfHLQZGvqDGNzuTx7+o2SdGEetw pCLw== X-Gm-Message-State: ABuFfohfSnFGyk6zRb1BYLvV886M7MwMjZwyxp3x+A/zhwYp1BHgCs1K om/2ut9Q7w5EcXmedVJ6FS4= X-Google-Smtp-Source: ACcGV63UJyHuL9WwSiMpLqIJ9aMhkaGDaWN6f0FwBpyTb2rtOff6DU03z5Qhe8iJy/Sek9cB72ngYA== X-Received: by 2002:a1c:be09:: with SMTP id o9-v6mr2410020wmf.109.1538497271900; Tue, 02 Oct 2018 09:21:11 -0700 (PDT) Received: from localhost ([2a01:4b00:f419:6f00:8361:8946:ba2b:d556]) by smtp.gmail.com with ESMTPSA id t24-v6sm5417963wra.5.2018.10.02.09.21.10 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 02 Oct 2018 09:21:10 -0700 (PDT) Message-ID: <1538497269.4835.12.camel@debian.org> From: Luca Boccassi To: Bruce Richardson Cc: dev@dpdk.org, tredaelli@redhat.com, christian.ehrhardt@canonical.com, mvarlese@suse.de Date: Tue, 02 Oct 2018 17:21:09 +0100 In-Reply-To: <20181002155857.GA24088@bricha3-MOBL.ger.corp.intel.com> References: <20180928175803.12955-1-bluca@debian.org> <20181002152556.17041-1-bluca@debian.org> <20181002152556.17041-2-bluca@debian.org> <20181002155857.GA24088@bricha3-MOBL.ger.corp.intel.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Mailer: Evolution 3.22.6-1+deb9u1 Mime-Version: 1.0 Subject: Re: [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 16:21:12 -0000 On Tue, 2018-10-02 at 16:58 +0100, Bruce Richardson wrote: > On Tue, Oct 02, 2018 at 04:25:56PM +0100, Luca Boccassi wrote: > > Allow users and packagers to override the default dpdk/drivers > > subdirectory where the PMDs get installed under $lib. > >=20 > > Signed-off-by: Luca Boccassi > > --- > > v3: changed default value to and use string.contains > > rather > > =C2=A0=C2=A0=C2=A0=C2=A0than exact equivalence > >=20 > > =C2=A0meson.build=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0| 10 +++++++= +-- > > =C2=A0meson_options.txt |=C2=A0=C2=A02 ++ > > =C2=A02 files changed, 10 insertions(+), 2 deletions(-) > >=20 > > 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 =3D [] > > =C2=A0pver =3D meson.project_version().split('.') > > =C2=A0major_version =3D '@0@.@1@'.format(pver.get(0), pver.get(1)) > > =C2=A0 > > -driver_install_path =3D join_paths(get_option('libdir'), 'dpdk', > > - 'pmds-' + major_version) > > +pmd_subdir_opt =3D get_option('drivers_install_subdir') > > +if pmd_subdir_opt.contains('') > > + driver_install_path =3D join_paths(get_option('libdir'), > > + 'dpdk', 'pmds-' + major_version) > > +else > > + driver_install_path =3D join_paths(get_option('libdir'), > > + pmd_subdir_opt) > > +endif > > =C2=A0eal_pmd_path =3D join_paths(get_option('prefix'), > > driver_install_path) > > =C2=A0 >=20 > The diff (to your patch) below demonstrates more of what I had in > mind :-) > Basically do a replace of '' with the version number, > leaving the > remaining string unchanged. >=20 > /Bruce >=20 > diff --git a/meson.build b/meson.build > index 2e3cbac58..11697861c 100644 > --- a/meson.build > +++ b/meson.build > @@ -22,12 +22,9 @@ major_version =3D '@0@.@1@'.format(pver.get(0), > pver.get(1)) > =C2=A0 > =C2=A0pmd_subdir_opt =3D get_option('drivers_install_subdir') > =C2=A0if pmd_subdir_opt.contains('') > - driver_install_path =3D join_paths(get_option('libdir'), > - 'dpdk', 'pmds-' + major_version) > -else > - driver_install_path =3D join_paths(get_option('libdir'), > - pmd_subdir_opt) > + pmd_subdir_opt =3D > major_version.join(pmd_subdir_opt.split('')) > =C2=A0endif > +driver_install_path =3D join_paths(get_option('libdir'), > pmd_subdir_opt) > =C2=A0eal_pmd_path =3D join_paths(get_option('prefix'), driver_install_pa= th) > =C2=A0 > =C2=A0# configure the build, and make sure configs here and in config > folder are Ok, pushed in v4 --=20 Kind regards, Luca Boccassi