From b2a907119447c8e2d75680414eaf5178cd04e87e Mon Sep 17 00:00:00 2001 From: Adam Weinberger Date: Mon, 1 Sep 2014 19:26:03 +0000 Subject: [PATCH] The doxygen build was failing on 8 and 9 for non-obvious reasons. As a stopgap (and as a favour to anyone building from ports ;-), change the DOCS option to DOXYGEN, and default it to off. THere are still some stage-qa issues but it should build and package on all platforms now. Approved by: joerg (maintainer) --- devel/avr-libc/Makefile | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/devel/avr-libc/Makefile b/devel/avr-libc/Makefile index 2e57f6019a9c..055113d51703 100644 --- a/devel/avr-libc/Makefile +++ b/devel/avr-libc/Makefile @@ -3,6 +3,7 @@ PORTNAME= avr-libc PORTVERSION= 1.8.1 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= devel MASTER_SITES= SAVANNAH @@ -21,15 +22,15 @@ RUN_DEPENDS= avr-as:${PORTSDIR}/devel/avr-binutils \ avr-ld:${PORTSDIR}/devel/avr-binutils \ avr-gcc:${PORTSDIR}/devel/avr-gcc -OPTIONS_DEFINE= DOCS +OPTIONS_DEFINE= DOXYGEN .include -.if ! ${PORT_OPTIONS:MDOCS} +.if ! ${PORT_OPTIONS:MDOXYGEN} .undef WITHOUT_AVRLIBCDOCS= true .endif -.if ${PORT_OPTIONS:MDOCS} +.if ${PORT_OPTIONS:MDOXYGEN} USE_TEX= latex:build BUILD_DEPENDS+= doxygen:${PORTSDIR}/devel/doxygen \ fig2dev:${PORTSDIR}/print/transfig \ @@ -41,7 +42,7 @@ USES= gettext:build tar:bzip2 gmake HAS_CONFIGURE= yes CONFIGURE_ENV= CC=avr-gcc PREFIX=${PREFIX} -.if ${PORT_OPTIONS:MDOCS} +.if ${PORT_OPTIONS:MDOXYGEN} CONFIGURE_ARGS= --build=`./config.guess` --host=avr \ --enable-doc --disable-versioned-doc --prefix=${PREFIX} \ --mandir=${PREFIX}/share/doc/avr-libc/man @@ -58,13 +59,13 @@ CFLAGS+= -O CXXFLAGS+= -O post-patch: -.if ! ${PORT_OPTIONS:MDOCS} +.if ! ${PORT_OPTIONS:MDOXYGEN} ${REINPLACE_CMD} -e '/SUBDIRS/s,examples,,' ${WRKSRC}/doc/Makefile.in .endif do-install: ${RM} -f ${TMPPLIST} -.if ${PORT_OPTIONS:MDOCS} +.if ${PORT_OPTIONS:MDOXYGEN} (cd ${BUILD_WRKSRC}/doc/api/avr-libc-user-manual && \ ${FIND} . -type f \ \( -name '*.html' -or -name '*.css' -or \