# HG changeset patch # User vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 # Date 1307502538 0 # Node ID be625cdff350e5c0656989e81f6b9ad9f5238289 # Parent 883dbf45afc93387546e942803fb1d687b0080dc This commit is to back port a fix in 0.3.3 dev branch to the current trunk. Adding boost_system as a required dependency as boost_filesystem is dependent on it. On linux distros with newer versions of gcc FIFE is failing to configure properly without boost_system in the lib list. [t:540] diff -r 883dbf45afc9 -r be625cdff350 build/linux2-config.py --- a/build/linux2-config.py Wed Jun 08 03:03:50 2011 +0000 +++ b/build/linux2-config.py Wed Jun 08 03:08:58 2011 +0000 @@ -1,97 +1,94 @@ -# -*- coding: utf-8 -*- - -# #################################################################### -# Copyright (C) 2005-2010 by the FIFE team -# http://www.fifengine.net -# This file is part of FIFE. -# -# FIFE is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# #################################################################### - -import sys -import os -import platform - -pythonversion = 'python' + str(os.sys.version_info[0]) + '.' + str(os.sys.version_info[1]) - -def initEnvironment(env): - - rootpath = env.Dir('#.').srcnode().abspath - extincludepath = os.path.join(rootpath, 'ext', 'install', 'include') - extlibpath = os.path.join(rootpath, 'ext', 'install', 'lib') - - env.Append(CPPPATH = [os.path.join('/', 'opt', 'include'), - os.path.join('/', 'usr', 'include', 'vorbis'), - os.path.join('/', 'usr', 'include', 'SDL'), - os.path.join('/', 'usr', 'include', pythonversion), - extincludepath]) - - env.Append(LIBPATH = [os.path.join('/', 'opt', 'lib'), - extlibpath]) - - env.AppendENVPath('LD_RUN_PATH', os.path.join('..', '..', '..', extlibpath)) - - env.AppendUnique(CXXFLAGS=["-DPNG_SKIP_SETJMP_CHECK"]) - - return env - -def addExtras(env, opengl): - env.Append(LIBS = pythonversion) - - if opengl: - env.Append(LIBS = ['stdc++', 'GL', 'GLU']) - env.Append(LIBPATH = os.path.join('/', 'usr', 'X11R6', 'lib')) - - return env - -def getRequiredHeaders(opengl): - return None - -def getRequiredLibs(opengl): - # libs is a list of tuples that have the form: - # (libname, headers) - # libname - may be a single library or a tuple of libraries - # headers - may be a single header or a list of headers - # - # This list is somewhat order dependent - # guichan_sdl - depends on at least the SDL libs and guichan prior in the list - # guichan_opengl - depends on at least guichan prior in the list - libs = [('vorbisfile', 'vorbisfile.h'), - ('openal', 'AL/al.h'), - ('SDL', 'SDL.h'), - ('SDL_ttf', 'SDL_ttf.h'), - ('SDL_image', 'SDL_image.h'), - ('guichan', 'guichan.hpp'), - ('guichan_sdl', ''), - (('boost_filesystem', 'boost_filesystem-gcc', 'boost_filesystem-gcc41', 'boost_filesystem-mt', 'libboost_filesystem-mt'), 'boost/filesystem.hpp'), - (('boost_regex', 'boost_regex-gcc', 'boost_regex-gcc41', 'boost_regex-mt', 'libboost_regex-mt'), 'boost/regex.hpp'), - ('png', 'png.h'), - ('Xcursor', '')] - - # fedora hack - if 'fedora' in platform.platform(): - libs.insert(0,('boost_system', '')) - - if (opengl): - libs.append(('guichan_opengl', '')) - - return libs - -def getOptionalLibs(opengl): - return None - -# vim: set filetype=python: - +# -*- coding: utf-8 -*- + +# #################################################################### +# Copyright (C) 2005-2010 by the FIFE team +# http://www.fifengine.net +# This file is part of FIFE. +# +# FIFE is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the +# Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# #################################################################### + +import sys +import os +import platform + +pythonversion = 'python' + str(os.sys.version_info[0]) + '.' + str(os.sys.version_info[1]) + +def initEnvironment(env): + + rootpath = env.Dir('#.').srcnode().abspath + extincludepath = os.path.join(rootpath, 'ext', 'install', 'include') + extlibpath = os.path.join(rootpath, 'ext', 'install', 'lib') + + env.Append(CPPPATH = [os.path.join('/', 'opt', 'include'), + os.path.join('/', 'usr', 'include', 'vorbis'), + os.path.join('/', 'usr', 'include', 'SDL'), + os.path.join('/', 'usr', 'include', pythonversion), + extincludepath]) + + env.Append(LIBPATH = [os.path.join('/', 'opt', 'lib'), + extlibpath]) + + env.AppendENVPath('LD_RUN_PATH', os.path.join('..', '..', '..', extlibpath)) + + env.AppendUnique(CXXFLAGS=["-DPNG_SKIP_SETJMP_CHECK"]) + + return env + +def addExtras(env, opengl): + env.Append(LIBS = pythonversion) + + if opengl: + env.Append(LIBS = ['stdc++', 'GL', 'GLU']) + env.Append(LIBPATH = os.path.join('/', 'usr', 'X11R6', 'lib')) + + return env + +def getRequiredHeaders(opengl): + return None + +def getRequiredLibs(opengl): + # libs is a list of tuples that have the form: + # (libname, headers) + # libname - may be a single library or a tuple of libraries + # headers - may be a single header or a list of headers + # + # This list is somewhat order dependent + # guichan_sdl - depends on at least the SDL libs and guichan prior in the list + # guichan_opengl - depends on at least guichan prior in the list + libs = [('vorbisfile', 'vorbisfile.h'), + ('openal', 'AL/al.h'), + ('SDL', 'SDL.h'), + ('SDL_ttf', 'SDL_ttf.h'), + ('SDL_image', 'SDL_image.h'), + ('guichan', 'guichan.hpp'), + ('guichan_sdl', ''), + ('boost_system', ''), + (('boost_filesystem', 'boost_filesystem-gcc', 'boost_filesystem-gcc41', 'boost_filesystem-mt', 'libboost_filesystem-mt'), 'boost/filesystem.hpp'), + (('boost_regex', 'boost_regex-gcc', 'boost_regex-gcc41', 'boost_regex-mt', 'libboost_regex-mt'), 'boost/regex.hpp'), + ('png', 'png.h'), + ('Xcursor', '')] + + if (opengl): + libs.append(('guichan_opengl', '')) + + return libs + +def getOptionalLibs(opengl): + return None + +# vim: set filetype=python: + diff -r 883dbf45afc9 -r be625cdff350 build/openbsd4-config.py --- a/build/openbsd4-config.py Wed Jun 08 03:03:50 2011 +0000 +++ b/build/openbsd4-config.py Wed Jun 08 03:08:58 2011 +0000 @@ -1,63 +1,64 @@ -# Install the following packages: libvorbis python py-yaml swig png openal sdl -# sdl-image sdl-ttf guichan boost -# - -import sys -import os - -def initEnvironment(env): - # Vorbisfile - env.Append(CPPPATH = [ - os.path.join('/', 'usr', 'local', 'include'), - os.path.join('/', 'usr', 'local', 'include', 'vorbis') - ]) - env.Append(LIBPATH = [os.path.join('/', 'usr', 'local', 'lib')]) - env.Append(LIBS = ['ogg', 'vorbis']) - - # PNG - env.Append(CPPPATH = [os.path.join('/', 'usr', 'local', 'include', 'libpng')]) - - # Python library - pythonversion = 'python' + str(os.sys.version_info[0]) + '.' + str(os.sys.version_info[1]) - env.Append(CPPPATH = os.path.join('/', 'usr', 'local', 'include', pythonversion)) - env.Append(LIBS = [pythonversion, 'util']) - - # OpenBSD specific pthreads option - env.Append(LINKFLAGS = ['-pthread']) - - return env - -def addExtras(env, opengl): - if opengl: - env.Append(LIBS = ['stdc++', 'GL', 'GLU']) - env.Append(LIBPATH = os.path.join('/', 'usr', 'X11R6', 'lib')) - - return env - -def getRequiredHeaders(opengl): - return None - -def getRequiredLibs(opengl): - libs = [ - ('vorbisfile', 'vorbisfile.h'), - ('openal', 'AL/al.h'), - ('SDL', 'SDL.h'), - ('SDL_ttf', 'SDL_ttf.h'), - ('SDL_image', 'SDL_image.h'), - ('guichan', 'guichan.hpp'), - ('guichan_sdl', ''), - (('boost_filesystem', 'boost_filesystem-gcc', 'boost_filesystem-gcc41', 'boost_filesystem-mt'), 'boost/filesystem.hpp'), - (('boost_regex', 'boost_regex-gcc', 'boost_regex-gcc41', 'boost_regex-mt'), 'boost/regex.hpp'), - ('png', 'png.h'), - ('Xcursor', 'X11/Xcursor/Xcursor.h')] - - if (opengl): - libs.append(('guichan_opengl', '')) - - return libs - -def getOptionalLibs(opengl): - return None - -# vim: ft=python: - +# Install the following packages: libvorbis python py-yaml swig png openal sdl +# sdl-image sdl-ttf guichan boost +# + +import sys +import os + +def initEnvironment(env): + # Vorbisfile + env.Append(CPPPATH = [ + os.path.join('/', 'usr', 'local', 'include'), + os.path.join('/', 'usr', 'local', 'include', 'vorbis') + ]) + env.Append(LIBPATH = [os.path.join('/', 'usr', 'local', 'lib')]) + env.Append(LIBS = ['ogg', 'vorbis']) + + # PNG + env.Append(CPPPATH = [os.path.join('/', 'usr', 'local', 'include', 'libpng')]) + + # Python library + pythonversion = 'python' + str(os.sys.version_info[0]) + '.' + str(os.sys.version_info[1]) + env.Append(CPPPATH = os.path.join('/', 'usr', 'local', 'include', pythonversion)) + env.Append(LIBS = [pythonversion, 'util']) + + # OpenBSD specific pthreads option + env.Append(LINKFLAGS = ['-pthread']) + + return env + +def addExtras(env, opengl): + if opengl: + env.Append(LIBS = ['stdc++', 'GL', 'GLU']) + env.Append(LIBPATH = os.path.join('/', 'usr', 'X11R6', 'lib')) + + return env + +def getRequiredHeaders(opengl): + return None + +def getRequiredLibs(opengl): + libs = [ + ('vorbisfile', 'vorbisfile.h'), + ('openal', 'AL/al.h'), + ('SDL', 'SDL.h'), + ('SDL_ttf', 'SDL_ttf.h'), + ('SDL_image', 'SDL_image.h'), + ('guichan', 'guichan.hpp'), + ('guichan_sdl', ''), + ('boost_system', ''), + (('boost_filesystem', 'boost_filesystem-gcc', 'boost_filesystem-gcc41', 'boost_filesystem-mt'), 'boost/filesystem.hpp'), + (('boost_regex', 'boost_regex-gcc', 'boost_regex-gcc41', 'boost_regex-mt'), 'boost/regex.hpp'), + ('png', 'png.h'), + ('Xcursor', 'X11/Xcursor/Xcursor.h')] + + if (opengl): + libs.append(('guichan_opengl', '')) + + return libs + +def getOptionalLibs(opengl): + return None + +# vim: ft=python: +