Bug 180092 - [patch] graphics/ogre3d: fix build with clang
Summary: [patch] graphics/ogre3d: fix build with clang
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Oliver Lehmann
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-06-29 16:50 UTC by Tijl Coosemans
Modified: 2013-08-07 11:40 UTC (History)
0 users

See Also:

Attachments
ogre3d.patch (1.83 KB, patch)
2013-06-29 16:50 UTC, Tijl Coosemans 		no flags Details | Diff
View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Tijl Coosemans freebsd_committer freebsd_triage 2013-06-29 16:50:00 UTC 
The attached patch fixes graphics/ogre3d when cc is clang. See:
http://pointyhat-west.isc.freebsd.org/errorlogs/amd64-errorlogs/e.10-exp.20130612034121.pointyhat-west/ogre3d-1.8.1.log

It uses a better cmake test to see if the compiler is clang.
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2013-06-29 16:50:08 UTC 
Responsible Changed
From-To: freebsd-ports-bugs->oliver

Over to maintainer (via the GNATS Auto Assign Tool)
Comment 2 dfilter service freebsd_committer freebsd_triage 2013-08-07 11:38:25 UTC 
Author: oliver
Date: Wed Aug  7 10:38:16 2013
New Revision: 324342
URL: http://svnweb.freebsd.org/changeset/ports/324342

Log:
  fix clang detection
  
  PR:		ports/180092
  Submitted by:	tijl

Modified:
  head/graphics/ogre3d/Makefile
  head/graphics/ogre3d/files/patch-CMake_ConfigureBuild.cmake   (contents, props changed)

Modified: head/graphics/ogre3d/Makefile
==============================================================================
--- head/graphics/ogre3d/Makefile	Wed Aug  7 10:28:44 2013	(r324341)
+++ head/graphics/ogre3d/Makefile	Wed Aug  7 10:38:16 2013	(r324342)
@@ -39,10 +39,6 @@ PLIST_SUB+=	BOOSTFALSE=""
 BROKEN=		Does not install on powerpc
 .endif
 
-.if ${CXX:M*clang*}
-CMAKE_ARGS+=	-DCMAKE_COMPILER_IS_GNUCXX:BOOL=YES
-.endif
-
 post-patch:
 .if ! ${PORT_OPTIONS:MBOOST}
 	@${REINPLACE_CMD} -e 's|Boost|No_Boost|g' \

Modified: head/graphics/ogre3d/files/patch-CMake_ConfigureBuild.cmake
==============================================================================
--- head/graphics/ogre3d/files/patch-CMake_ConfigureBuild.cmake	Wed Aug  7 10:28:44 2013	(r324341)
+++ head/graphics/ogre3d/files/patch-CMake_ConfigureBuild.cmake	Wed Aug  7 10:38:16 2013	(r324342)
@@ -1,6 +1,6 @@
---- CMake/ConfigureBuild.cmake.orig	2011-08-21 00:23:58.000000000 +0200
-+++ CMake/ConfigureBuild.cmake	2011-08-21 00:25:02.000000000 +0200
-@@ -180,18 +180,18 @@ if (UNIX)
+--- CMake/ConfigureBuild.cmake.orig	2012-09-02 07:27:14.000000000 +0200
++++ CMake/ConfigureBuild.cmake	2013-06-15 16:28:56.000000000 +0200
+@@ -189,18 +189,18 @@ if (UNIX)
    else ()
      configure_file(${OGRE_TEMPLATES_DIR}/OGRE.pc.in ${OGRE_BINARY_DIR}/pkgconfig/OGRE.pc @ONLY)
    endif ()
@@ -22,7 +22,7 @@
    endif ()
  
    if (OGRE_BUILD_COMPONENT_TERRAIN)
-@@ -199,17 +199,17 @@ if (UNIX)
+@@ -208,20 +208,20 @@ if (UNIX)
        set(OGRE_PAGING_ADDITIONAL_PACKAGES ", OGRE-Paging = ${OGRE_VERSION}")
      endif ()
      configure_file(${OGRE_TEMPLATES_DIR}/OGRE-Terrain.pc.in ${OGRE_BINARY_DIR}/pkgconfig/OGRE-Terrain.pc @ONLY)
@@ -42,4 +42,8 @@
 +    install(FILES ${OGRE_BINARY_DIR}/pkgconfig/OGRE-Property.pc DESTINATION ${OGRE_LIBDATA_DIRECTORY}/pkgconfig)
    endif ()
  
- endif ()
+-  if (CMAKE_CXX_COMPILER MATCHES ".*clang")
++  if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+     set(CMAKE_COMPILER_IS_CLANGXX 1)
+   endif ()
+ 
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 3 Oliver Lehmann freebsd_committer freebsd_triage 2013-08-07 11:38:35 UTC 
State Changed
From-To: open->closed

committed, thanks