Date: Thu, 10 Sep 2015 16:55:42 +0000 (UTC) From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r396586 - head/science/hdf Message-ID: <201509101655.t8AGtgp3090649@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Thu Sep 10 16:55:41 2015 New Revision: 396586 URL: https://svnweb.freebsd.org/changeset/ports/396586 Log: - Unbreak the build on PowerPC by pretending to be pre-Intel Apple CPU; while this is probably not right design-wise, it allows for a smaller fix in line count (all regression tests do pass) - While here, perform usual Makefile maintenance and cleanups: sort the knobs, wrap overly long lines, and improve `regression-test' target Modified: head/science/hdf/Makefile Modified: head/science/hdf/Makefile ============================================================================== --- head/science/hdf/Makefile Thu Sep 10 16:31:33 2015 (r396585) +++ head/science/hdf/Makefile Thu Sep 10 16:55:41 2015 (r396586) @@ -15,27 +15,34 @@ LIB_DEPENDS= libsz.so:${PORTSDIR}/scienc CONFLICTS_INSTALL= netcdf-4.[0-9]* -OPTIONS_DEFINE= EXAMPLES - +USES= fortran jpeg libtool tar:bzip2 GNU_CONFIGURE= yes -CONFIGURE_ARGS= --enable-shared --with-jpeg=${LOCALBASE} --with-szlib=${LOCALBASE} -INSTALL_TARGET= install-strip +CONFIGURE_ARGS= --enable-shared --with-jpeg=${LOCALBASE} \ + --with-szlib=${LOCALBASE} USE_LDCONFIG= yes -USES= fortran jpeg libtool tar:bzip2 +INSTALL_TARGET= install-strip PORTDATA= * PORTEXAMPLES= * -BROKEN_powerpc= Does not compile on powerpc +OPTIONS_DEFINE= EXAMPLES post-patch: @${REINPLACE_CMD} -e '/PROD_/ s|=.*|=""|' ${WRKSRC}/config/freebsd +# Allow to build on PowerPC + @${REINPLACE_CMD} -e '/if defined (__APPLE__)/ \ + s,),) || defined(__powerpc__),' ${WRKSRC}/hdf/src/hdfi.h + @${REINPLACE_CMD} -e 's/ || (__APPLE__.*//' \ + ${WRKSRC}/hdf/test/fortest.c post-install: - ${INSTALL_MAN} ${WRKSRC}/man/hdfunpac.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/ - ${INSTALL_MAN} ${WRKSRC}/man/gr_chunk.3 ${STAGEDIR}${MAN3PREFIX}/man/man3/ - -regression-test test: build - cd ${WRKSRC}/hdf/test/ && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} check + ${INSTALL_MAN} ${WRKSRC}/man/hdfunpac.1 \ + ${STAGEDIR}${MAN1PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/man/gr_chunk.3 \ + ${STAGEDIR}${MAN3PREFIX}/man/man3 + +regression-test: build + @${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} \ + ${MAKE_ARGS} check -C ${WRKSRC}/hdf/test .include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509101655.t8AGtgp3090649>