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 503594196F0 for ; Thu, 3 Jun 2010 17:22:58 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: -2.89 X-Spam-Level: X-Spam-Status: No, score=-2.89 tagged_above=-999 required=5 tests=[ALL_TRUSTED=-1, BAYES_00=-1.9, T_MIME_NO_TEXT=0.01] autolearn=ham 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 I09o0UGE-tQ4; Thu, 3 Jun 2010 17:22:48 -0700 (PDT) Received: from yoom.home.cworth.org (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id 01607431FC1; Thu, 3 Jun 2010 17:22:48 -0700 (PDT) Received: by yoom.home.cworth.org (Postfix, from userid 1000) id A0D73568F2D; Thu, 3 Jun 2010 17:22:47 -0700 (PDT) From: Carl Worth To: Tomas Carnecky , notmuch@notmuchmail.org Subject: Re: [RFC] Add support for the Solaris platform In-Reply-To: <1272654024-5254-1-git-send-email-tom@dbservice.com> References: <1272654024-5254-1-git-send-email-tom@dbservice.com> User-Agent: Notmuch/0.3.1-22-g1d528f8 (http://notmuchmail.org) Emacs/23.1.1 (i486-pc-linux-gnu) Date: Thu, 03 Jun 2010 17:22:47 -0700 Message-ID: <87ocfreje0.fsf@yoom.home.cworth.org> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha1; protocol="application/pgp-signature" 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: Fri, 04 Jun 2010 00:22:58 -0000 --=-=-= Content-Transfer-Encoding: quoted-printable On Fri, 30 Apr 2010 21:00:24 +0200, Tomas Carnecky wrot= e: > Like on Mac OS X, the linker doesn't automatically resolve > dependencies. Thanks for this fix, Tomas! I like the fix described above, but you seem to have sent a patch with three independent changes, only one of which was described. See below for what I've done... > notmuch: $(notmuch_client_modules) lib/libnotmuch.a > - $(call quiet,CXX $(CFLAGS)) $^ $(FINAL_LIBNOTMUCH_LDFLAGS) -o $@ > + $(call quiet,CXX $(CFLAGS)) $^ $(FINAL_NOTMUCH_LDFLAGS) -o $@ That seems to be correct. Could you describe what problem you ran into that motivated you to find this fix? I have not committed this piece. > -printf "Checking for Mac OS X (for shared library)... " > +printf "Checking which platform we are on... " > if [ `uname` =3D "Darwin" ] ; then > - printf "Yes.\n" > - mac_os_x=3D1 > + printf "Mac OS X.\n" > + platform=3DMACOSX ... > -ifeq ($(MAC_OS_X),1) > +ifeq ($(PLATFORM),MACOSX) > LIBRARY_SUFFIX =3D dylib > # On OS X, library version numbers go before suffix. > LINKER_NAME =3D libnotmuch.$(LIBRARY_SUFFIX) That hunk was all described by your original commit message. So I've applied this part with your original commit message and will be pushing it soon. > +/* Helper functions to test if a given dirent is of a certain type > + */ > +static int > +_is_reg(const char *path, struct dirent *entry) ... > @@ -372,7 +426,7 @@ add_files_recursive (notmuch_database_t *notmuch, >=20=20 > if (! S_ISREG (st.st_mode)) > continue; > - } else if (entry->d_type !=3D DT_REG) { > + } else if (!_is_reg(path, entry)) { > continue; > } This all might be well and good, but is also not described by the commit message. So I have not committed this either. If you resend with an actual description of the change, I'll be happy to take a closer look. Thanks again, =2DCarl =2D-=20 carl.d.worth@intel.com --=-=-= Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) iD8DBQFMCEdX6JDdNq8qSWgRAnFmAJ9c/8QJJhK0TCg28QXFycXfO/3s1gCfcSn1 qESwlVSHeNEXHAgO1yTKAlk= =/Co/ -----END PGP SIGNATURE----- --=-=-=--