From owner-svn-ports-all@freebsd.org Fri Jul 20 11:57:30 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 74FB210420A7; Fri, 20 Jul 2018 11:57:30 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 230A879390; Fri, 20 Jul 2018 11:57:30 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id F2F3B7D4B; Fri, 20 Jul 2018 11:57:29 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6KBvTYo022525; Fri, 20 Jul 2018 11:57:29 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6KBvTmn022524; Fri, 20 Jul 2018 11:57:29 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201807201157.w6KBvTmn022524@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Fri, 20 Jul 2018 11:57:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r475007 - in head/games/openclonk: . files X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: in head/games/openclonk: . files X-SVN-Commit-Revision: 475007 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Jul 2018 11:57:30 -0000 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