From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by dpdk.org (Postfix) with ESMTP id 0B2D55F1C for ; Mon, 10 Sep 2018 22:04:58 +0200 (CEST) Received: by mail-wm0-f68.google.com with SMTP id f21-v6so22795360wmc.5 for ; Mon, 10 Sep 2018 13:04:58 -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; bh=8m7QFNGyWo96VSQcAlezET6YwNk+j6BIO3hXz/AZ7Ac=; b=axsZU2tobQQPmvYtMNjYkZ5VxABER6nrfjP7q+Wq+EFSp8BDhRWR+T759eIR4OhIkt NadyBONAyY/581oCHbLTi7XYYEXA+U1UIYUy4f1mSyQIw0zxV+VOoYL31VnjJ7qiDZ1P KEU6Z+kwH5qC6XtNT3yqmVaYRm7Ope++h4TVsq6MBjtXJtav8U/2gqmIicCgL4Pswy4P lPm5IwE5V1el+HAkvn6LPx2LyapiGzP0ZNcgqKwGN+u8jdIwsYw79OzVIuU87TtQn+lS rpptW8+blbGVWfOoQY4D1xoqrJCspA4PWwfRtOUeInpRVUMm5NqQq4QSVbpajK9ybYNG MhUw== X-Gm-Message-State: APzg51AkDHXPh2AdVJVxQNmriC07Yi8g1Jsr3xbZuG79pcp7KspWNBSr Hvru8OPM8q3E9IwGtapfp1Z+ZPBwZ8c= X-Google-Smtp-Source: ANB0VdY1++BEb0z+jIJjc3Hu11dlIy3l1xGqb7X5EWF5JjrtruahK7YegROkD7Nfm9uRe3cUmWpNug== X-Received: by 2002:a1c:e141:: with SMTP id y62-v6mr1892151wmg.138.1536609896718; Mon, 10 Sep 2018 13:04:56 -0700 (PDT) Received: from localhost ([2a01:4b00:f419:6f00:8361:8946:ba2b:d556]) by smtp.gmail.com with ESMTPSA id l10-v6sm15629922wre.0.2018.09.10.13.04.55 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 10 Sep 2018 13:04:55 -0700 (PDT) From: Luca Boccassi To: dev@dpdk.org Cc: keith.wiles@intel.com, roy.fan.zhang@intel.com, jingjing.wu@intel.com, wenzhuo.lu@intel.com, rasesh.mody@cavium.com, harish.patil@cavium.com, shahed.shaikh@cavium.com, amr.mokhtar@intel.com, shijith.thotton@cavium.com, ssrinivasan@cavium.com, liang.j.ma@intel.com, peter.mccarthy@intel.com, jerin.jacob@caviumnetworks.com, maciej.czekaj@caviumnetworks.com, arybchenko@solarflare.com, antosh.shukla@caviumnetworks.com, ashish.gupta@cavium.com, yongwang@vmware.com, bruce.richardson@intel.com, thomas@monjalon.net Date: Mon, 10 Sep 2018 21:04:11 +0100 Message-Id: <20180910200415.8340-12-bluca@debian.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180910200415.8340-1-bluca@debian.org> References: <20180910200415.8340-1-bluca@debian.org> Subject: [dpdk-dev] [PATCH 11/15] net/sfc: rename version map after library file name 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: Mon, 10 Sep 2018 20:04:58 -0000 The library is called librte_pmd_sfc_efx, so rename the map file and set the name in the meson file so that the built library names with meson and legacy makefiles are the same Fixes: bfa8d5990cd6 ("net/sfc: support meson build") Cc: stable@dpdk.org Signed-off-by: Luca Boccassi --- drivers/net/sfc/Makefile | 2 +- drivers/net/sfc/meson.build | 2 ++ .../{rte_pmd_sfc_version.map => rte_pmd_sfc_efx_version.map} | 0 3 files changed, 3 insertions(+), 1 deletion(-) rename drivers/net/sfc/{rte_pmd_sfc_version.map => rte_pmd_sfc_efx_version.map} (100%) diff --git a/drivers/net/sfc/Makefile b/drivers/net/sfc/Makefile index 3bb41a0001..2825649599 100644 --- a/drivers/net/sfc/Makefile +++ b/drivers/net/sfc/Makefile @@ -60,7 +60,7 @@ BASE_DRIVER_OBJS=$(sort $(patsubst %.c,%.o,$(notdir $(wildcard $(SRCDIR)/base/*. $(foreach obj, $(BASE_DRIVER_OBJS), \ $(eval CFLAGS_$(obj)+=$(CFLAGS_BASE_DRIVER))) -EXPORT_MAP := rte_pmd_sfc_version.map +EXPORT_MAP := rte_pmd_sfc_efx_version.map LIBABIVER := 1 diff --git a/drivers/net/sfc/meson.build b/drivers/net/sfc/meson.build index 2d34e869d8..d6572b82c0 100644 --- a/drivers/net/sfc/meson.build +++ b/drivers/net/sfc/meson.build @@ -6,6 +6,8 @@ # This software was jointly developed between OKTET Labs (under contract # for Solarflare) and Solarflare Communications, Inc. +name = 'sfc_efx' + if arch_subdir != 'x86' or cc.sizeof('void *') == 4 build = false endif diff --git a/drivers/net/sfc/rte_pmd_sfc_version.map b/drivers/net/sfc/rte_pmd_sfc_efx_version.map similarity index 100% rename from drivers/net/sfc/rte_pmd_sfc_version.map rename to drivers/net/sfc/rte_pmd_sfc_efx_version.map -- 2.18.0