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 9318BA0350; Thu, 2 Jul 2020 02:03:07 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 48AB51D5E4; Thu, 2 Jul 2020 02:02:53 +0200 (CEST) Received: from mail-lj1-f194.google.com (mail-lj1-f194.google.com [209.85.208.194]) by dpdk.org (Postfix) with ESMTP id F241A1D5C0 for ; Thu, 2 Jul 2020 02:02:49 +0200 (CEST) Received: by mail-lj1-f194.google.com with SMTP id 9so29330771ljv.5 for ; Wed, 01 Jul 2020 17:02:49 -0700 (PDT) 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=LqaoIabq7gNhprB9O6OxPn9Vp6sLQwqWeTxfCL90X+Y=; b=Jv1NTpBRvvhjS0F/feprl7lmU86kJj71uW4rASsitr7h4RdxvYpAdW8Gwm4EaRPKdS eZnNB9xVBCCE6gK4G5VGYdImFKg2qOKm8xrJPs+pVizdQba7kWmxzRkYdRhvCFEmA022 QUce5oJyn779yi6QhD339ZAQ7GWXIK/I2sNanHrd1qdBdhfoqxb7T3dLWi17w8/l9sFI z4kQpPoQ55W2RbsXojq+bliBMhaJOio+tI05UK7BIUGl/z6kIO4lI7wqz7PF3BfMUXrk u4g36XuUilRPolyOIqLM6RDjjhjBsGD0v6rB29lbVS5KxXam4T2TyuLno5ExwvAV/nrO M8/Q== 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=LqaoIabq7gNhprB9O6OxPn9Vp6sLQwqWeTxfCL90X+Y=; b=s8zPRzzMKmWmezmzwDRppR19CV/UQvqa1fKoMu9c4/R5pJqrYrGJnmzD7jIGsEnRBf XKSDHBlwu3rCIYTXMWJoAhBzoDuMK4+BQOEDmMaJhwRvR9WYrjvJb0H8tkY7TLePgtBy diTDeaKwnBnGV76a2oVMjkS389MI9Te6QhCYbhukS8p7gq0WaV8Co56SMrLK158TnNfe z2uz18NMkIGRir4PBpPExjcSoiWGMrJhO9n/6ZOZNK0TOVLqwKBPjrVz21iHdoJWU5de YM0niPgDvNYyswccwGslxHzriOhDd3m9iyjHYkq/MPG1xMTlXfCpMWX8ega/DLa7528F FQfQ== X-Gm-Message-State: AOAM531Gc6Gk3xjMK5xA2L1xpuauuTviSkoWdpN8UpLq0Z5asPoYERUW 6BJhxSj+FcVZeo/N1jDiFosUGySRBPA= X-Google-Smtp-Source: ABdhPJzktHWJS9wIbuqcq6bzIaB41+t+9X1ZXlg9AXN+pqJ/FI8c7aZG4OIh1LzOm+ewdoClHCMnRw== X-Received: by 2002:a2e:7203:: with SMTP id n3mr11857128ljc.174.1593648168960; Wed, 01 Jul 2020 17:02:48 -0700 (PDT) Received: from localhost.localdomain (broadband-37-110-65-23.ip.moscow.rt.ru. [37.110.65.23]) by smtp.gmail.com with ESMTPSA id u26sm2875550lfq.72.2020.07.01.17.02.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jul 2020 17:02:48 -0700 (PDT) From: Dmitry Kozlyuk To: dev@dpdk.org Cc: Neil Horman , Bruce Richardson , Thomas Monjalon , robin.jarry@6wind.com, Jie Zhou , Tal Shnaiderman , Dmitry Kozlyuk Date: Thu, 2 Jul 2020 03:02:31 +0300 Message-Id: <20200702000232.10761-3-dmitry.kozliuk@gmail.com> X-Mailer: git-send-email 2.25.4 In-Reply-To: <20200702000232.10761-1-dmitry.kozliuk@gmail.com> References: <20200622004503.29036-1-dmitry.kozliuk@gmail.com> <20200702000232.10761-1-dmitry.kozliuk@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [RFC PATCH v2 2/3] build: use Python pmdinfogen 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" Archived-At: List-Archive: Also don't suppress stderr from ar and pmdinfogen. Signed-off-by: Dmitry Kozlyuk --- GNUmakefile | 2 +- buildtools/Makefile | 9 --------- buildtools/gen-pmdinfo-cfile.sh | 3 +-- buildtools/meson.build | 3 +-- drivers/meson.build | 2 +- mk/internal/rte.compile-pre.mk | 2 +- mk/rte.sdkinstall.mk | 2 -- 7 files changed, 5 insertions(+), 18 deletions(-) delete mode 100644 buildtools/Makefile diff --git a/GNUmakefile b/GNUmakefile index e8de422df..242d30d2e 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -12,6 +12,6 @@ export RTE_SDK # directory list # -ROOTDIRS-y := buildtools lib kernel drivers app +ROOTDIRS-y := lib kernel drivers app include $(RTE_SDK)/mk/rte.sdkroot.mk diff --git a/buildtools/Makefile b/buildtools/Makefile deleted file mode 100644 index 7f76fd7d6..000000000 --- a/buildtools/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2016 Neil Horman -# All rights reserved. - -include $(RTE_SDK)/mk/rte.vars.mk - -DIRS-y += pmdinfogen - -include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/buildtools/gen-pmdinfo-cfile.sh b/buildtools/gen-pmdinfo-cfile.sh index 43059cf36..eeeab678e 100755 --- a/buildtools/gen-pmdinfo-cfile.sh +++ b/buildtools/gen-pmdinfo-cfile.sh @@ -9,6 +9,5 @@ pmdinfogen=$3 # The generated file must not be empty if compiled in pedantic mode echo 'static __attribute__((unused)) const char *generator = "'$0'";' > $output for ofile in `ar t $arfile` ; do - ar p $arfile $ofile | $pmdinfogen - - >> $output 2> /dev/null + ar p $arfile $ofile | $pmdinfogen - - >> $output done -exit 0 diff --git a/buildtools/meson.build b/buildtools/meson.build index f9d2fdf74..88c238ca4 100644 --- a/buildtools/meson.build +++ b/buildtools/meson.build @@ -1,9 +1,8 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017-2019 Intel Corporation -subdir('pmdinfogen') - pkgconf = find_program('pkg-config', 'pkgconf', required: false) +pmdinfogen = find_program('pmdinfogen.py') pmdinfo = find_program('gen-pmdinfo-cfile.sh') list_dir_globs = find_program('list-dir-globs.py') check_symbols = find_program('check-symbols.sh') diff --git a/drivers/meson.build b/drivers/meson.build index e78c76c55..37822537a 100644 --- a/drivers/meson.build +++ b/drivers/meson.build @@ -119,7 +119,7 @@ foreach class:dpdk_driver_classes command: [pmdinfo, tmp_lib.full_path(), '@OUTPUT@', pmdinfogen], output: out_filename, - depends: [pmdinfogen, tmp_lib]) + depends: [tmp_lib]) endif version_map = '@0@/@1@/@2@_version.map'.format( meson.current_source_dir(), diff --git a/mk/internal/rte.compile-pre.mk b/mk/internal/rte.compile-pre.mk index df05b5576..bb2ab0725 100644 --- a/mk/internal/rte.compile-pre.mk +++ b/mk/internal/rte.compile-pre.mk @@ -59,7 +59,7 @@ endif CHECK_SYMBOLS_SCRIPT = $(RTE_SDK)/buildtools/check-symbols.sh CHECK_SYMBOLS = $(CHECK_SYMBOLS_SCRIPT) $(SRCDIR)/$(EXPORT_MAP) $@ -PMDINFO_GEN = $(RTE_SDK_BIN)/app/dpdk-pmdinfogen $@ $@.pmd.c +PMDINFO_GEN = $(RTE_SDK)/buildtools/pmdinfogen.py $@ $@.pmd.c PMDINFO_CC = $(CC) $(CPPFLAGS) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@.pmd.o $@.pmd.c PMDINFO_LD = $(CROSS)ld -r $(filter-out -export-dynamic,$(LDFLAGS)) -o $@.o $@.pmd.o $@ PMDINFO_TO_O = if grep -q 'RTE_PMD_REGISTER_.*(.*)' $<; then \ diff --git a/mk/rte.sdkinstall.mk b/mk/rte.sdkinstall.mk index 32bed5d95..875a64f04 100644 --- a/mk/rte.sdkinstall.mk +++ b/mk/rte.sdkinstall.mk @@ -98,7 +98,6 @@ install-runtime: $(Q)cp $(CP_FLAGS) $O/lib/* $(DESTDIR)$(libdir) $(Q)$(call rte_mkdir, $(DESTDIR)$(bindir)) $(Q)tar -cf - -C $O --exclude 'app/*.map' \ - --exclude app/dpdk-pmdinfogen \ --exclude 'app/cmdline*' --exclude app/test \ --exclude app/testacl --exclude app/testpipeline app | \ tar -xf - -C $(DESTDIR)$(bindir) $(TAR_X_FLAGS) @@ -134,7 +133,6 @@ install-sdk: $(Q)cp $(CP_FLAGS) $(RTE_SDK)/buildtools $(DESTDIR)$(sdkdir) $(Q)$(call rte_mkdir, $(DESTDIR)$(targetdir)/app) $(Q)cp $(CP_FLAGS) $O/.config $(DESTDIR)$(targetdir) - $(Q)cp $(CP_FLAGS) $O/app/dpdk-pmdinfogen $(DESTDIR)$(targetdir)/app $(Q)$(call rte_symlink, $(DESTDIR)$(includedir), $(DESTDIR)$(targetdir)/include) $(Q)$(call rte_symlink, $(DESTDIR)$(libdir), $(DESTDIR)$(targetdir)/lib) -- 2.25.4