svn commit: r475007 - in head/games/openclonk: . files

[Tobias Kortkamp]

Author: tobik
Date: Fri Jul 20 11:57:29 2018
New Revision: 475007
URL: https://svnweb.freebsd.org/changeset/ports/475007

Log:
  Mark games/openclonk LLD_UNSAFE
  
  /usr/bin/ld: error: cannot preempt symbol: alGenSources
  >>> defined in /usr/local/lib/libopenal.so
  >>> referenced by C4MusicFile.cpp
  >>>               CMakeFiles/openclonk.dir/src/platform/C4MusicFile.cpp.o:(C4MusicFileOgg::Play(bool, double))
  
  http://beefy12.nyi.freebsd.org/data/head-amd64-default/p474767_s336359/logs/openclonk-8.1.log
  
  Need to disable use of -flto too or the build would fail with
  
  /usr/bin/ld.bfd: unrecognized option '-plugin'
  
  PR:		226980
  Reported by:	emaste, pkg-fallout

Modified:
  head/games/openclonk/Makefile
  head/games/openclonk/files/patch-CMakeLists.txt

Modified: head/games/openclonk/Makefile
==============================================================================
--- head/games/openclonk/Makefile	Fri Jul 20 11:35:19 2018	(r475006)
+++ head/games/openclonk/Makefile	Fri Jul 20 11:57:29 2018	(r475007)
@@ -33,6 +33,7 @@ USE_SDL=	sdl2
 USE_XORG=	x11 xpm
 INSTALLS_ICONS=	yes
 CMAKE_ARGS=	-DAudio_TK:STRING="OpenAL"
+LLD_UNSAFE=	yes
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|DESTINATION games|DESTINATION bin|' \

Modified: head/games/openclonk/files/patch-CMakeLists.txt
==============================================================================
--- head/games/openclonk/files/patch-CMakeLists.txt	Fri Jul 20 11:35:19 2018	(r475006)
+++ head/games/openclonk/files/patch-CMakeLists.txt	Fri Jul 20 11:57:29 2018	(r475007)
@@ -1,6 +1,14 @@
---- CMakeLists.txt.orig	2018-02-08 07:27:37 UTC
+--- CMakeLists.txt.orig	2018-03-16 17:25:33 UTC
 +++ CMakeLists.txt
-@@ -320,8 +320,6 @@ if(READLINE_FOUND)
+@@ -91,7 +91,6 @@ function(add_linker_flags)
+ 	endforeach()
+ endfunction()
+ 
+-CHECK_CXX_COMPILER_FLAG("-flto" USE_GCC_STYLE_LTCG)
+ if(USE_GCC_STYLE_LTCG)
+ 	set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -flto")
+ 	set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} -flto")
+@@ -337,8 +336,6 @@ if(READLINE_FOUND)
  endif()
  SET(HAVE_LIBREADLINE ${READLINE_FOUND} CACHE INTERNAL "libreadline available")
  
@@ -9,7 +17,7 @@
  # Select an audio library
  find_package("Audio")
  if(Audio_FOUND)
-@@ -339,8 +337,6 @@ set(HAVE_SDL ${SDL2_FOUND})
+@@ -356,8 +353,6 @@ set(HAVE_SDL ${SDL2_FOUND})
  include_directories(SYSTEM ${SDL2_INCLUDE_DIRS})
  
  # Qt5 for editor