Control: retitle -1  opencollada: FTBFS on mips, mipsel and mips64el

Tags: sid + patch
User: [email protected]
Usertags: mips-patch

Hello,

This issue is resolved upstream:
https://github.com/KhronosGroup/OpenCOLLADA/issues/338
https://github.com/KhronosGroup/OpenCOLLADA/pull/411

I have attached a patch.
With this patch package does build successfully on mips, mipsel and mips64el.

Please include this patch.
Thank you!

Regards,
Jurica
diff -upNr OpenCOLLADA-orig/CMakeLists.txt OpenCOLLADA/CMakeLists.txt
--- OpenCOLLADA-orig/CMakeLists.txt	2016-03-01 18:34:27.589176369 +0000
+++ OpenCOLLADA/CMakeLists.txt	2016-03-01 18:43:21.441683364 +0000
@@ -1,3 +1,5 @@
+EXECUTE_PROCESS( COMMAND uname -m COMMAND tr -d '\n' OUTPUT_VARIABLE ARCHITECTURE )
+message( STATUS "Architecture: ${ARCHITECTURE}" )
 
 if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
 	if(NOT DEFINED WITH_IN_SOURCE_BUILD)
@@ -63,6 +65,11 @@ macro(opencollada_add_lib
 			else()
 				target_link_libraries(${name}_static ${target_lib})
 			endif()
+			if( ${ARCHITECTURE} MATCHES "mips" )
+				if(TARGET OpenCOLLADASaxFrameworkLoader_static)
+					SET_TARGET_PROPERTIES(OpenCOLLADASaxFrameworkLoader_static PROPERTIES COMPILE_FLAGS "-Umips")
+				endif()
+			endif()
 		endforeach()
 		set(CMAKE_REQUIRED_LIBRARIES "${name}_static;${CMAKE_REQUIRED_LIBRARIES}" PARENT_SCOPE)
 
@@ -84,6 +91,11 @@ macro(opencollada_add_lib
 			else()
 				target_link_libraries(${name}_shared ${target_lib})
 			endif()
+			if( ${ARCHITECTURE} MATCHES "mips" )
+				if(TARGET OpenCOLLADASaxFrameworkLoader_shared)
+					SET_TARGET_PROPERTIES(OpenCOLLADASaxFrameworkLoader_shared PROPERTIES COMPILE_FLAGS "-Umips")
+				endif()
+			endif()
 		endforeach()
 		set(CMAKE_REQUIRED_LIBRARIES "${name}_shared;${CMAKE_REQUIRED_LIBRARIES}"  PARENT_SCOPE)
 

Reply via email to