From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
	by inbox.dpdk.org (Postfix) with ESMTP id 5D83FA0C43;
	Sun, 29 Aug 2021 04:16:18 +0200 (CEST)
Received: from [217.70.189.124] (localhost [127.0.0.1])
	by mails.dpdk.org (Postfix) with ESMTP id D157A410FE;
	Sun, 29 Aug 2021 04:16:12 +0200 (CEST)
Received: from mail-lj1-f175.google.com (mail-lj1-f175.google.com
 [209.85.208.175])
 by mails.dpdk.org (Postfix) with ESMTP id C2C6C40042
 for <dev@dpdk.org>; Sun, 29 Aug 2021 04:16:10 +0200 (CEST)
Received: by mail-lj1-f175.google.com with SMTP id f2so19001052ljn.1
 for <dev@dpdk.org>; Sat, 28 Aug 2021 19:16:10 -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=KqfCBw+ETW5taV9Wx999jSr4lWL4ZwEE2inmGhW5dfw=;
 b=q0Y5DL93KjGFhJ4C/v/006g7SmX9XaRnxvB3voH7Jj13kZrFJvru4EYCY+6ruVoJfC
 ZxpQBCerXV6eL2oA7dE5rXeyh2RTC0wyqxEjUuoGsMNYgZ+lv/tH6KLvVOdBIFintOul
 82ViwYjse221NsS+OG9IPG8SZk/SCPsvJXuOmVnsFyolD9Cp7/aFf6at2HAjMmlnZGpF
 +Yjw+zWfzfkl4E0cf3S04E7YgFd88c/W2F0t/xpoNdNvzk9dBRA9IrSnex7gzC7+Ag0e
 ZIZnSCHvevOpy9I6Xs0yyg79zEjg5dxuMOOpx79MaRhM3WaMoialexf8yZ6M4rfEfyxR
 mc+A==
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=KqfCBw+ETW5taV9Wx999jSr4lWL4ZwEE2inmGhW5dfw=;
 b=saa4FTGKx0o07rh+hdZq1JOWWEH4a4KtN84KGS20GKKej2aofiq2lgniaOHB4X0M8o
 LA3qDJqYaxPc827NdJUIs23RNmIWm4/txCkfknAaOtqElbgyv1nj965EI/LIvhEcsPFJ
 FXYUUV8uNWewA4OwVpIRM2L6VKY3qRCpm9mAtHrnO0I03u3VKUmDjz6E8XefofZS5aZ/
 dwV7eXtxug4OOYiTpbHc10yb2omGQHFJVbcytcAEU/8To/6FjseV3zKXpDx0zslXyXFx
 gg5NerKiFuMBxTCTqQfwGlGgKCg4LdBwo+4Q43IBqcuUfJpZezD+Y//zI9k6fPGldJCi
 4LZQ==
X-Gm-Message-State: AOAM530SAy24b+36QiyCOMm4ja1eQJFoH4LHzX/QrUTozZ+WP5RbDVpz
 5BaKQpYxYNOXbdg1RNy/GS0SHflni/A=
X-Google-Smtp-Source: ABdhPJypzW0jAFcWKGfyNHCEN2EgyKFqKN8whtBDkXRfze2oP0zZxoTLcxVZhnDy969MELzNXwfy6Q==
X-Received: by 2002:a2e:934b:: with SMTP id m11mr15021640ljh.284.1630203369970; 
 Sat, 28 Aug 2021 19:16:09 -0700 (PDT)
Received: from sovereign.. (broadband-37-110-65-23.ip.moscow.rt.ru.
 [37.110.65.23])
 by smtp.gmail.com with ESMTPSA id z5sm1263384ljz.23.2021.08.28.19.16.09
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Sat, 28 Aug 2021 19:16:09 -0700 (PDT)
From: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>
To: dev@dpdk.org
Cc: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>, thomas@monjalon.net,
 Ray Kinsella <mdr@ashroe.eu>, David Marchand <david.marchand@redhat.com>
Date: Sun, 29 Aug 2021 05:16:01 +0300
Message-Id: <20210829021602.290466-2-dmitry.kozliuk@gmail.com>
X-Mailer: git-send-email 2.29.3
In-Reply-To: <20210829021602.290466-1-dmitry.kozliuk@gmail.com>
References: <20210829021602.290466-1-dmitry.kozliuk@gmail.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: [dpdk-dev] [PATCH 1/2] eal: remove Windows-specific list of common
 files
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
 <mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
 <mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>

The majority of common EAL sources that are built for all platforms were
listed separately for Windows and for other OS. It seems that developers
adding modules to EAL perceived this as if Windows supported
only a limited subset of modules and only added new ones into another.
Factor the truly common modules into a shared list,
then extend it with modules supported by different platforms.

When the two lists were created, UUID API implementation was removed
from Windows build (apparently by mistake), then excluded from the
export list for no reason other than not being built. Restore it.

Fixes: df3ff6be2b33 ("eal: simplify meson build of common directory")
Cc: thomas@monjalon.net

Signed-off-by: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>
---
 lib/eal/common/meson.build | 63 +++++++++-----------------------------
 lib/eal/version.map        |  8 ++---
 2 files changed, 19 insertions(+), 52 deletions(-)

diff --git a/lib/eal/common/meson.build b/lib/eal/common/meson.build
index edfca77779..6d01b0f072 100644
--- a/lib/eal/common/meson.build
+++ b/lib/eal/common/meson.build
@@ -5,54 +5,16 @@ includes += include_directories('.')
 
 cflags += [ '-DABI_VERSION="@0@"'.format(abi_version) ]
 
-if is_windows
-    sources += files(
-            'eal_common_bus.c',
-            'eal_common_class.c',
-            'eal_common_config.c',
-            'eal_common_debug.c',
-            'eal_common_dev.c',
-            'eal_common_devargs.c',
-            'eal_common_dynmem.c',
-            'eal_common_errno.c',
-            'eal_common_fbarray.c',
-            'eal_common_hexdump.c',
-            'eal_common_launch.c',
-            'eal_common_lcore.c',
-            'eal_common_log.c',
-            'eal_common_mcfg.c',
-            'eal_common_memalloc.c',
-            'eal_common_memory.c',
-            'eal_common_memzone.c',
-            'eal_common_options.c',
-            'eal_common_string_fns.c',
-            'eal_common_tailqs.c',
-            'eal_common_thread.c',
-            'eal_common_trace_points.c',
-            'malloc_elem.c',
-            'malloc_heap.c',
-            'rte_malloc.c',
-            'eal_common_timer.c',
-            'rte_random.c',
-            'rte_reciprocal.c',
-            'rte_service.c',
-            'rte_version.c',
-    )
-    subdir_done()
-endif
-
 sources += files(
         'eal_common_bus.c',
-        'eal_common_cpuflags.c',
         'eal_common_class.c',
         'eal_common_config.c',
         'eal_common_debug.c',
-        'eal_common_devargs.c',
         'eal_common_dev.c',
+        'eal_common_devargs.c',
         'eal_common_errno.c',
         'eal_common_fbarray.c',
         'eal_common_hexdump.c',
-        'eal_common_hypervisor.c',
         'eal_common_launch.c',
         'eal_common_lcore.c',
         'eal_common_log.c',
@@ -61,28 +23,33 @@ sources += files(
         'eal_common_memory.c',
         'eal_common_memzone.c',
         'eal_common_options.c',
-        'eal_common_proc.c',
         'eal_common_string_fns.c',
         'eal_common_tailqs.c',
         'eal_common_thread.c',
         'eal_common_timer.c',
-        'eal_common_trace.c',
-        'eal_common_trace_ctf.c',
         'eal_common_trace_points.c',
-        'eal_common_trace_utils.c',
         'eal_common_uuid.c',
-        'hotplug_mp.c',
         'malloc_elem.c',
         'malloc_heap.c',
-        'malloc_mp.c',
-        'rte_keepalive.c',
         'rte_malloc.c',
         'rte_random.c',
         'rte_reciprocal.c',
         'rte_service.c',
         'rte_version.c',
 )
-
-if is_linux
+if is_linux or is_windows
     sources += files('eal_common_dynmem.c')
 endif
+if not is_windows
+    sources += files(
+            'eal_common_cpuflags.c',
+            'eal_common_hypervisor.c',
+            'eal_common_proc.c',
+            'eal_common_trace.c',
+            'eal_common_trace_ctf.c',
+            'eal_common_trace_utils.c',
+            'hotplug_mp.c',
+            'malloc_mp.c',
+            'rte_keepalive.c',
+    )
+endif
diff --git a/lib/eal/version.map b/lib/eal/version.map
index beeb986adc..a40e4bc659 100644
--- a/lib/eal/version.map
+++ b/lib/eal/version.map
@@ -194,10 +194,10 @@ DPDK_22 {
 	rte_thread_get_affinity;
 	rte_thread_set_affinity;
 	rte_thread_setname;
-	rte_uuid_compare; # WINDOWS_NO_EXPORT
-	rte_uuid_is_null; # WINDOWS_NO_EXPORT
-	rte_uuid_parse; # WINDOWS_NO_EXPORT
-	rte_uuid_unparse; # WINDOWS_NO_EXPORT
+	rte_uuid_compare;
+	rte_uuid_is_null;
+	rte_uuid_parse;
+	rte_uuid_unparse;
 	rte_version; # WINDOWS_NO_EXPORT
 	rte_vfio_clear_group; # WINDOWS_NO_EXPORT
 	rte_vfio_container_create; # WINDOWS_NO_EXPORT
-- 
2.29.3