From 0e9e46abf03768c23f17843f6aaa963bda9b0f1d Mon Sep 17 00:00:00 2001 From: Charles Celerier Date: Wed, 7 May 2014 13:02:24 +2000 Subject: [PATCH] [PATCH 1/5] test/Makefile.local: Added configured TALLOC_LDFLAGS. --- ac/65ffe7b8d2780686d72429e00ce9358d5a0f06 | 84 +++++++++++++++++++++++ 1 file changed, 84 insertions(+) create mode 100644 ac/65ffe7b8d2780686d72429e00ce9358d5a0f06 diff --git a/ac/65ffe7b8d2780686d72429e00ce9358d5a0f06 b/ac/65ffe7b8d2780686d72429e00ce9358d5a0f06 new file mode 100644 index 000000000..3a302fb5c --- /dev/null +++ b/ac/65ffe7b8d2780686d72429e00ce9358d5a0f06 @@ -0,0 +1,84 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 0BBE0431FD5 + for ; Tue, 6 May 2014 10:02:57 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0 +X-Spam-Level: +X-Spam-Status: No, score=0 tagged_above=-999 required=5 + tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001] + autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id 2HTIgmmqAWUY for ; + Tue, 6 May 2014 10:02:51 -0700 (PDT) +Received: from qmta02.westchester.pa.mail.comcast.net + (qmta02.westchester.pa.mail.comcast.net [76.96.62.24]) + by olra.theworths.org (Postfix) with ESMTP id 41B7D431FCB + for ; Tue, 6 May 2014 10:02:51 -0700 (PDT) +Received: from omta23.westchester.pa.mail.comcast.net ([76.96.62.74]) + by qmta02.westchester.pa.mail.comcast.net with comcast + id yccu1n0011c6gX851h2rMK; Tue, 06 May 2014 17:02:51 +0000 +Received: from jane.lan ([24.11.133.78]) + by omta23.westchester.pa.mail.comcast.net with comcast + id yh2W1n00e1heoKc3jh2q20; Tue, 06 May 2014 17:02:51 +0000 +From: Charles Celerier +To: notmuch@notmuchmail.org +Subject: [PATCH 1/5] test/Makefile.local: Added configured TALLOC_LDFLAGS. +Date: Tue, 6 May 2014 13:02:24 -0400 +Message-Id: <1399395748-44920-2-git-send-email-cceleri@cs.stanford.edu> +X-Mailer: git-send-email 1.8.5.2 (Apple Git-48) +In-Reply-To: <1399395748-44920-1-git-send-email-cceleri@cs.stanford.edu> +References: <1399395748-44920-1-git-send-email-cceleri@cs.stanford.edu> +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=comcast.net; + s=q20140121; t=1399395771; + bh=psFzyxslewAZqoHymmptifZBdFLLtnAZo+T/oBdKqAA=; + h=Received:Received:From:To:Subject:Date:Message-Id; + b=XE+HaLEzUB4pzc8sz2FFfny20+o2AmEirfB+3Y+ZcfyIGMQIbM/Mm4Bmvd8tnu+vt + YA8lc4iJivHkfbmFbOvmUPwy2nPZ+SgaNmaScxcLgI/12bl5PxmkNrAPpuOczi1Ee8 + zrtntZH7AK/wXbDAzG/qKil7xUDcd931OjvjoCQLgZTuH0ajKvUZmUrdLXFIORinsp + DHpQMXUBXmKzREcmuDQly/Rw1Y1q4iGMXyw1shdAFYZKv6DsiW385oJPPy7ola8w4S + aCs3pZGcD+SRt0Zdib034NRCcEzQ06S87/mxpewUpB19nNJfpHGiMpLqn3KWh6Ewm6 + WH1lNTs4iiu0Q== +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Tue, 06 May 2014 17:02:57 -0000 + +The linking to talloc is hard-coded in the testing Makefile. This patch +causes the linking to talloc to be done according to how TALLOC_LDFLAGS +was configured. + +Signed-off-by: Charles Celerier +--- + test/Makefile.local | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/test/Makefile.local b/test/Makefile.local +index 987441f..d622eaf 100644 +--- a/test/Makefile.local ++++ b/test/Makefile.local +@@ -16,7 +16,7 @@ $(dir)/arg-test: $(dir)/arg-test.o command-line-arguments.o util/libutil.a + $(call quiet,CC) $^ -o $@ + + $(dir)/hex-xcode: $(dir)/hex-xcode.o command-line-arguments.o util/libutil.a +- $(call quiet,CC) $^ -o $@ -ltalloc ++ $(call quiet,CC) $^ $(TALLOC_LDFLAGS) -o $@ + + random_corpus_deps = $(dir)/random-corpus.o $(dir)/database-test.o \ + notmuch-config.o command-line-arguments.o \ +-- +1.8.5.2 (Apple Git-48) + -- 2.26.2