From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id DF25BA00C2; Sat, 25 Apr 2020 16:34:31 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 404161C1BD; Sat, 25 Apr 2020 16:34:31 +0200 (CEST) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by dpdk.org (Postfix) with ESMTP id C0A8E1C1BB for ; Sat, 25 Apr 2020 16:34:29 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1587825268; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xY3AKOzkAVew58pWasttXrXJT3qNBBWGOjKuI5N4xf0=; b=ay4nRZXQqsarMy6EE9AJQCtAHSmvvbVjrs7AN/WBgcxL4xmO03pAkSTyG5I67HcxsI+Ms9 8ZG2scv5oDatMO9aDGfnYmRB1Kpr4tdtmkYPlY5rLde5jcL1IO2pitExwrB8L5ZaTo7pA2 j2rbBU2leWB8CkQKvTUGdSawgGvk7yA= Received: from mail-ua1-f70.google.com (mail-ua1-f70.google.com [209.85.222.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-77-1avd1KOSNtqwWR7H-UWuvw-1; Sat, 25 Apr 2020 10:34:25 -0400 X-MC-Unique: 1avd1KOSNtqwWR7H-UWuvw-1 Received: by mail-ua1-f70.google.com with SMTP id a2so6527265uas.17 for ; Sat, 25 Apr 2020 07:34:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=Nkt2RFVkGQyVFkanGJaMjMw5tdQ27PhEG8UOH7EutLU=; b=qhuFFQ4/CIIrnX1Nlej5YzbinRairSV5PjtBjIeY/at7/ZNbY7NLEEDd7hUbr/QIQF 8+z+mTT1XunfrWPXvjT9xXJEDqrXoAwbc24RwhZaot8+KJvRVOWw7O90+rTj0TReT1YB 0BUHGVHhkpK0lpDvjYNtGhtCm0DQNUAXEzly/J/sUsGUfZ/AJeEmCbN1G/OL2JcRWLOQ WIQzhNd19ORvZ9tUwlN7AtE1eubLVkRxEpfNnuyAyZLimZWJS+Gd2+7QUDUYP29LhmkI r5CGJx19xTYz/l+IF5zi1A99P+npFaJ6i0MYrmUXw4KUpAqUacZISdvxyxIiNgFvN1f/ XyGg== X-Gm-Message-State: AGi0PuYJbb5Fg8bVy3hCgiMx5VykQLs+WLJUCjid9QUCivj04jlR4MqH rEiTKhfqcF8yiQ+Zzvzb9WQ78wyhu/tc7uikC5lmi7cr3/V/UJCGKUZSVyJQa80cwp2PGs7lyMx GdPDi+gCifFRlvRBM0rM= X-Received: by 2002:a05:6102:4d:: with SMTP id k13mr11646280vsp.198.1587825264577; Sat, 25 Apr 2020 07:34:24 -0700 (PDT) X-Google-Smtp-Source: APiQypJR4Jv50IGcWDILGgvbvL5i7X1Rn/0ne4WcTt46mjqj7A0HJ62rS8+t1x0B9X6CvcTC7/it/WcChfUWrtBdCnM= X-Received: by 2002:a05:6102:4d:: with SMTP id k13mr11646263vsp.198.1587825264304; Sat, 25 Apr 2020 07:34:24 -0700 (PDT) MIME-Version: 1.0 References: <20190613142344.9188-1-nhorman@tuxdriver.com> <20200425105620.73021-1-haiyue.wang@intel.com> <20200425105620.73021-4-haiyue.wang@intel.com> In-Reply-To: <20200425105620.73021-4-haiyue.wang@intel.com> From: David Marchand Date: Sat, 25 Apr 2020 16:34:12 +0200 Message-ID: To: Haiyue Wang Cc: dev , Thomas Monjalon , Bruce Richardson , "Yigit, Ferruh" , Neil Horman , Ray Kinsella X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Subject: Re: [dpdk-dev] [PATCH v7 3/6] mk: add internal tag check 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" On Sat, Apr 25, 2020 at 1:02 PM Haiyue Wang wrote: > > Add checks during build to ensure that all symbols in the INTERNAL > version map section have __internal tags on their definitions, and > enable the warnings needed to announce their use. > > Signed-off-by: Haiyue Wang > --- > MAINTAINERS | 2 +- > ...-experimental-syms.sh =3D> check-symbols.sh} | 31 +++++++++++++++++++ > buildtools/meson.build | 2 +- > mk/internal/rte.compile-pre.mk | 6 ++-- > 4 files changed, 36 insertions(+), 5 deletions(-) > rename buildtools/{check-experimental-syms.sh =3D> check-symbols.sh} (61= %) Just missing a little update on drivers/meson.build and lib/meson.build. Squashed with: diff --git a/buildtools/meson.build b/buildtools/meson.build index 3e8d31b0c5..d5f8291beb 100644 --- a/buildtools/meson.build +++ b/buildtools/meson.build @@ -6,7 +6,7 @@ subdir('pmdinfogen') pkgconf =3D find_program('pkg-config', 'pkgconf', required: false) pmdinfo =3D find_program('gen-pmdinfo-cfile.sh') list_dir_globs =3D find_program('list-dir-globs.py') -check_experimental_syms =3D find_program('check-symbols.sh') +check_symbols =3D find_program('check-symbols.sh') ldflags_ibverbs_static =3D find_program('options-ibverbs-static.sh') # set up map-to-def script using python, either built-in or external @@ -20,4 +20,4 @@ map_to_def_cmd =3D py3 + files('map_to_def.py') sphinx_wrapper =3D py3 + files('call-sphinx-build.py') # stable ABI always starts with "DPDK_" -is_experimental_cmd =3D [find_program('grep', 'findstr'), '^DPDK_'] +is_stable_cmd =3D [find_program('grep', 'findstr'), '^DPDK_'] diff --git a/drivers/meson.build b/drivers/meson.build index f3dd23dd43..dc293b270b 100644 --- a/drivers/meson.build +++ b/drivers/meson.build @@ -131,15 +131,15 @@ foreach class:dpdk_driver_classes meson.current_source_dir(), drv_path, lib_name) - is_experimental =3D run_command(is_experimental_cmd= , - files(version_map)).returncode() + is_stable =3D run_command(is_stable_cmd, + files(version_map)).returncode() =3D=3D 0 - if is_experimental !=3D 0 - lib_version =3D experimental_abi_version - so_version =3D experimental_so_version - else + if is_stable lib_version =3D abi_version so_version =3D stable_so_version + else + lib_version =3D experimental_abi_version + so_version =3D experimental_so_version endif # now build the static driver @@ -168,14 +168,14 @@ foreach class:dpdk_driver_classes else lk_args =3D ['-Wl,--version-script=3D' + version_map] # on unix systems check the output of the - # experimental syms script, using it as a + # check-symbols.sh script, using it as a # dependency of the .so build - lk_deps +=3D custom_target(lib_name + '.exp= _chk', - command: [check_experimental_syms, + lk_deps +=3D custom_target(lib_name + '.sym= _chk', + command: [check_symbols, version_map, '@INPUT@'], capture: true, input: static_lib, - output: lib_name + '.exp_chk') + output: lib_name + '.sym_chk') endif shared_lib =3D shared_library(lib_name, diff --git a/lib/meson.build b/lib/meson.build index 8697941ae0..07a65a6256 100644 --- a/lib/meson.build +++ b/lib/meson.build @@ -109,15 +109,15 @@ foreach l:libraries version_map =3D '@0@/@1@/rte_@2@_version.map'.forma= t( meson.current_source_dir(), dir_name, name) - is_experimental =3D run_command(is_experimental_cmd= , - files(version_map)).returncode() + is_stable =3D run_command(is_stable_cmd, + files(version_map)).returncode() = =3D=3D 0 - if is_experimental !=3D 0 - lib_version =3D experimental_abi_version - so_version =3D experimental_so_version - else + if is_stable lib_version =3D abi_version so_version =3D stable_so_version + else + lib_version =3D experimental_abi_version + so_version =3D experimental_so_version endif # first build static lib @@ -160,14 +160,14 @@ foreach l:libraries lk_deps =3D [version_map, def_file] if not is_windows # on unix systems check the output of the - # experimental syms script, using it as a + # check-symbols.sh script, using it as a # dependency of the .so build - lk_deps +=3D custom_target(name + '.exp_chk= ', - command: [check_experimental_syms, + lk_deps +=3D custom_target(name + '.sym_chk= ', + command: [check_symbols, version_map, '@INPUT@'], capture: true, input: static_lib, - output: name + '.exp_chk') + output: name + '.sym_chk') endif shared_lib =3D shared_library(libname, --=20 David Marchand