--- /dev/null
+Return-Path: <jani@nikula.org>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by olra.theworths.org (Postfix) with ESMTP id 21B13431FC2\r
+ for <notmuch@notmuchmail.org>; Wed, 1 Jan 2014 04:53:37 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+ tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+ by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id SqWNCn65enow for <notmuch@notmuchmail.org>;\r
+ Wed, 1 Jan 2014 04:53:28 -0800 (PST)\r
+Received: from mail-ee0-f49.google.com (mail-ee0-f49.google.com\r
+ [74.125.83.49]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client\r
+ certificate requested) by olra.theworths.org (Postfix) with ESMTPS id\r
+ AF948431FC0 for <notmuch@notmuchmail.org>; Wed, 1 Jan 2014 04:53:28 -0800\r
+ (PST)\r
+Received: by mail-ee0-f49.google.com with SMTP id c41so5834449eek.22\r
+ for <notmuch@notmuchmail.org>; Wed, 01 Jan 2014 04:53:27 -0800 (PST)\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+ d=1e100.net; s=20130820;\r
+ h=x-gm-message-state:from:to:cc:subject:in-reply-to:references\r
+ :user-agent:date:message-id:mime-version:content-type;\r
+ bh=iGyyesHHTOrJIBO9Fade920ByurBe7hOvU44y0IJCww=;\r
+ b=dqFWssk5bpPZAwSgpqqmin1DZpHa2k/hdXVzNOdC7pywWt5Id1WeYx0fNlnXYBAwU4\r
+ 6o3BhjK01DUhoHSPG3NsJTtyIXHrfE7qN00N4+MC0Zw+cqyOZ6YaxoiwemUkFr8seM/t\r
+ mfD+AHSGius3pWpdfLb6jvEMfOBWp2o8fxjKWLekclL8ZT/8u7/2InUl2sprtiE6e5jc\r
+ qCh/tKtwxRF26+bb3lGP29/vU47jYa0ujM5wlwVSRzP8/wY+7uWAwH1Da0WACmt4+iqx\r
+ bPXxV/sk9bzXblq5Hf9b7lT+1Z9/Qd277gsWRdioPw+me85PUcuHmYVl2j8sfMqXGjeZ\r
+ wSDA==\r
+X-Gm-Message-State:\r
+ ALoCoQnu/f+BWKaYlvd4RP+0/Y3K2afcnV6isf3+FEOkEGwdE8BnKBk1BVdWbZqGMKiu1ZHamqfU\r
+X-Received: by 10.15.44.4 with SMTP id y4mr10917893eev.71.1388580807384;\r
+ Wed, 01 Jan 2014 04:53:27 -0800 (PST)\r
+Received: from localhost (dsl-hkibrasgw2-58c36f-91.dhcp.inet.fi.\r
+ [88.195.111.91]) by mx.google.com with ESMTPSA id\r
+ a45sm126834149eem.6.2014.01.01.04.53.25 for <multiple recipients>\r
+ (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+ Wed, 01 Jan 2014 04:53:26 -0800 (PST)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: Austin Clements <amdragon@MIT.EDU>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH] new: Detect dirent.d_type support at configure time\r
+In-Reply-To: <1385262952-29240-1-git-send-email-amdragon@mit.edu>\r
+References: <1385262952-29240-1-git-send-email-amdragon@mit.edu>\r
+User-Agent: Notmuch/0.17~rc2+18~g39a67a6 (http://notmuchmail.org) Emacs/24.3.1\r
+ (x86_64-pc-linux-gnu)\r
+Date: Wed, 01 Jan 2014 14:53:24 +0200\r
+Message-ID: <87txdn2797.fsf@nikula.org>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\r
+Cc: pi-notmuch@pihost.us\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Wed, 01 Jan 2014 12:53:37 -0000\r
+\r
+On Sun, 24 Nov 2013, Austin Clements <amdragon@MIT.EDU> wrote:\r
+> Support for dirent.d_type is OS-specific. Previously, we used\r
+> _DIRENT_HAVE_D_TYPE to detect support for this, but this is apparently\r
+> a glic-ism (FreeBSD, for example, supports d_type, but does not define\r
+> this). Since there's no cross-platform way to detect support for\r
+> dirent.d_type, detect it using a test compile at configure time.\r
+> ---\r
+> compat/have_d_type.c | 10 ++++++++++\r
+> configure | 16 ++++++++++++++++\r
+> notmuch-new.c | 2 +-\r
+> 3 files changed, 27 insertions(+), 1 deletion(-)\r
+> create mode 100644 compat/have_d_type.c\r
+>\r
+> diff --git a/compat/have_d_type.c b/compat/have_d_type.c\r
+> new file mode 100644\r
+> index 0000000..9ca6c6e\r
+> --- /dev/null\r
+> +++ b/compat/have_d_type.c\r
+> @@ -0,0 +1,10 @@\r
+> +#include <dirent.h>\r
+> +\r
+> +int main()\r
+> +{\r
+> + struct dirent ent;\r
+> +\r
+> + (void) ent.d_type;\r
+> +\r
+> + return 0;\r
+> +}\r
+> diff --git a/configure b/configure\r
+> index 1a8e939..d2d193c 100755\r
+> --- a/configure\r
+> +++ b/configure\r
+> @@ -557,6 +557,17 @@ else\r
+> fi\r
+> rm -f compat/have_timegm\r
+> \r
+> +printf "Checking for dirent.d_type... "\r
+> +if ${CC} -o compat/have_d_type "$srcdir"/compat/have_d_type.c > /dev/null 2>&1\r
+> +then\r
+> + printf "Yes.\n"\r
+> + have_d_type="1"\r
+> +else\r
+> + printf "No (will use stat instead).\n"\r
+> + have_d_type="0"\r
+> +fi\r
+> +rm -f compat/have_d_type\r
+> +\r
+> printf "Checking for standard version of getpwuid_r... "\r
+> if ${CC} -o compat/check_getpwuid "$srcdir"/compat/check_getpwuid.c > /dev/null 2>&1\r
+> then\r
+> @@ -745,6 +756,9 @@ HAVE_STRCASESTR = ${have_strcasestr}\r
+> # build its own version)\r
+> HAVE_STRSEP = ${have_strsep}\r
+> \r
+> +# Whether struct dirent has d_type (if not, then notmuch will use stat)\r
+> +HAVE_D_TYPE = ${have_d_type}\r
+> +\r
+> # Whether the Xapian version in use supports compaction\r
+> HAVE_XAPIAN_COMPACT = ${have_xapian_compact}\r
+> \r
+> @@ -805,6 +819,7 @@ CONFIGURE_CFLAGS = -DHAVE_GETLINE=\$(HAVE_GETLINE) \$(GMIME_CFLAGS) \\\r
+> \$(VALGRIND_CFLAGS) \\\r
+> -DHAVE_STRCASESTR=\$(HAVE_STRCASESTR) \\\r
+> -DHAVE_STRSEP=\$(HAVE_STRSEP) \\\r
+> + -DHAVE_D_TYPE=\$(HAVE_D_TYPE) \\\r
+> -DSTD_GETPWUID=\$(STD_GETPWUID) \\\r
+> -DSTD_ASCTIME=\$(STD_ASCTIME) \\\r
+> -DHAVE_XAPIAN_COMPACT=\$(HAVE_XAPIAN_COMPACT)\r
+> @@ -813,6 +828,7 @@ CONFIGURE_CXXFLAGS = -DHAVE_GETLINE=\$(HAVE_GETLINE) \$(GMIME_CFLAGS) \\\r
+> \$(VALGRIND_CFLAGS) \$(XAPIAN_CXXFLAGS) \\\r
+> -DHAVE_STRCASESTR=\$(HAVE_STRCASESTR) \\\r
+> -DHAVE_STRSEP=\$(HAVE_STRSEP) \\\r
+> + -DHAVE_D_TYPE=\$(HAVE_D_TYPE) \\\r
+> -DSTD_GETPWUID=\$(STD_GETPWUID) \\\r
+> -DSTD_ASCTIME=\$(STD_ASCTIME) \\\r
+> -DHAVE_XAPIAN_COMPACT=\$(HAVE_XAPIAN_COMPACT)\r
+\r
+The patch looks good, but the above two hunks no longer apply\r
+cleanly. Please repost.\r
+\r
+BR,\r
+Jani.\r
+\r
+\r
+\r
+> diff --git a/notmuch-new.c b/notmuch-new.c\r
+> index ba05cb4..423e188 100644\r
+> --- a/notmuch-new.c\r
+> +++ b/notmuch-new.c\r
+> @@ -167,7 +167,7 @@ dirent_type (const char *path, const struct dirent *entry)\r
+> char *abspath;\r
+> int err, saved_errno;\r
+> \r
+> -#ifdef _DIRENT_HAVE_D_TYPE\r
+> +#if HAVE_D_TYPE\r
+> /* Mapping from d_type to stat mode_t. We omit DT_LNK so that\r
+> * we'll fall through to stat and get the real file type. */\r
+> static const mode_t modes[] = {\r
+> -- \r
+> 1.8.4.rc3\r
+>\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r
projects / notmuch-archives.git / commitdiff