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 E953DA04E6; Fri, 30 Oct 2020 18:50:44 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 330453976; Fri, 30 Oct 2020 18:47:55 +0100 (CET) Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by dpdk.org (Postfix) with ESMTP id D18CB378B for ; Fri, 30 Oct 2020 18:47:54 +0100 (CET) Received: by mail-wm1-f67.google.com with SMTP id c16so3710621wmd.2 for ; Fri, 30 Oct 2020 10:47:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mayadata-io.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=KFAUuaLlRwyaz0AmjJ2Nq8cVPozNXSMgl1nrGolbq5A=; b=I3gvVXG+XI5e7TubrIQwUSMu5+urze64X22qmEXUhtBvUdxv+Q5/ikjEzkIbCB4w5z 09HlCictngOZ7W24Zh0hpE4OKvMBoj8Bj3u3Mk8+8IZ+gEFJHU4Coj2E4Sry4odZYApc jCmqcfcZVErLAGptADbE1R0Qrt7IA8zEU5dt9ZxuxpSq8aO62anGhTIKuZV+ohWVgPNQ Y+YrltVq1fzNmUPMXhnY/JQwInsZ3jHpdh6VYdzkfh8Q/vYyHS5fttbzgtMSYTB4WzCK MUYWYxcm427dVkY6g/cKGYml2paH1r5dMSvcolnH878o+3wQSzkdINZCj4BR1AzbVyZS 4z8g== 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=KFAUuaLlRwyaz0AmjJ2Nq8cVPozNXSMgl1nrGolbq5A=; b=jf3eeotE5GXj6Ub1IeeRKTNO51xECFxqBqwgKsHH9Um0PmiAgCw45aWkKrR4B6KKvj qOg/rltldSKYrhJl8Q+4LcA+jCcVQzEoFRZ7vdCJ7fJb/g5VS3T1jq5U8+g9rjvWzFCJ wSJdP2GWukaGiSWgDtY1un6v5vs0k6fv9eJz5bmtwup4nqVQffCL4Iu+YGZAmA3O5KHY 2eM980OzBRJwWV5c0e2hJqpL2N5kyXgClsrZt67jcbs+uZZ609Czi5Zwgr38G4+/l48v iIgvG6hsXCiQ6ABy2jFvrxf76IPjqBZJg+/9vPXHvqSbPycECusDu0/TNbsQzADl6oKt jp8Q== X-Gm-Message-State: AOAM5317cZmpmGkoSWyvlwwNk9FDfvMon/eEd89+yMkvlFwCLlhJVX14 IbGu35a676AWUMJbXhw1K9vzVA== X-Google-Smtp-Source: ABdhPJxvtjFTcvP1aOSmvpKZFBgAaW+lR/QyNzgCpJfBocWWkUlTz+942MPkbVNXDu6CjfuEUTZYzg== X-Received: by 2002:a1c:2ec6:: with SMTP id u189mr4082271wmu.85.1604080073605; Fri, 30 Oct 2020 10:47:53 -0700 (PDT) Received: from FENIX.localdomain (cpc98320-croy25-2-0-cust77.19-2.cable.virginm.net. [80.235.134.78]) by smtp.gmail.com with ESMTPSA id f5sm5321679wmh.16.2020.10.30.10.47.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Oct 2020 10:47:52 -0700 (PDT) From: Nick Connolly To: Bruce Richardson Cc: dev@dpdk.org, Nick Connolly Date: Fri, 30 Oct 2020 17:46:17 +0000 Message-Id: <20201030174617.1958-2-nick.connolly@mayadata.io> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201030174617.1958-1-nick.connolly@mayadata.io> References: <20201030174617.1958-1-nick.connolly@mayadata.io> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH] windows: minor build fixes 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" Don't run symlink-drivers-solibs.sh as part of 'install' because Windows doesn't support shell scripts. Meson versions >= 0.54.0 include support for handling /implib with msvc link. Specifying it explicitly causes failures when linking against the dll. Tested using Link 14.27.29112.0 and Clang 11.0.0. Signed-off-by: Nick Connolly --- config/meson.build | 8 +++++--- drivers/meson.build | 6 ++++-- lib/meson.build | 6 ++++-- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/config/meson.build b/config/meson.build index 258b01d06..a29693b88 100644 --- a/config/meson.build +++ b/config/meson.build @@ -57,9 +57,11 @@ eal_pmd_path = join_paths(get_option('prefix'), driver_install_path) # driver .so files often depend upon the bus drivers for their connect bus, # e.g. ixgbe depends on librte_bus_pci. This means that the bus drivers need # to be in the library path, so symlink the drivers from the main lib directory. -meson.add_install_script('../buildtools/symlink-drivers-solibs.sh', - get_option('libdir'), - pmd_subdir_opt) +if not is_windows + meson.add_install_script('../buildtools/symlink-drivers-solibs.sh', + get_option('libdir'), + pmd_subdir_opt) +endif # set the machine type and cflags for it if meson.is_cross_build() diff --git a/drivers/meson.build b/drivers/meson.build index 4bb7e9218..6b50f7238 100644 --- a/drivers/meson.build +++ b/drivers/meson.build @@ -186,8 +186,10 @@ foreach subpath:subdirs lk_deps = [version_map, def_file, mingw_map] if is_windows if is_ms_linker - lk_args = ['-Wl,/def:' + def_file.full_path(), - '-Wl,/implib:drivers\\' + implib] + lk_args = ['-Wl,/def:' + def_file.full_path()] + if meson.version().version_compare('<0.54.0') + lk_args += ['-Wl,/implib:drivers\\' + implib] + endif else lk_args = ['-Wl,--version-script=' + mingw_map.full_path()] endif diff --git a/lib/meson.build b/lib/meson.build index 1bb019720..ed00f8914 100644 --- a/lib/meson.build +++ b/lib/meson.build @@ -157,8 +157,10 @@ foreach l:libraries output: '@0@_mingw.map'.format(libname)) if is_ms_linker - lk_args = ['-Wl,/def:' + def_file.full_path(), - '-Wl,/implib:lib\\' + implib] + lk_args = ['-Wl,/def:' + def_file.full_path()] + if meson.version().version_compare('<0.54.0') + lk_args += ['-Wl,/implib:lib\\' + implib] + endif else if is_windows lk_args = ['-Wl,--version-script=' + mingw_map.full_path()] -- 2.25.1