From patchwork Sun Oct 28 03:54:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steffan Karger X-Patchwork-Id: 577 X-Patchwork-Delegate: davids@openvpn.net Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director12.mail.ord1d.rsapps.net ([172.30.191.6]) by backend30.mail.ord1d.rsapps.net with LMTP id wALbIA/O1VtfUgAAIUCqbw for ; Sun, 28 Oct 2018 10:56:15 -0400 Received: from proxy11.mail.ord1d.rsapps.net ([172.30.191.6]) by director12.mail.ord1d.rsapps.net with LMTP id KIdTIA/O1VtjWwAAIasKDg ; Sun, 28 Oct 2018 10:56:15 -0400 Received: from smtp27.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 LMTP id mHnxHw/O1VvAFQAAgKDEHA ; Sun, 28 Oct 2018 10:56:15 -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: smtp27.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=karger-me.20150623.gappssmtp.com; dmarc=none (p=nil; dis=none) header.from=karger.me X-Suspicious-Flag: YES X-Classification-ID: 9dadd058-dac1-11e8-a337-5254003773d7-1-1 Received: from [216.105.38.7] ([216.105.38.7:10398] helo=lists.sourceforge.net) by smtp27.gate.ord1d.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id B8/7A-16068-E0EC5DB5; Sun, 28 Oct 2018 10:56:15 -0400 Received: from [127.0.0.1] (helo=sfs-ml-4.v29.lw.sourceforge.com) by sfs-ml-4.v29.lw.sourceforge.com with esmtp (Exim 4.90_1) (envelope-from ) id 1gGmT3-0004Ni-KU; Sun, 28 Oct 2018 14:55:05 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-4.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1gGmT1-0004Nb-Si for openvpn-devel@lists.sourceforge.net; Sun, 28 Oct 2018 14:55:03 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=References:In-Reply-To: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:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=/CY1RJv3s5W9FXsyqr7lV3jBx3YNRpp0xIKhsbgw3x4=; b=DmKwPcdvrn3Yt/TEy7t6Jo9qyx cAOAAKw609VbXRHAOTSaftw4ZwU1vAIv7vE2PTtWxT8Deqh8CFCipWpZAmRz/9wtRrpYsdCGl8c/8 c+tPwhLJDQeXxDx9f/edVzAjyYHpatyY6vZYZzfA9rLateEdzaYIjP1NC4IJk9QNc5rs=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=References:In-Reply-To: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:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=/CY1RJv3s5W9FXsyqr7lV3jBx3YNRpp0xIKhsbgw3x4=; b=W7JLdqDxBUj5f3B9kRxyZSHUom TqGs/TXN/ZjXebhNSUg/K5V9dugnKdbjzCfvvrMAcMthV02b3VUkE6uiFfP0mFDdeEsq9LCyRFKQA /06rcuB2EQs1+UGsiu7Iy4cb6TNCHg9JlGaG4dapOzGUfMrBC4mZXBY3k8VoVaJNREes=; Received: from mail-ed1-f65.google.com ([209.85.208.65]) by sfi-mx-3.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.90_1) id 1gGmSw-00DRIv-6B for openvpn-devel@lists.sourceforge.net; Sun, 28 Oct 2018 14:55:03 +0000 Received: by mail-ed1-f65.google.com with SMTP id w19-v6so5123120eds.1 for ; Sun, 28 Oct 2018 07:54:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=karger-me.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=/CY1RJv3s5W9FXsyqr7lV3jBx3YNRpp0xIKhsbgw3x4=; b=cNQ0uL7gxvI66hywzIRZZhqW9f00jnAQU1lS6yRW/h3vGGQjrFcCxqHHe9q4X2rD3S b0MqZ1fM3muJoblpffsnWApWpY9qGJrqDZBEbB+VhRFKRw7ldvAojJ9o1V9b1tR4t0yQ LaFFZXNO0L21bTJ1b7bzQcLZRKAYmY0e++wmCgUlcadf/Kd2fYaUcRWN2WCD2C+H2ND4 KBCAC7dVCB1+N6AH7qim0MaU1FU3GGaQQ9aHg5Gwv3YLOYch4vHSIIaNbjMRrQBK3JMx rEKTz6SKOuMHNi5GA2rEcFtFJ4VPLes0qmVD77MXwLsrU3fueLG9NgZj4tDihreFNQ/m NUTQ== 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=/CY1RJv3s5W9FXsyqr7lV3jBx3YNRpp0xIKhsbgw3x4=; b=mmO3HIMTQKw6JilQcMjOBzl64vm7pwMyQm4IaMjz6QUoO3ICtB+y5HE+CpR3flfEHy RT/sVpA1V3B6sz2dgeP3y+jPQqivMTMqfxddjKpH3jYtdljFcH73MkB0WJRwYHZhZoBS fZQfSk68NLjMUyO3jUR9K0pPxhiA1fVbjsxflRM85OG5M9tvO34NCi/VDU2dg0FkI/Cx +59WaDnbfu6x4osXlrZkv4X+WHWg2TYBXYzeR12+lgfjElO4KCHUrW1AEmgBSOhjZ3AU DnOasJazIoN3PSqehSqPRkgNqolnZVB+21aJXsI3RL5C5uKQY5L0Nk4qUoPQgKjVlW1v 86+g== X-Gm-Message-State: AGRZ1gKtfR8xPiuL9F9910nA7GZbuwuupnuDA5a+tXk7aYpQUpIiR4PO Jyzw+COMiCDhq/rQEGDziEPOTmyn9q4= X-Google-Smtp-Source: AJdET5eLN+d+zRFzb0ztSsKu3tFbfyZc8NxSrG516mLEnQ14APtQoZPvAqYlRP4oDrln/HA78SyHDA== X-Received: by 2002:a50:9386:: with SMTP id o6-v6mr10788460eda.248.1540738491156; Sun, 28 Oct 2018 07:54:51 -0700 (PDT) Received: from vesta.fritz.box ([2001:985:e54:1:8d15:9b4:2db7:59df]) by smtp.gmail.com with ESMTPSA id j13-v6sm1543896eja.17.2018.10.28.07.54.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 28 Oct 2018 07:54:50 -0700 (PDT) From: Steffan Karger To: openvpn-devel@lists.sourceforge.net Date: Sun, 28 Oct 2018 15:54:49 +0100 Message-Id: <20181028145449.12676-1-steffan@karger.me> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.208.65 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [209.85.208.65 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -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 -0.0 DKIMWL_WL_MED DKIMwl.org - Whitelisted Medium sender X-Headers-End: 1gGmSw-00DRIv-6B Subject: [Openvpn-devel] [PATCH v2] cmocka: use relative paths 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 Simplifies the build scripts, and fixes my CI, where paths on the test slave can be different from paths on the build slave. Signed-off-by: Steffan Karger Acked-By: David Sommerseth --- v2: rebase on master, fix in-source builds (thanks dazo for spotting) .gitignore | 2 +- configure.ac | 11 ++--------- vendor/Makefile.am | 16 ++++++++-------- 3 files changed, 11 insertions(+), 18 deletions(-) diff --git a/.gitignore b/.gitignore index 25009d81..5ef9c14d 100644 --- a/.gitignore +++ b/.gitignore @@ -56,7 +56,7 @@ doc/openvpn.8.html distro/rpm/openvpn.spec distro/systemd/*.service sample/sample-keys/sample-ca/ -vendor/.build +vendor/cmocka_build vendor/dist build/msvc/msvc-generate/version.m4 diff --git a/configure.ac b/configure.ac index 1e6891b1..7fe9b6e6 100644 --- a/configure.ac +++ b/configure.ac @@ -1353,15 +1353,8 @@ AC_SUBST([sampledir]) AC_SUBST([systemdunitdir]) AC_SUBST([tmpfilesdir]) -VENDOR_SRC_ROOT="\$(abs_top_srcdir)/vendor/" -VENDOR_DIST_ROOT="\$(abs_top_builddir)/vendor/dist" -VENDOR_BUILD_ROOT="\$(abs_top_builddir)/vendor/.build" -AC_SUBST([VENDOR_SRC_ROOT]) -AC_SUBST([VENDOR_BUILD_ROOT]) -AC_SUBST([VENDOR_DIST_ROOT]) - -TEST_LDFLAGS="${OPTIONAL_CRYPTO_LIBS} ${OPTIONAL_PKCS11_LIBS} -lcmocka -L\$(abs_top_builddir)/vendor/dist/lib -Wl,-rpath,\$(abs_top_builddir)/vendor/dist/lib" -TEST_CFLAGS="${OPTIONAL_CRYPTO_CFLAGS} ${OPTIONAL_PKCS11_CFLAGS} -I\$(top_srcdir)/include -I\$(abs_top_builddir)/vendor/dist/include" +TEST_LDFLAGS="${OPTIONAL_CRYPTO_LIBS} ${OPTIONAL_PKCS11_HELPER_LIBS} -lcmocka -L\$(top_builddir)/vendor/dist/lib -Wl,-rpath,\$(top_builddir)/vendor/dist/lib" +TEST_CFLAGS="${OPTIONAL_CRYPTO_CFLAGS} ${OPTIONAL_PKCS11_HELPER_CFLAGS} -I\$(top_srcdir)/include -I\$(top_builddir)/vendor/dist/include" AC_SUBST([TEST_LDFLAGS]) AC_SUBST([TEST_CFLAGS]) diff --git a/vendor/Makefile.am b/vendor/Makefile.am index 674784ab..46072c3c 100644 --- a/vendor/Makefile.am +++ b/vendor/Makefile.am @@ -1,18 +1,18 @@ -# needs an absolute path bc. of the cmake invocation -cmockasrc = "@VENDOR_SRC_ROOT@/cmocka" -cmockabuild = "@VENDOR_BUILD_ROOT@/cmocka" -cmockainstall = "@VENDOR_DIST_ROOT@" +cmockasrc = $(srcdir)/cmocka +# Not just '$(builddir)/cmocka', because cmocka requires an out-of-source build +cmockabuild = $(builddir)/cmocka_build +cmockadist = $(builddir)/dist MAINTAINERCLEANFILES = \ $(srcdir)/Makefile.in \ "$(cmockabuild)" \ - "$(cmockainstall)" \ - "@VENDOR_BUILD_ROOT@" + "$(cmockadist)" libcmocka: if CMOCKA_INITIALIZED - mkdir -p $(cmockabuild) $(cmockainstall) - (cd $(cmockabuild) && cmake -DCMAKE_INSTALL_PREFIX=$(cmockainstall) $(cmockasrc) && make && make install) + mkdir -p $(cmockabuild) $(cmockadist) + ## Compensate for the cd in the paths + (cd $(cmockabuild) && cmake -DCMAKE_INSTALL_PREFIX=../$(cmockadist) ../$(cmockasrc) && make && make install) endif check: libcmocka