From 06bf4a230bfb0096f60566c94c80fb7803ffeb35 Mon Sep 17 00:00:00 2001 From: Nate Eagleson Date: Wed, 1 Jul 2015 17:29:07 +2000 Subject: [PATCH] [PATCH] build: Support Mac OS X 10.6.8 --- 4f/b44c864b1b6445bbb558a24f3deb4672bd4d47 | 97 +++++++++++++++++++++++ 1 file changed, 97 insertions(+) create mode 100644 4f/b44c864b1b6445bbb558a24f3deb4672bd4d47 diff --git a/4f/b44c864b1b6445bbb558a24f3deb4672bd4d47 b/4f/b44c864b1b6445bbb558a24f3deb4672bd4d47 new file mode 100644 index 000000000..87f8bcf53 --- /dev/null +++ b/4f/b44c864b1b6445bbb558a24f3deb4672bd4d47 @@ -0,0 +1,97 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by arlo.cworth.org (Postfix) with ESMTP id E1E7F6DE0FF8 + for ; Tue, 30 Jun 2015 14:30:09 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at cworth.org +X-Spam-Flag: NO +X-Spam-Score: -0.637 +X-Spam-Level: +X-Spam-Status: No, score=-0.637 tagged_above=-999 required=5 tests=[AWL=0.044, + DKIM_SIGNED=0.1, DKIM_VALID=-0.1, FREEMAIL_FROM=0.001, + RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_PASS=-0.001, + T_FREEMAIL_FORGED_FROMDOMAIN=0.01, T_HEADER_FROM_DIFFERENT_DOMAINS=0.01] + autolearn=disabled +Received: from arlo.cworth.org ([127.0.0.1]) + by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id 6RzuPnzHOGkF for ; + Tue, 30 Jun 2015 14:30:08 -0700 (PDT) +Received: from mail-qg0-f47.google.com (mail-qg0-f47.google.com + [209.85.192.47]) + by arlo.cworth.org (Postfix) with ESMTPS id 061446DE0C4A + for ; Tue, 30 Jun 2015 14:30:08 -0700 (PDT) +Received: by qgii30 with SMTP id i30so10472390qgi.1 + for ; Tue, 30 Jun 2015 14:30:04 -0700 (PDT) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; + h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; + bh=qfwH3tk9nY/fEwqmSbYa0i3Uzmc2XqrIZoWr5RV0U3s=; + b=OltKWOPCfiWqrZj6t45hpMbocGdNXjeYoeWeGQ9gJz71BFxqNoRiOQCyJeW8eSsGAh + 03+qGzAxLMZTXwX+uVu45YcSKXA6suf1llv2mm81wVJDlp9B3jSWJO8mU8K6YEeGQW1G + 0mfpfmKZOdAAUS4aOi6rZhLno+BZr7X32SwPNFhpTg+fC5WNOV7JUZXSWn3p4NUa7mSR + pq6sZpLyMhhIZEj0q1Az7H5KxdMxHgn4UOCgsuhI+GQnUDu9OsQbVBUY8XxNiGSazdzs + z7TUwpakWWKDbqwOTojTL97Yi1Qp4k+A4xUymQj2/ZV9B/YSLQMdnoIz6QxH9/tzjkNe + rK1Q== +X-Received: by 10.140.237.208 with SMTP id + i199mr30542224qhc.103.1435699804299; Tue, 30 Jun 2015 14:30:04 -0700 (PDT) +Received: from localhost.localdomain ([50.153.173.39]) + by mx.google.com with ESMTPSA id 195sm589095qhr.13.2015.06.30.14.30.02 + (version=TLSv1 cipher=RC4-SHA bits=128/128); + Tue, 30 Jun 2015 14:30:03 -0700 (PDT) +Sender: Nathan Eagleson +From: Nate Eagleson +To: notmuch@notmuchmail.org +Subject: [PATCH] build: Support Mac OS X 10.6.8 +Date: Tue, 30 Jun 2015 17:29:07 -0400 +Message-Id: <1435699747-13591-2-git-send-email-nate@nateeag.com> +X-Mailer: git-send-email 1.8.1.3 +In-Reply-To: <1435699747-13591-1-git-send-email-nate@nateeag.com> +References: <1435699747-13591-1-git-send-email-nate@nateeag.com> +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.18 +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, 30 Jun 2015 21:30:10 -0000 + +OS X 10.6.8 has a built-in library named libutil.dylib and a version +of ld that picks that up instead of util/libutil.a. + +We now use an absolute path to util/libutil.a, so that notmuch can be +built successfully on 10.6.8. +--- + Makefile.local | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/Makefile.local b/Makefile.local +index 61a9c4c..c82b43a 100644 +--- a/Makefile.local ++++ b/Makefile.local +@@ -43,10 +43,16 @@ GPG_FILE=$(SHA1_FILE).asc + + PV_FILE=bindings/python/notmuch/version.py + ++# Mac OS X 10.6 has a built-in libutil.dylib that prevents ld from ++# picking up notmuch's libutil.a. The best way to prefer our local ++# libutil.a is to specify it via absolute path, which should work on ++# all supported OSes. ++LIBUTIL_PATH=${srcdir}/util/libutil.a ++ + # Smash together user's values with our extra values + FINAL_CFLAGS = -DNOTMUCH_VERSION=$(VERSION) $(CPPFLAGS) $(CFLAGS) $(WARN_CFLAGS) $(extra_cflags) $(CONFIGURE_CFLAGS) + FINAL_CXXFLAGS = $(CPPFLAGS) $(CXXFLAGS) $(WARN_CXXFLAGS) $(extra_cflags) $(extra_cxxflags) $(CONFIGURE_CXXFLAGS) +-FINAL_NOTMUCH_LDFLAGS = $(LDFLAGS) -Lutil -lutil -Llib -lnotmuch ++FINAL_NOTMUCH_LDFLAGS = $(LDFLAGS) $(LIBUTIL_PATH) -Llib -lnotmuch -Wl,-t + ifeq ($(LIBDIR_IN_LDCONFIG),0) + FINAL_NOTMUCH_LDFLAGS += $(RPATH_LDFLAGS) + endif +-- +1.8.1.3 + -- 2.26.2