From patchwork Tue Aug 21 12:08:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steffan Karger X-Patchwork-Id: 453 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director7.mail.ord1d.rsapps.net ([172.27.255.8]) by backend30.mail.ord1d.rsapps.net (Dovecot) with LMTP id HJq/GL2NfFsFHwAAIUCqbw for ; Tue, 21 Aug 2018 18:10:05 -0400 Received: from proxy15.mail.iad3a.rsapps.net ([172.27.255.8]) by director7.mail.ord1d.rsapps.net (Dovecot) with LMTP id PykGD72NfFuyWwAAovjBpQ ; Tue, 21 Aug 2018 18:10:05 -0400 Received: from smtp21.gate.iad3a ([172.27.255.8]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy15.mail.iad3a.rsapps.net with LMTP id iEfMIr2NfFvfZAAAHi9b9g ; Tue, 21 Aug 2018 18:10:05 -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: smtp21.gate.iad3a.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: f4a40066-a58e-11e8-9410-525400e75841-1-1 Received: from [216.105.38.7] ([216.105.38.7:39247] helo=lists.sourceforge.net) by smtp21.gate.iad3a.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 5D/C6-22337-CBD8C7B5; Tue, 21 Aug 2018 18:10:05 -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 1fsEph-00047D-Ht; Tue, 21 Aug 2018 22:09:01 +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 1fsEpf-00046t-Np for openvpn-devel@lists.sourceforge.net; Tue, 21 Aug 2018 22:08:59 +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=gDxdHcSy1AF9gt2ekYIQL5/V57PX6SwgN9b4MeK/FWg=; b=laJ1l9n2T1nt4J01N/tFfp4Ss2 dnWKfMPOOxXztxQBVBXqo5ntkeIk1zaGADCAydGG6lUcCjPE37vLtJAI6agiUuATRnt01NoSTBHAD VbUpv/hOZNnuLmukZnC773q916pYo+RSuc1JozUawdqEsral68K6no4cSKSl+wS4E7l8=; 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=gDxdHcSy1AF9gt2ekYIQL5/V57PX6SwgN9b4MeK/FWg=; b=O0LcO/8QJvPEhNp2YAQ8rsdypc Rmeli6qvgWpwPINcvmGVkalrEbBxpb7mMujS5yjDeaIJ2vUQPXlUraKoXCu2UIA58UMR4kskU5JXS i7UAVHjC3NkqxEZmPhvkbrfWkiJLONWE1STG8gb+CuxPJZLWyHRh6W8MzwwbGKj3tMVM=; Received: from mail-ed1-f54.google.com ([209.85.208.54]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.90_1) id 1fsEpa-00AKQd-KZ for openvpn-devel@lists.sourceforge.net; Tue, 21 Aug 2018 22:08:59 +0000 Received: by mail-ed1-f54.google.com with SMTP id k15-v6so184752edr.3 for ; Tue, 21 Aug 2018 15:08:54 -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; bh=gDxdHcSy1AF9gt2ekYIQL5/V57PX6SwgN9b4MeK/FWg=; b=0NL0poZxFYSMK9rCFRmYhVLCy9JcPVoFBftydhIAsqLwy38sTWleJLwF5sRh18bUq+ IBD43Gm1lsNcFhsWCUYPdvoFyfUKEHuJsW+tNRM4idYJgRENHuTbGsUT7dYt+cnKq1+l GXoWLO4QIfscNcY4HBjYlvzfyZ/AKp188M27haLeqd+8Spz1UK67zi1qrXVEEbpByCee 5Bc+5W6R4eu3TTBi9N8gJ4sgvMXWKnc+cggOnqkXeuThzCu4MF9Xo354GKeOJPiJig2/ G4OjmO1VeRDTEt532m1Zn267Iv/TN7phhdpGEy0PYbZyH9XhIrvjUx67SkMCsCffNNMM X7EA== 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=gDxdHcSy1AF9gt2ekYIQL5/V57PX6SwgN9b4MeK/FWg=; b=l80HgTshSATy7SKPEnjbFpGTHYOC/U3REux0Kiez7FutB4MbrZyHUjxcyxC6WRHzyg LLibFYF1XcT+Aathrd4vviiloYtq3BwokrsfxiZhAjnJd/NOKxwvWu0BEVjE7B423Yxf 0wAXzlYmSCliMrBCyBgdPSpQ4O4vquXCxvaN87/ScMiJugl4rtPmqkZBM+4SC82GJrYI j40eVBbmQnDzCxCYChmnfJM2EVe3hoMw4h6pEqnkdbHpTP5sTZ1uV8aXdMnKv1AIj7P4 WE5zTlb72pgb+PaGi62Fchq7nbRCyIfuZkoCiaUN7ZjVxlVlyoYJwnl5zM6DP35hHSCC RJaA== X-Gm-Message-State: AOUpUlGZxUan85D/jW1BJfKyTTJD6eRiWJ+T1nUaxrOz9WSYbJfaCGpV Rx13BPSnVBkKidQWzT/w6R2L1vz3Ssw= X-Google-Smtp-Source: AA+uWPzoLrAtJAD+FNEMsaL9AsF7IIJQ3N/RrzFLn6IcHdRXncHsmRcFLK2+3yXSzj5ao4xH/GmAjw== X-Received: by 2002:a50:98a3:: with SMTP id j32-v6mr61927225edb.6.1534889327837; Tue, 21 Aug 2018 15:08:47 -0700 (PDT) Received: from vesta.fritz.box ([2001:985:e54:1:4de6:a28c:bc14:2e47]) by smtp.gmail.com with ESMTPSA id s12-v6sm94261edq.20.2018.08.21.15.08.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Aug 2018 15:08:46 -0700 (PDT) From: Steffan Karger To: openvpn-devel@lists.sourceforge.net Date: Wed, 22 Aug 2018 00:08:42 +0200 Message-Id: <20180821220842.4193-1-steffan@karger.me> 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 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [209.85.208.54 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.208.54 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.0 T_DKIMWL_WL_MED DKIMwl.org - Whitelisted Medium sender X-Headers-End: 1fsEpa-00AKQd-KZ Subject: [Openvpn-devel] [PATCH] 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 --- configure.ac | 11 ++--------- vendor/Makefile.am | 15 +++++++-------- 2 files changed, 9 insertions(+), 17 deletions(-) diff --git a/configure.ac b/configure.ac index 9c31435b..76d9f182 100644 --- a/configure.ac +++ b/configure.ac @@ -1381,15 +1381,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="-lcmocka -L\$(abs_top_builddir)/vendor/dist/lib -Wl,-rpath,\$(abs_top_builddir)/vendor/dist/lib" -TEST_CFLAGS="-I\$(top_srcdir)/include -I\$(abs_top_builddir)/vendor/dist/include" +TEST_LDFLAGS="-lcmocka -L\$(top_builddir)/vendor/dist/lib -Wl,-rpath,\$(top_builddir)/vendor/dist/lib" +TEST_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..b68d0311 100644 --- a/vendor/Makefile.am +++ b/vendor/Makefile.am @@ -1,18 +1,17 @@ -# 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 +cmockabuild = $(builddir)/cmocka +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 cmocka && cmake -DCMAKE_INSTALL_PREFIX=../$(cmockadist) ../$(cmockasrc) && make && make install) endif check: libcmocka