From patchwork Mon Oct 2 08:07:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Sommerseth X-Patchwork-Id: 8 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director5.mail.ord1d.rsapps.net ([172.30.157.12]) by backend31.mail.ord1d.rsapps.net (Dovecot) with LMTP id ILC+BaeO0lnYGAAAgoeIoA for ; Mon, 02 Oct 2017 15:08:24 -0400 Received: from proxy1.mail.iad3a.rsapps.net ([172.27.129.22]) by director5.mail.ord1d.rsapps.net (Dovecot) with LMTP id 1BOlAZb00VkbBQAAsdCWiw ; Mon, 02 Oct 2017 15:08:24 -0400 Received: from smtp50.gate.iad3a ([172.27.255.58]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy1.mail.iad3a.rsapps.net (Dovecot) with LMTP id 1qAJG+yN0lnBRgAA8TVjwQ ; Mon, 02 Oct 2017 15:08:23 -0400 X-Spam-Threshold: 95 X-Spam-Score: 0 X-Spam-Flag: NO X-Virus-Scanned: OK X-MessageSniffer-Scan-Result: 0 X-MessageSniffer-Rules: 0-298-1005-1208-w 0-298-1005-1572-w 0-298-0-7527-f X-CMAE-Scan-Result: 0 X-CNFS-Analysis: v=2.2 cv=UOKfJ2Xy c=1 sm=1 tr=0 a=Q8DxjiC8O3VT/NpP1XjEZQ==:117 a=Q8DxjiC8O3VT/NpP1XjEZQ==:17 a=kj9zAlcOel0A:10 a=xqWC_Br6kY4A:10 a=02M-m0pO-4AA:10 a=WiVod9pSvdkA:10 a=uDo-SIiEAAAA:8 a=9sSjY8p1AAAA:8 a=P_JWiMecAAAA:8 a=FP58Ms26AAAA:8 a=tBwP_fxGVPj9RwKvT-IA:9 a=CjuIK1q_8ugA:10 a=-FEs8UIgK8oA:10 a=NWVoK91CQyQA:10 a=Rkhf4GTZPwEC63LfVcCP:22 a=ub54wNWiXv_DzeFsgEJW:22 a=D0-HAvA3Hk9NMREbgwuX:22 X-Orig-To: justin@openvpn.net X-Originating-Ip: [216.34.181.88] Authentication-Results: smtp50.gate.iad3a.rsapps.net; iprev=pass policy.iprev="216.34.181.88"; 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; dmarc=none (p=nil; dis=none) header.from=openvpn.net X-Classification-ID: 0f38f578-a7a5-11e7-a651-525400c2fb51-1-1 Received: from [216.34.181.88] ([216.34.181.88:63202] helo=lists.sourceforge.net) by smtp50.gate.iad3a.rsapps.net (envelope-from ) (ecelerity 4.2.1.56364 r(Core:4.2.1.14)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 6D/DF-11602-6AE82D95; Mon, 02 Oct 2017 15:08:22 -0400 Received: from localhost ([127.0.0.1] helo=sfs-ml-4.v29.ch3.sourceforge.com) by sfs-ml-4.v29.ch3.sourceforge.com with esmtp (Exim 4.89) (envelope-from ) id 1dz64P-0002yG-NE; Mon, 02 Oct 2017 19:08:01 +0000 Received: from sog-mx-3.v43.ch3.sourceforge.com ([172.29.43.193] helo=mx.sourceforge.net) by sfs-ml-4.v29.ch3.sourceforge.com with esmtps (TLSv1:DHE-RSA-AES256-SHA:256) (Exim 4.89) (envelope-from ) id 1dz64P-0002yA-2R for openvpn-devel@lists.sourceforge.net; Mon, 02 Oct 2017 19:08:01 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Message-Id:Date:Subject:To:From; bh=RynE+X/ipMTeN4RfgVD6xhiqJeQ0oKVaUfSwtyReLvc=; b=i2SbIxiZLygSkmIpXDghMvP8JKqVMfh1CmyJqboNGQLOAJHQuSIpH1jtWRNr8HFOgj30sc0gQ3WU3UYupp8uiOcLaC04TlMc9PwrTfcAZ1fcEdSRNDx4lJKfg36ecehok4JJtngquqMtWIhaWSqeRc9Oz8/C2DsRmXxb0U6v5To=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x; h=Message-Id:Date:Subject:To:From; bh=RynE+X/ipMTeN4RfgVD6xhiqJeQ0oKVaUfSwtyReLvc=; b=ba8ZziXkzMsPf3CZyEgveW6h//MM+ckz+WQaFr/Av8wqTaHchBH6vsD+VqqRR8e8VzX2CGOrHUnXzS78ma0Jd9SToim1VReHs21jO/QCyYUxUWYTTnJhPSpo65G+k+6/pqMm+YDR4MF/571G9d9NKLunVj/x4tGgKa6qQiFUVc8=; Received-SPF: pass (sog-mx-3.v43.ch3.sourceforge.com: domain of sf.lists.topphemmelig.net designates 83.243.40.96 as permitted sender) client-ip=83.243.40.96; envelope-from=openvpn@sf.lists.topphemmelig.net; helo=winterfell.topphemmelig.net; Received: from winterfell.topphemmelig.net ([83.243.40.96]) by sog-mx-3.v43.ch3.sourceforge.com with esmtps (TLSv1:AES256-SHA:256) (Exim 4.76) id 1dz64L-0003w9-BH for openvpn-devel@lists.sourceforge.net; Mon, 02 Oct 2017 19:08:01 +0000 Received: from localhost (unknown [IPv6:::1]) by winterfell.topphemmelig.net (Postfix) with ESMTP id 73852812F1B for ; Mon, 2 Oct 2017 19:07:50 +0000 (UTC) Received: from winterfell.topphemmelig.net ([127.0.0.1]) by localhost (winterfell.topphemmelig.net [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id EDsRCBCIBWms for ; Mon, 2 Oct 2017 21:07:45 +0200 (CEST) Received: from zimbra.sommerseth.email (zimbra.sommerseth.email [172.16.33.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by winterfell.topphemmelig.net (Postfix) with ESMTPS id B9DCD80C829 for ; Mon, 2 Oct 2017 21:07:45 +0200 (CEST) Received: from localhost (localhost [IPv6:::1]) by zimbra.sommerseth.email (Postfix) with ESMTP id 6B02F41DB42B for ; Mon, 2 Oct 2017 21:07:45 +0200 (CEST) Received: from zimbra.sommerseth.email ([IPv6:::1]) by localhost (zimbra.sommerseth.email [IPv6:::1]) (amavisd-new, port 10026) with ESMTP id Fk-cO5cAhUJ4 for ; Mon, 2 Oct 2017 21:07:45 +0200 (CEST) Received: from optimus.homebase.sommerseths.net (unknown [10.35.7.2]) by zimbra.sommerseth.email (Postfix) with ESMTPS id 02EE54128C96 for ; Mon, 2 Oct 2017 21:07:44 +0200 (CEST) From: David Sommerseth To: openvpn-devel@lists.sourceforge.net Date: Mon, 2 Oct 2017 21:07:32 +0200 Message-Id: <20171002190732.12531-1-davids@openvpn.net> X-Mailer: git-send-email 2.13.5 X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. -1.5 SPF_CHECK_PASS SPF reports sender host as permitted sender for sender-domain -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain 0.5 AWL AWL: Adjusted score from AWL reputation of From: address X-Headers-End: 1dz64L-0003w9-BH Subject: [Openvpn-devel] [PATCH] lz4: Fix broken builds when pkg-config is not present but system library is 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: , MIME-Version: 1.0 Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox In commit f91e4863bc1382 we fixed an issue where LZ4_LIBS could be overwritten in some situations. But on systems where lz4 is installed on the system but is lacking pkg-config information, the linker will not know about the lz4 library when completing the build. This fixes the issue by explicitly setting LZ4_LIBS to contain -llz4 if pkg-config test was run and failed verifying the installed lz4 version number. This also ensures that LZ4_LIBS will not be overwritten if it has been provided on the ./configure command line. Signed-off-by: David Sommerseth --- configure.ac | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 394f5b09..6f59baef 100644 --- a/configure.ac +++ b/configure.ac @@ -1093,7 +1093,9 @@ if test "$enable_lz4" = "yes" && test "$enable_comp_stub" = "no"; then PKG_CHECK_MODULES([LZ4], [liblz4 >= 1.7.1 liblz4 < 100], [have_lz4="yes"], - [] # If this fails, we will do another test next + [LZ4_LIBS="-llz4"] # If this fails, we will do another test next. + # We also add set LZ4_LIBS otherwise the + # linker will not know about the lz4 library ) fi