From: Alan Third <alan@idiocy.org>
To: Eli Zaretskii <eliz@gnu.org>
Cc: Philipp Stephani <p.stephani2@gmail.com>, 29931@debbugs.gnu.org
Subject: bug#29931: 27.0.50; Slightly suboptimal build behavior on macOS
Date: Tue, 2 Jan 2018 21:24:59 +0000 [thread overview]
Message-ID: <20180102212459.GB848@breton.holly.idiocy.org> (raw)
In-Reply-To: <20180102201900.GA848@breton.holly.idiocy.org>
[-- Attachment #1: Type: text/plain, Size: 536 bytes --]
On Tue, Jan 02, 2018 at 08:19:00PM +0000, Alan Third wrote:
> I’m not sure how portable this test needs to be since it should only
> run on darwin:
>
> if test "${opsys}" = darwin && test -z "${MAKEINFO}" && \
> test -x /usr/local/opt/texinfo/bin/makeinfo; then
I’ve done some investigation and come up with a version that uses
autoconfig macros.
I also looked into macports and it seems it always includes everything
you’ve installed, unlike homebrew, so we shouldn’t run into this issue
with it.
--
Alan Third
[-- Attachment #2: 0001-Fix-build-issues-on-macOS-bug-29931.patch --]
[-- Type: text/plain, Size: 1656 bytes --]
From b8d2de82a3ee3faa72ad54d68a00cec95370f504 Mon Sep 17 00:00:00 2001
From: Alan Third <alan@idiocy.org>
Date: Mon, 1 Jan 2018 15:44:24 +0000
Subject: [PATCH] Fix build issues on macOS (bug#29931)
* configure.ac: On darwin add check for Homebrew texinfo install, and
fix incorrect quoting of libxml2 includes.
---
configure.ac | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index 4c2644b11d..26f01cad13 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1267,6 +1267,14 @@ AC_DEFUN
AC_SUBST([PAXCTL_dumped])
AC_SUBST([PAXCTL_notdumped])
+# Makeinfo on macOS is ancient, check whether there is a more recent
+# version installed by Homebrew.
+AC_CHECK_PROG(HAVE_BREW, [brew], [yes])
+if test -n "$HAVE_BREW"; then
+ AC_PATH_PROG([MAKEINFO], [makeinfo], [],
+ [`brew --prefix 2>/dev/null`/opt/texinfo/bin$PATH_SEPARATOR$PATH])
+fi
+
## Require makeinfo >= 4.13 (last of the 4.x series) to build the manuals.
if test "${MAKEINFO:=makeinfo}" != "no"; then
case `($MAKEINFO --version) 2>/dev/null` in
@@ -3881,13 +3889,13 @@ AC_DEFUN
xcsdkdir="" ;;
esac
fi
- CPPFLAGS="$CPPFLAGS -I$xcsdkdir/usr/include/libxml2"
+ CPPFLAGS="$CPPFLAGS -I${xcsdkdir}/usr/include/libxml2"
AC_CHECK_HEADER(libxml/HTMLparser.h,
[AC_CHECK_DECL(HTML_PARSE_RECOVER, HAVE_LIBXML2=yes, ,
[#include <libxml/HTMLparser.h>])])
CPPFLAGS="$SAVE_CPPFLAGS"
if test "${HAVE_LIBXML2}" = "yes"; then
- LIBXML2_CFLAGS="-I'$xcsdkdir/usr/include/libxml2'"
+ LIBXML2_CFLAGS="-I${xcsdkdir}/usr/include/libxml2"
LIBXML2_LIBS="-lxml2"
fi
fi
--
2.14.3
next prev parent reply other threads:[~2018-01-02 21:24 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-01 12:15 bug#29931: 27.0.50; Slightly suboptimal build behavior on macOS Philipp
2018-01-01 13:13 ` Noam Postavsky
2018-01-01 13:51 ` Philipp Stephani
2018-01-01 14:54 ` Alan Third
2018-01-01 14:59 ` Alan Third
2018-01-01 15:05 ` Philipp Stephani
2018-01-01 15:12 ` Philipp Stephani
2018-01-01 15:53 ` Alan Third
2018-01-02 12:10 ` Alan Third
2018-01-02 20:03 ` Philipp Stephani
2018-01-02 21:51 ` Alan Third
2018-01-02 19:51 ` Philipp Stephani
2018-01-01 15:48 ` Alan Third
2018-01-02 19:42 ` Philipp Stephani
2018-01-02 19:48 ` Philipp Stephani
2018-01-02 19:49 ` Philipp Stephani
2018-01-02 20:04 ` Eli Zaretskii
2018-01-02 20:19 ` Alan Third
2018-01-02 21:24 ` Alan Third [this message]
2018-01-07 14:05 ` Philipp Stephani
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180102212459.GB848@breton.holly.idiocy.org \
--to=alan@idiocy.org \
--cc=29931@debbugs.gnu.org \
--cc=eliz@gnu.org \
--cc=p.stephani2@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).