From owner-svn-ports-all@freebsd.org Sat Jun 8 19:37:38 2019 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 3056215B1BBD; Sat, 8 Jun 2019 19:37:38 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C95DC7001C; Sat, 8 Jun 2019 19:37:37 +0000 (UTC) (envelope-from pkubaj@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 A1622200B9; Sat, 8 Jun 2019 19:37:37 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x58JbbOU004423; Sat, 8 Jun 2019 19:37:37 GMT (envelope-from pkubaj@FreeBSD.org) Received: (from pkubaj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x58Jbb42004420; Sat, 8 Jun 2019 19:37:37 GMT (envelope-from pkubaj@FreeBSD.org) Message-Id: <201906081937.x58Jbb42004420@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pkubaj set sender to pkubaj@FreeBSD.org using -f From: Piotr Kubaj Date: Sat, 8 Jun 2019 19:37:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r503749 - in head/games/fs2open: . files X-SVN-Group: ports-head X-SVN-Commit-Author: pkubaj X-SVN-Commit-Paths: in head/games/fs2open: . files X-SVN-Commit-Revision: 503749 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: C95DC7001C X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.97)[-0.967,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 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: Sat, 08 Jun 2019 19:37:38 -0000 Author: pkubaj Date: Sat Jun 8 19:37:36 2019 New Revision: 503749 URL: https://svnweb.freebsd.org/changeset/ports/503749 Log: games/fs2open: fix build when lld is present Approved by: mat (mentor) Differential Revision: https://reviews.freebsd.org/D20268 Modified: head/games/fs2open/Makefile head/games/fs2open/files/patch-cmake_toolchain-clang.cmake head/games/fs2open/files/patch-cmake_toolchain-gcc.cmake Modified: head/games/fs2open/Makefile ============================================================================== --- head/games/fs2open/Makefile Sat Jun 8 19:24:18 2019 (r503748) +++ head/games/fs2open/Makefile Sat Jun 8 19:37:36 2019 (r503749) @@ -3,6 +3,7 @@ PORTNAME= fs2open DISTVERSIONPREFIX= release_ DISTVERSION= 3_8_0 +PORTREVISION= 1 CATEGORIES= games MAINTAINER= pkubaj@FreeBSD.org @@ -17,6 +18,7 @@ LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ libpng16.so:graphics/png USES= cmake compiler:c++11-lang lua:51 jpeg openal pkgconfig sdl +LLD_UNSAFE= yes USE_GITHUB= yes GH_ACCOUNT= scp-fs2open GH_PROJECT= fs2open.github.com Modified: head/games/fs2open/files/patch-cmake_toolchain-clang.cmake ============================================================================== --- head/games/fs2open/files/patch-cmake_toolchain-clang.cmake Sat Jun 8 19:24:18 2019 (r503748) +++ head/games/fs2open/files/patch-cmake_toolchain-clang.cmake Sat Jun 8 19:37:36 2019 (r503749) @@ -1,5 +1,16 @@ ---- cmake/toolchain-clang.cmake.orig 2018-06-24 19:14:21 UTC +--- cmake/toolchain-clang.cmake.orig 2017-08-22 16:56:27 UTC +++ cmake/toolchain-clang.cmake +@@ -8,8 +8,8 @@ option(CLANG_ENABLE_LEAK_CHECK "Enable -fsanitize=leak + option(CLANG_ENABLE_ADDRESS_SANITIZER "Enable -fsanitize=address" OFF) + + # These are the default values +-set(C_BASE_FLAGS "-march=native -pipe") +-set(CXX_BASE_FLAGS "-march=native -pipe") ++set(C_BASE_FLAGS "${CMAKE_C_FLAGS_RELEASE}") ++set(CXX_BASE_FLAGS "${CMAKE_CXX_FLAGS_RELEASE}") + + # For C and C++, the values can be overwritten independently + if(DEFINED ENV{CXXFLAGS}) @@ -80,7 +80,7 @@ if(SUPPORTS_SHIFT_NEGATIVE_VALUE) set(COMPILER_FLAGS "${COMPILER_FLAGS} -Wno-shift-negative-value") endif() @@ -9,3 +20,13 @@ set(COMPILER_FLAGS_DEBUG "-O0 -g -Wshadow") +@@ -93,9 +93,6 @@ set(CMAKE_C_FLAGS_RELEASE ${COMPILER_FLAGS_RELEASE}) + + set(CMAKE_CXX_FLAGS_DEBUG ${COMPILER_FLAGS_DEBUG}) + set(CMAKE_C_FLAGS_DEBUG ${COMPILER_FLAGS_DEBUG}) +- +- +-set(CMAKE_EXE_LINKER_FLAGS "") + + if (SANITIZE_FLAGS) + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${SANITIZE_FLAGS}") Modified: head/games/fs2open/files/patch-cmake_toolchain-gcc.cmake ============================================================================== --- head/games/fs2open/files/patch-cmake_toolchain-gcc.cmake Sat Jun 8 19:24:18 2019 (r503748) +++ head/games/fs2open/files/patch-cmake_toolchain-gcc.cmake Sat Jun 8 19:37:36 2019 (r503749) @@ -1,7 +1,18 @@ ---- cmake/toolchain-gcc.cmake.orig 2018-06-24 19:15:11 UTC +--- cmake/toolchain-gcc.cmake.orig 2017-08-22 16:56:27 UTC +++ cmake/toolchain-gcc.cmake -@@ -87,7 +87,7 @@ set(COMPILER_FLAGS "${COMPILER_FLAGS} -W +@@ -10,8 +10,8 @@ option(GCC_ENABLE_ADDRESS_SANITIZER "Enable -fsanitize + option(GCC_ENABLE_SANITIZE_UNDEFINED "Enable -fsanitize=undefined" OFF) + # These are the default values +-set(C_BASE_FLAGS "-march=native -pipe") +-set(CXX_BASE_FLAGS "-march=native -pipe") ++set(C_BASE_FLAGS "${CMAKE_C_FLAGS_RELEASE}" ) ++set(CXX_BASE_FLAGS "${CMAKE_CXX_FLAGS_RELEASE}") + + # For C and C++, the values can be overwritten independently + if(DEFINED ENV{CFLAGS}) +@@ -87,7 +87,7 @@ set(COMPILER_FLAGS "${COMPILER_FLAGS} -Wno-deprecated + set(COMPILER_FLAGS "${COMPILER_FLAGS} -Wno-unused-parameter") -set(COMPILER_FLAGS_RELEASE "-O2 -Wno-unused-variable -Wno-unused-but-set-variable -Wno-array-bounds -Wno-empty-body -Wno-clobbered") @@ -9,3 +20,12 @@ set(COMPILER_FLAGS_DEBUG "-O0 -g -Wshadow") +@@ -100,8 +100,6 @@ set(CMAKE_C_FLAGS_RELEASE ${COMPILER_FLAGS_RELEASE}) + + set(CMAKE_CXX_FLAGS_DEBUG ${COMPILER_FLAGS_DEBUG}) + set(CMAKE_C_FLAGS_DEBUG ${COMPILER_FLAGS_DEBUG}) +- +-set(CMAKE_EXE_LINKER_FLAGS "") + + IF (MINGW) + SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static -static-libgcc -static-libstdc++ -Wl,--enable-auto-import")