From ac2e8addabdb1baaf0b8fac8ab2c8bbee5767414 Mon Sep 17 00:00:00 2001 From: jrm Date: Thu, 26 Apr 2018 02:03:28 +0000 Subject: Emacs ports: Tell configure to skip checks for sysinfo header The build fails when devel/libsysinfo is pulled in. This can happen when graphics/ImageMagick is built with the OPENMP knob on. Reported by: Richard M. Timoney --- editors/emacs-devel/Makefile | 4 +++- editors/emacs/Makefile | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'editors') diff --git a/editors/emacs-devel/Makefile b/editors/emacs-devel/Makefile index ed23a0887bba..0afd8fcd73b1 100644 --- a/editors/emacs-devel/Makefile +++ b/editors/emacs-devel/Makefile @@ -3,7 +3,7 @@ PORTNAME= emacs DISTVERSION= ${EMACS_VER}.${EMACS_REV} -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 2 CATEGORIES= editors ipv6 PKGNAMESUFFIX= -devel @@ -42,6 +42,8 @@ CONFIGURE_ENV= ac_cv_prog_liblockfile=no PLIST_SUB= EMACS_VER=${EMACS_VER} GNU_HOST=${CONFIGURE_TARGET} +CONFIGURE_ENV= ac_cv_header_sys_sysinfo_h=no \ + ac_cv_prog_liblockfile=no INFO= ada-mode auth autotype bovine calc ccmode cl dbus dired-x ebrowse ede \ ediff edt efaq eieio eintr elisp emacs emacs-gnutls emacs-mime epa erc \ ert eshell eudc eww flymake forms gnus htmlfontify idlwave ido info \ diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile index 9d9f1d2d19f9..a5edb172b4b0 100644 --- a/editors/emacs/Makefile +++ b/editors/emacs/Makefile @@ -3,7 +3,7 @@ PORTNAME= emacs PORTVERSION= ${EMACS_VER} -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 3 CATEGORIES= editors ipv6 MASTER_SITES= GNU @@ -43,6 +43,8 @@ CONFIGURE_ENV= ac_cv_prog_liblockfile=no PLIST_SUB= EMACS_VER=${EMACS_VER} GNU_HOST=${CONFIGURE_TARGET} +CONFIGURE_ENV= ac_cv_header_sys_sysinfo_h=no \ + ac_cv_prog_liblockfile=no INFO= ada-mode auth autotype bovine calc ccmode cl dbus dired-x ebrowse ede \ ediff edt efaq eieio eintr elisp emacs emacs-gnutls emacs-mime epa erc \ ert eshell eudc eww flymake forms gnus htmlfontify idlwave ido info \ -- cgit