Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 20 Nov 2015 08:02:27 +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: r401989 - in head/graphics/OpenEXR: . files
Message-ID:  <201511200802.tAK82Rrd085608@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: danfe
Date: Fri Nov 20 08:02:26 2015
New Revision: 401989
URL: https://svnweb.freebsd.org/changeset/ports/401989

Log:
  - Unbreak the build on PowerPC by using modern GCC version
  - Do not use += to set initial CONFIGURE_ARGS value
  - Convert to option helpers and new test framework (TEST_TARGET)
  - Remove extra patch that prevented installation of the example files
    (it is not needed in the post-staging era: running `make package
    OPTIONS_UNSET=EXAMPLES -DBATCH' will produce package without the
    exampes by default, requiring no special hacks)
  - Wrap one overly long line by optimizing away one of the STRIP_CMD's

Deleted:
  head/graphics/OpenEXR/files/extra-patch-IlmImfExamples__Makefile.in
Modified:
  head/graphics/OpenEXR/Makefile

Modified: head/graphics/OpenEXR/Makefile
==============================================================================
--- head/graphics/OpenEXR/Makefile	Fri Nov 20 06:32:38 2015	(r401988)
+++ head/graphics/OpenEXR/Makefile	Fri Nov 20 08:02:26 2015	(r401989)
@@ -23,10 +23,11 @@ WRKSRC=		${WRKDIR}/${DISTNAME}
 
 USES=		compiler:features gmake libtool pathfix pkgconfig
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--disable-ilmbasetest --enable-imfexamples
+CONFIGURE_ARGS=	--disable-ilmbasetest --enable-imfexamples
 USE_LDCONFIG=	yes
-CPPFLAGS+=	-I. -I../IlmImf
+TEST_TARGET=	check
 
+CPPFLAGS+=	-I. -I../IlmImf
 # must be linked with -l{thr|pthread} explicitly
 LDFLAGS+=	-lpthread
 
@@ -49,6 +50,10 @@ LARGE_STACK_CONFIGURE_ENABLE=	large-stac
 
 .include <bsd.port.pre.mk>
 
+.if ${ARCH} == powerpc
+USE_GCC=	yes
+.endif
+
 MAJORVER=	2_2
 VER=		22
 
@@ -75,17 +80,11 @@ pre-configure:
 		${ECHO_CMD} "*** same C++ std. library before trying to build OpenEXR.  Abort.   ***" ; \
 		exit 1; }
 
-.if ! ${PORT_OPTIONS:MEXAMPLES}
-EXTRA_PATCHES+=${FILESDIR}/extra-patch-IlmImfExamples__Makefile.in
-.endif
-
-regression-test regression test check:	build
-	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${_MAKE_JOBS} check)
-
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libIlmImf-${MAJORVER}.so.${VER}
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libIlmImfUtil-${MAJORVER}.so.${VER}
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libIlmImf-${MAJORVER}.so.${VER} \
+		${STAGEDIR}${PREFIX}/lib/libIlmImfUtil-${MAJORVER}.so.${VER}
 
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${STAGEDIR}${DOCSDIR}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR2}



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