From patchwork Sun Sep 13 22:44:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lev Stipakov X-Patchwork-Id: 1447 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director11.mail.ord1d.rsapps.net ([172.30.191.6]) by backend30.mail.ord1d.rsapps.net with LMTP id gCYZO9ktX1/VNAAAIUCqbw (envelope-from ) for ; Mon, 14 Sep 2020 04:46:17 -0400 Received: from proxy11.mail.ord1d.rsapps.net ([172.30.191.6]) by director11.mail.ord1d.rsapps.net with LMTP id mBAcO9ktX19cQQAAvGGmqA (envelope-from ) for ; Mon, 14 Sep 2020 04:46:17 -0400 Received: from smtp35.gate.ord1d ([172.30.191.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy11.mail.ord1d.rsapps.net with LMTPS id 8LEHH9UtX1+JQQAAgKDEHA (envelope-from ) for ; Mon, 14 Sep 2020 04:46:13 -0400 X-Spam-Threshold: 95 X-Spam-Score: 0 X-Spam-Flag: NO X-Virus-Scanned: OK X-Orig-To: openvpnslackdevel@openvpn.net X-Originating-Ip: [216.105.38.7] Authentication-Results: smtp35.gate.ord1d.rsapps.net; iprev=pass policy.iprev="216.105.38.7"; spf=pass smtp.mailfrom="openvpn-devel-bounces@lists.sourceforge.net" smtp.helo="lists.sourceforge.net"; dkim=fail (signature verification failed) header.d=sourceforge.net; dkim=fail (signature verification failed) header.d=sf.net; dkim=fail (signature verification failed) header.d=gmail.com; dmarc=fail (p=none; dis=none) header.from=gmail.com X-Suspicious-Flag: YES X-Classification-ID: c0ea09e8-f666-11ea-8bdd-525400a7b7b4-1-1 Received: from [216.105.38.7] ([216.105.38.7:50032] helo=lists.sourceforge.net) by smtp35.gate.ord1d.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id A8/5C-09822-9DD2F5F5; Mon, 14 Sep 2020 04:46:17 -0400 Received: from [127.0.0.1] (helo=sfs-ml-1.v29.lw.sourceforge.com) by sfs-ml-1.v29.lw.sourceforge.com with esmtp (Exim 4.90_1) (envelope-from ) id 1kHk6w-0004iT-Gz; Mon, 14 Sep 2020 08:45:18 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-1.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kHk6u-0004hz-Qw for openvpn-devel@lists.sourceforge.net; Mon, 14 Sep 2020 08:45:16 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=hz7DTas+EdSY/pTiD0xIlOehbitvst3bL8HUtqCTgZI=; b=Vk7z/K6o7pxVaHQJhnp7F1hNlr Ux97leZqGryaeC/CNpjlptxyZ5qThzq5+k7KyImYKG4ri+MJA1U8WW1/sDeIzdoCnOnKQKs6VOrY2 5DAvHomaNXS5ZZHxj+r2ES987kfOT2ouJxtDoijB5HkewRpGNFdSNBikJ5QY7tRIyE/0=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:MIME-Version: Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=hz7DTas+EdSY/pTiD0xIlOehbitvst3bL8HUtqCTgZI=; b=hZ3D5LZ//mjrEwpF+qRef+9mRW o98krqtnC08HsqeTvpj35TWtjM6Gc9iJC7r6ArD7VtVPhtGEJM1eWf4K8Uy2DNgBxfMn+3x1vfGwe lot9+M6IKDHbTsmODW1jLr7cxGa12aWBXcVJteGkrrNXvC73PLn6dpKrAhImMnO7Vje8=; Received: from mail-wm1-f68.google.com ([209.85.128.68]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.92.2) id 1kHk6n-008tIK-Vr for openvpn-devel@lists.sourceforge.net; Mon, 14 Sep 2020 08:45:16 +0000 Received: by mail-wm1-f68.google.com with SMTP id x23so9791261wmi.3 for ; Mon, 14 Sep 2020 01:45:09 -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; bh=hz7DTas+EdSY/pTiD0xIlOehbitvst3bL8HUtqCTgZI=; b=uKmjY/v3DUAlmQ6589T4vhvVUNk1Tzbmte1qVkrIeY0NhpaWBjvjw2WHJ2yzlgqhoo +l1QFXp1YUgksHWv1JmiCmQ0TySGs6Wsu8pCPCNl7Ac+0rf+ruU9b3RZSsDci4X1fu87 GN0s4wVM9QhQjrDQOd2/XY7O51Bie9yv+qa8iCaz6y2F4ILAd9qN8KIbPC/cc7BbN79H j0H0ZOE6RUJ5WcRqx9L4Xd9vM3ucesWX6iLxOpeCm90fySy7nHoSwxlFJfP5FifPYO+l jPYmWidfwVtVE/qD8LhixGpqaUgxsM24uaYjaQFzm2GnpBU0ExtSEQ4aACzS2PbPQoZm j8dg== 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; bh=hz7DTas+EdSY/pTiD0xIlOehbitvst3bL8HUtqCTgZI=; b=UBsQhKI1YAOkpvE4O1CpZs+7SM5Hsi0VnjwfVGDA8ehvN2nrZEZ7EgaLSOnwrqssmq DE//kAYjD21AtVcChfPPVxqbdz9PUwWDAu/WRz2kUfOrCPOMl0ezgbP4p/yK/Y2vu7lQ vcnT4CR159Ynv2K0Vl7LfIYI3qwspCDV8zPw2/jBK8VnNkBeV25uBZtmtxu3ax7LATdY Jf0DNrRdkIF45n7AX34cZFC4ES+9Dm8yBzO4/pi25F5rlDWmNBuRmNjmXM5pQV5/rxfH ZovowcJBV05l/0EcHLoJMgi0zlqNq2QD4H1JlRRKKahlpkopW6dCR5mV7mStQ/RJDku0 XiMw== X-Gm-Message-State: AOAM531OSPMJmbxMr0ICC+wJSKDxvANmisC1xHrBiQRGPt93ST0hCgDP QPmsCTEvC6cIlOvTqc39Ckzc46Bsp1RwsQ== X-Google-Smtp-Source: ABdhPJwdMGtr4EaiSDspxZj/b2CqMIzBGxVs5+quVQZeLMRYksoJeVE4ASQInIxXlArXJQreg2L58w== X-Received: by 2002:a7b:cde8:: with SMTP id p8mr10078281wmj.106.1600073096027; Mon, 14 Sep 2020 01:44:56 -0700 (PDT) Received: from LAPTOP-4L3N7KFS.localdomain (nat2.panoulu.net. [185.38.2.2]) by smtp.gmail.com with ESMTPSA id v6sm19393709wrt.90.2020.09.14.01.44.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Sep 2020 01:44:55 -0700 (PDT) From: Lev Stipakov To: openvpn-devel@lists.sourceforge.net Date: Mon, 14 Sep 2020 11:44:44 +0300 Message-Id: <20200914084444.96-1-lstipakov@gmail.com> X-Mailer: git-send-email 2.17.1 X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. 0.0 URIBL_BLOCKED ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [URIs: openvpn.net] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (lstipakov[at]gmail.com) -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.128.68 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.128.68 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid X-Headers-End: 1kHk6n-008tIK-Vr Subject: [Openvpn-devel] [PATCH] msvc: better support for 32bit architecture X-BeenThere: openvpn-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Lev Stipakov MIME-Version: 1.0 Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox From: Lev Stipakov Previously dependency directory was hardcoded to ..\openvpn-build\msvc\image which means that to build for 32bit architecture, one needs to rebuild dependencies and do the same again for 64bit architecture. Add architecture's "bitness" to dependency directory. As a bonus, add missing libraries to 32bit targets. This requires correspondig change to openvpn-build: https://github.com/OpenVPN/openvpn-build/pull/190 Signed-off-by: Lev Stipakov Acked-by: Gert Doering --- src/compat/PropertySheet.props | 2 +- src/openvpn/openvpn.vcxproj | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/compat/PropertySheet.props b/src/compat/PropertySheet.props index fdded318..4f94b972 100644 --- a/src/compat/PropertySheet.props +++ b/src/compat/PropertySheet.props @@ -3,7 +3,7 @@ $(SolutionDir) - $(SOURCEBASE)\..\openvpn-build\msvc\image + $(SOURCEBASE)\..\openvpn-build\msvc\image$(PlatformArchitecture) $(OPENVPN_DEPROOT) $(OPENVPN_DEPROOT) $(OPENVPN_DEPROOT) diff --git a/src/openvpn/openvpn.vcxproj b/src/openvpn/openvpn.vcxproj index 5367979d..3863854b 100644 --- a/src/openvpn/openvpn.vcxproj +++ b/src/openvpn/openvpn.vcxproj @@ -92,7 +92,7 @@ - legacy_stdio_definitions.lib;Ncrypt.lib;libssl.lib;libcrypto.lib;lzo2.lib;pkcs11-helper.dll.lib;gdi32.lib;ws2_32.lib;wininet.lib;crypt32.lib;iphlpapi.lib;winmm.lib;Fwpuclnt.lib;Rpcrt4.lib;%(AdditionalDependencies) + legacy_stdio_definitions.lib;Ncrypt.lib;libssl.lib;libcrypto.lib;lzo2.lib;pkcs11-helper.dll.lib;gdi32.lib;ws2_32.lib;wininet.lib;crypt32.lib;iphlpapi.lib;winmm.lib;Fwpuclnt.lib;Rpcrt4.lib;setupapi.lib;%(AdditionalDependencies) $(OPENSSL_HOME)/lib;$(LZO_HOME)/lib;$(PKCS11H_HOME)/lib;%(AdditionalLibraryDirectories) Console @@ -122,7 +122,7 @@ - legacy_stdio_definitions.lib;Ncrypt.lib;libssl.lib;libcrypto.lib;lzo2.lib;pkcs11-helper.dll.lib;gdi32.lib;ws2_32.lib;wininet.lib;crypt32.lib;iphlpapi.lib;winmm.lib;Fwpuclnt.lib;Rpcrt4.lib;%(AdditionalDependencies) + legacy_stdio_definitions.lib;Ncrypt.lib;libssl.lib;libcrypto.lib;lzo2.lib;pkcs11-helper.dll.lib;gdi32.lib;ws2_32.lib;wininet.lib;crypt32.lib;iphlpapi.lib;winmm.lib;Fwpuclnt.lib;Rpcrt4.lib;setupapi.lib;%(AdditionalDependencies) $(OPENSSL_HOME)/lib;$(LZO_HOME)/lib;$(PKCS11H_HOME)/lib;%(AdditionalLibraryDirectories) Console