svn commit: r384966 - head/games/0ad/files

Guido Falsi madpilot at FreeBSD.org
Wed Apr 29 06:47:38 UTC 2015


Author: madpilot
Date: Wed Apr 29 06:47:37 2015
New Revision: 384966
URL: https://svnweb.freebsd.org/changeset/ports/384966

Log:
  Fix build after const removal from iconv.
  
  Reported by:	ajtiM <lumiwa at gmail.com> (via email)

Modified:
  head/games/0ad/files/patch-build__premake__extern_libs4.lua

Modified: head/games/0ad/files/patch-build__premake__extern_libs4.lua
==============================================================================
--- head/games/0ad/files/patch-build__premake__extern_libs4.lua	Wed Apr 29 06:42:51 2015	(r384965)
+++ head/games/0ad/files/patch-build__premake__extern_libs4.lua	Wed Apr 29 06:47:37 2015	(r384966)
@@ -1,6 +1,6 @@
---- build/premake/extern_libs4.lua.orig	2014-09-24 10:05:27 UTC
+--- build/premake/extern_libs4.lua.orig	2015-02-20 05:52:18 UTC
 +++ build/premake/extern_libs4.lua
-@@ -237,7 +237,7 @@
+@@ -237,7 +237,7 @@ extern_lib_defs = {
  			end
  			-- TODO: This actually applies to most libraries we use on BSDs, make this a global setting.
  			if os.is("bsd") then
@@ -9,3 +9,12 @@
  			end
  		end,
  		link_settings = function()
+@@ -346,8 +346,6 @@ extern_lib_defs = {
+ 			elseif os.is("macosx") then
+ 				add_default_include_paths("iconv")
+ 				defines { "LIBICONV_STATIC" }
+-			elseif os.getversion().description == "FreeBSD" then
+-				defines { "HAVE_ICONV_CONST" }
+ 			end
+ 		end,
+ 		link_settings = function()


More information about the svn-ports-head mailing list