* Make samples compilation optional and disabled by default, as samples are not installed and useful only for developers * Don't add -NDEBUG to CPPFLAGS in case of ogre3d is compiled with WITH_DEBUG flag
Responsible Changed From-To: freebsd-ports-bugs->oliver Over to maintainer (via the GNATS Auto Assign Tool)
* FreeBSD-gnats-submit@FreeBSD.org (FreeBSD-gnats-submit@FreeBSD.org) wrote: > >Synopsis: [PATCH] graphics/ogre3d: make demos compilation optional, disabled by default Sorry, I've got confused because of a new devel/ois port that I have installed. Here's the updated patch, and it actually should be committed after devel/ois is added. --- ogre3d.patch begins here --- diff -ruN ogre3d.orig/Makefile ogre3d/Makefile --- ogre3d.orig/Makefile 2008-06-19 06:22:10.000000000 +0400 +++ ogre3d/Makefile 2008-06-19 07:43:25.000000000 +0400 @@ -23,11 +23,11 @@ WRKSRC= ${WRKDIR}/ogre CONFIGURE_ARGS= --disable-cg --program-transform-name= --enable-static \ --with-cppunit-prefix=/nonexistent --disable-freeimage -CONFIGURE_ENV+= CPPFLAGS="-I${X11BASE}/include -DNDEBUG" \ - ZZIPLIB_CFLAGS="-I${LOCALBASE}/include" \ +CONFIGURE_ENV+= ZZIPLIB_CFLAGS="-I${LOCALBASE}/include" \ ZZIPLIB_LIBS="-L${LOCALBASE}/lib -lzzip" -OPTIONS= GTK "Use GTK instead of Xt gui" off +OPTIONS= GTK "Use GTK instead of Xt gui" off \ + DEMOS "Build OGRE demos" off GNU_CONFIGURE= YES USE_AUTOTOOLS= libtool:15 @@ -40,6 +40,19 @@ .include <bsd.port.pre.mk> +.if !defined(WITH_DEBUG) +CONFIGURE_ENV+= CPPFLAGS="-I${X11BASE}/include -DNDEBUG" +.else +CONFIGURE_ENV+= CPPFLAGS="-I${X11BASE}/include" +.endif + +.if defined(WITH_DEMOS) +BUILD_DEPENDS+= ${LOCALBASE}/lib/libOIS.so:${PORTSDIR}/devel/ois +RUN_DEPENDS+= ${LOCALBASE}/lib/libOIS.so:${PORTSDIR}/devel/ois +.else +CONGIGURE_ARGS+= --disable-ogre-demos +.endif + .if defined(WITH_GTK) USE_GNOME+= gtk20 CONFIGURE_ARGS+=--with-gui=gtk --- ogre3d.patch ends here --- -- Dmitry Marakasov . 55B5 0596 FF1E 8D84 5F56 9510 D35A 80DD F9D2 F77D amdmi3@amdmi3.ru ..: jabber: amdmi3@jabber.ru http://www.amdmi3.ru
oliver 2008-07-01 11:00:49 UTC FreeBSD ports repository Modified files: graphics/ogre3d Makefile Log: make compiling demos and the debug mode OPTIONal PR: ports/124742 Submitted by: amdmi3 Revision Changes Path 1.32 +17 -3 ports/graphics/ogre3d/Makefile _______________________________________________ cvs-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/cvs-all To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
State Changed From-To: open->closed committed,thanks