diff --git a/.gitignore b/.gitignore index 1da77f7c9..3c0260c4d 100644 --- a/.gitignore +++ b/.gitignore @@ -12,7 +12,6 @@ demo/c++/rundemo bindings/python/mapnik/paths.py config.cache config.log -config.py .sconf_temp/ .sconsign.dblite demo/viewer/viewer.ini diff --git a/config.py b/config.py new file mode 100644 index 000000000..36c9753ff --- /dev/null +++ b/config.py @@ -0,0 +1,30 @@ +CXX = '/Developer/usr/bin/clang++' +CC = '/Developer/usr/bin/clang' +CUSTOM_CXXFLAGS = '-arch x86_64 -arch i386 -mmacosx-version-min=10.6 -isysroot /Developer/SDKs/MacOSX10.6.sdk -Iosx/sources/include ' +CUSTOM_LDFLAGS = '-Wl,-S -Wl,-search_paths_first -arch x86_64 -arch i386 -mmacosx-version-min=10.6 -isysroot /Developer/SDKs/MacOSX10.6.sdk -Losx/sources/lib ' +RUNTIME_LINK = 'static' +OPTIMIZATION = '3' +INPUT_PLUGINS = 'csv,gdal,ogr,postgis,shape,sqlite' +WARNING_CXXFLAGS = '-Wno-unused-function ' +DESTDIR = './osx/sources/' +PATH = './osx/sources/bin/' +PATH_REPLACE = '/Users/dane/projects/mapnik-dev/trunk-build-static-universal/osx/sources,/Users/dane/projects/mapnik-dev/macbinary/osx/sources:./osx/sources' +BOOST_INCLUDES = 'osx/sources/include' +BOOST_LIBS = 'osx/sources/lib' +FREETYPE_CONFIG = './osx/sources/bin/freetype-config' +ICU_INCLUDES = './osx/sources/include' +ICU_LIB_NAME = 'icucore' +PNG_INCLUDES = './osx/sources/include' +PNG_LIBS = './osx/sources/lib' +JPEG_INCLUDES = './osx/sources/include' +JPEG_LIBS = './osx/sources/lib' +TIFF_INCLUDES = './osx/sources/include' +TIFF_LIBS = './osx/sources/lib' +PROJ_INCLUDES = './osx/sources/include' +PROJ_LIBS = './osx/sources/lib' +PKG_CONFIG_PATH = './osx/sources/lib/pkgconfig' +CAIRO_INCLUDES = './osx/sources/include/' +CAIRO_LIBS = './osx/sources/lib' +SQLITE_INCLUDES = './osx/sources/include' +SQLITE_LIBS = './osx/sources/lib' +BINDINGS = 'none' \ No newline at end of file diff --git a/plugins/input/postgis/build.py b/plugins/input/postgis/build.py index c1d4a00a6..2e465517c 100644 --- a/plugins/input/postgis/build.py +++ b/plugins/input/postgis/build.py @@ -42,18 +42,24 @@ plugin_env['LIBS'].append(env['ICU_LIB_NAME']) if env['THREADING'] == 'multi': plugin_env['LIBS'].append('boost_thread%s' % env['BOOST_APPEND']) +linkflags = env['CUSTOM_LDFLAGS'] + if env['RUNTIME_LINK'] == 'static': #cmd = 'pg_config --libs' #plugin_env.ParseConfig(cmd) # pg_config does not seem to report correct deps of libpq # so resort to hardcoding for now plugin_env['LIBS'].extend(['ldap','pam','ssl','crypto','krb5']) + # if linking to internationalized libpq + linkflags += ' -liconv ' + linkflags += ' -lintl ' + linkflags += ' -framework Foundation ' -input_plugin = plugin_env.SharedLibrary('../postgis', source=postgis_src, SHLIBPREFIX='', SHLIBSUFFIX='.input', LINKFLAGS=env['CUSTOM_LDFLAGS']) +input_plugin = plugin_env.SharedLibrary('../postgis', source=postgis_src, SHLIBPREFIX='', SHLIBSUFFIX='.input', LINKFLAGS=linkflags) # if the plugin links to libmapnik ensure it is built first Depends(input_plugin, env.subst('../../../src/%s' % env['MAPNIK_LIB_NAME'])) if 'uninstall' not in COMMAND_LINE_TARGETS: env.Install(env['MAPNIK_INPUT_PLUGINS_DEST'], input_plugin) - env.Alias('install', env['MAPNIK_INPUT_PLUGINS_DEST']) + env.Alias('install', env['MAPNIK_INPUT_PLUGINS_DEST']) \ No newline at end of file