Date: Wed, 30 Jan 2013 08:11:52 +0000 (UTC) From: Oliver Lehmann <oliver@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r311202 - head/graphics/ogre3d Message-ID: <201301300811.r0U8Bqke052959@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: oliver Date: Wed Jan 30 08:11:52 2013 New Revision: 311202 URL: http://svnweb.freebsd.org/changeset/ports/311202 Log: fix build when tbb, poco or ois is installed Modified: head/graphics/ogre3d/Makefile Modified: head/graphics/ogre3d/Makefile ============================================================================== --- head/graphics/ogre3d/Makefile Wed Jan 30 06:31:40 2013 (r311201) +++ head/graphics/ogre3d/Makefile Wed Jan 30 08:11:52 2013 (r311202) @@ -44,14 +44,21 @@ CMAKE_ARGS+= -DCMAKE_COMPILER_IS_GNUCXX: .endif post-patch: -.if defined(WITHOUT_BOOST) +.if ! ${PORT_OPTIONS:MBOOST} @${REINPLACE_CMD} -e 's|Boost|No_Boost|g' \ ${WRKSRC}/CMake/Dependencies.cmake .endif - @${REINPLACE_CMD} -e 's|\(OGRE_RW_MUTEX.*\);|\1|g' \ + # disable OIS, POCO, TBB detection + @${REINPLACE_CMD} -e 's|include(FindPkgMacros)|return()|g' \ + ${WRKSRC}/CMake/Packages/FindOIS.cmake \ + ${WRKSRC}/CMake/Packages/FindPOCO.cmake \ + ${WRKSRC}/CMake/Packages/FindTBB.cmake + @${REINPLACE_CMD} -e 's|\(OGRE_RW_MUTEX[^;]*\)$$|\1;|g' \ ${WRKSRC}/OgreMain/include/OgreWorkQueue.h + @${REINPLACE_CMD} -e 's|\(OGRE_RW_MUTEX.*\);$$|\1|g' \ + ${WRKSRC}/OgreMain/include/Threading/OgreThreadDefinesBoost.h @${REINPLACE_CMD} -e '\ - s,defined(__x86_64__),& || defined(__powerpc__) || defined(__ia64__) || defined(__sparc64__) || defined(__alpha__) || defined(__amd64__),' \ + s,defined(__x86_64__),& || defined(__powerpc__) || defined(__sparc64__) || defined(__amd64__),' \ ${WRKSRC}/OgreMain/include/OgrePlatform.h post-install:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201301300811.r0U8Bqke052959>