Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 4 Mar 2019 07:31:57 +0000 (UTC)
From:      Hiroki Sato <hrs@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r494559 - in head/mail/mu4e: . files
Message-ID:  <201903040731.x247VwjX006254@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: hrs
Date: Mon Mar  4 07:31:57 2019
New Revision: 494559
URL: https://svnweb.freebsd.org/changeset/ports/494559

Log:
  Add a workaround for poudriere build error during byte-compilation.

Added:
  head/mail/mu4e/files/byte-compile.mk   (contents, props changed)
Modified:
  head/mail/mu4e/Makefile

Modified: head/mail/mu4e/Makefile
==============================================================================
--- head/mail/mu4e/Makefile	Mon Mar  4 07:31:47 2019	(r494558)
+++ head/mail/mu4e/Makefile	Mon Mar  4 07:31:57 2019	(r494559)
@@ -12,14 +12,9 @@ COMMENT=	Emacs frontend for Mu
 
 LICENSE=	GPLv3
 
-.if ${FLAVOR:U} != devel && ${FLAVOR:U} != devel_nox
-# http://pkg.awarnach.mathstat.dal.ca/data/11i386-default/2018-05-30_07h36m11s/logs/errors/mu4e-emacs26-1.0_1.log
-BROKEN=		fails to build
-.endif
-
 RUN_DEPENDS=	mu:mail/mu
 
-USES=		autoreconf emacs gmake makeinfo pkgconfig
+USES=		autoreconf emacs makeinfo pkgconfig
 USE_GITHUB=	yes
 GH_PROJECT=	mu
 GH_ACCOUNT=	djcb
@@ -30,15 +25,20 @@ CONFIGURE_ARGS=	--disable-gtk \
 		--disable-guile \
 		--docdir="${DOCSDIR}" \
 		--enable-mu4e
-INFO=		mu4e
-BUILD_WRKSRC=	${WRKSRC}/mu4e
-INSTALL_WRKSRC=	${WRKSRC}/mu4e
+INFO=		${PORTNAME}
+BUILD_WRKSRC=	${WRKSRC}/${PORTNAME}
+INSTALL_WRKSRC=	${WRKSRC}/${PORTNAME}
 INSTALL_TARGET=	install-strip
 
 MAKE_JOBS_UNSAFE=	yes
 
 OPTIONS_DEFINE=		DOCS
 OPTIONS_SUB=		yes
+
+pre-build:
+	${REINPLACE_CMD} -e '/.el.elc/,/^$$/d' ${BUILD_WRKSRC}/Makefile && \
+	    ${ECHO_CMD} '.include "${FILESDIR}/byte-compile.mk"' \
+	    >> ${BUILD_WRKSRC}/Makefile
 
 post-install:
 	cd ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/mu4e && \

Added: head/mail/mu4e/files/byte-compile.mk
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/mu4e/files/byte-compile.mk	Mon Mar  4 07:31:57 2019	(r494559)
@@ -0,0 +1,18 @@
+# $FreeBSD$
+.el.elc:
+	if test '$(EMACS)' != no; then \
+	  am__dir=. am__subdir_includes=''; \
+	  case $@ in */*) \
+	    am__dir=`echo '$@' | sed 's,/[^/]*$$,,'`; \
+	    am__subdir_includes="-L $$am__dir -L $(srcdir)/$$am__dir"; \
+	  esac; \
+	  test -d "$$am__dir" || $(MKDIR_P) "$$am__dir" || exit 1; \
+	  $(EMACS) --batch \
+	    $(AM_ELCFLAGS) $(ELCFLAGS) \
+	    $$am__subdir_includes -L $(builddir) -L $(srcdir) \
+	    --eval '(setq byte-compile-dest-file-function (lambda (_) "/tmp/$@"))' \
+	    -f batch-byte-compile '$<'; \
+	    if [ -f "/tmp/$@" ]; then \
+		cp /tmp/$@ $@ && rm -f /tmp/$@; \
+	    fi; \
+	else :; fi



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201903040731.x247VwjX006254>