svn commit: r427076 - branches/2016Q4/devel/rlvm/files

[Jan Beich]

Author: jbeich
Date: Fri Nov 25 03:42:40 2016
New Revision: 427076
URL: https://svnweb.freebsd.org/changeset/ports/427076

Log:
  MFH: r427074
  
  devel/rlvm: unbreak TEST=on + NLS=on
  
  build/release/librlvm.a(scenario.o): In function `libreallive::Script::Script(libreallive::Header const&, char const*, unsigned long, std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > const&, bool, libreallive::compression::XorKey const*)':
  src/libreallive/scenario.cc:(.text._ZN11libreallive6ScriptC2ERKNS_6HeaderEPKcmRKNSt3__112basic_stringIcNS6_11char_traitsIcEENS6_9allocatorIcEEEEbPKNS_11compression6XorKeyE+0x496): undefined reference to `libintl_gettext'
  src/libreallive/scenario.cc:(.text._ZN11libreallive6ScriptC2ERKNS_6HeaderEPKcmRKNSt3__112basic_stringIcNS6_11char_traitsIcEENS6_9allocatorIcEEEEbPKNS_11compression6XorKeyE+0x66c): undefined reference to `libintl_gettext'
  build/release/librlvm.a(serialization_global.o): In function `Serialization::saveGlobalMemory(RLMachine&)':
  src/machine/serialization_global.cc:(.text._ZN13Serialization16saveGlobalMemoryER9RLMachine+0xe8): undefined reference to `libintl_gettext'
  build/release/librlvm.a(serialization_local.o): In function `Serialization::saveGameForSlot(RLMachine&, int)':
  src/machine/serialization_local.cc:(.text._ZN13Serialization15saveGameForSlotER9RLMachinei+0x7b): undefined reference to `libintl_gettext'
  build/release/librlvm.a(serialization_local.o): In function `void (anonymous namespace)::checkInFileOpened<boost::filesystem::basic_ifstream<char, std::__1::char_traits<char> > >(boost::filesystem::basic_ifstream<char, std::__1::char_traits<char> >&, boost::filesystem::path const&)':
  src/machine/serialization_local.cc:(.text._ZN12_GLOBAL__N_117checkInFileOpenedIN5boost10filesystem14basic_ifstreamIcNSt3__111char_traitsIcEEEEEEvRT_RKNS2_4pathE+0x45): undefined reference to `libintl_gettext'
  
  Approved by:	ports-secteam blanket

Modified:
  branches/2016Q4/devel/rlvm/files/patch-SConstruct
Directory Properties:
  branches/2016Q4/   (props changed)

Modified: branches/2016Q4/devel/rlvm/files/patch-SConstruct
==============================================================================
--- branches/2016Q4/devel/rlvm/files/patch-SConstruct	Fri Nov 25 03:41:08 2016	(r427075)
+++ branches/2016Q4/devel/rlvm/files/patch-SConstruct	Fri Nov 25 03:42:40 2016	(r427076)
@@ -13,6 +13,14 @@
  
    LIBS = ["z"],
  
+@@ -278,6 +275,7 @@ if not config.CheckGuichan():
+ # Get the configuration from sdl and freetype
+ env.ParseConfig("sdl-config --cflags")
+ env.ParseConfig("freetype-config --cflags --libs")
++config.CheckLibWithHeader('intl', 'libintl.h', "cpp")
+ 
+ env = config.Finish()
+ 
 @@ -314,7 +311,6 @@ if GetOption('release'):
    # Now add release optimizations to the environment
    env.Append(