From 50b4d09ebb3a2b51d9bfc13b282df85114ab8d2e Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 11 Dec 2012 22:40:57 +0000 Subject: [PATCH] Hopefully fix completely broken static builds. --- ChangeLog | 7 +++++++ wscript | 52 ++++++++++++++++++++++++++++++++++++---------------- 2 files changed, 43 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2734ef73f..5bd3dc328 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2012-12-11 Carl Hetherington + + * Hopefully fix utterly broken partially-static + builds for .debs. + + * Fix specification of architecture in .debs. + 2012-12-10 Carl Hetherington * Version 0.59 released. diff --git a/wscript b/wscript index 290bf9b52..77a297d43 100644 --- a/wscript +++ b/wscript @@ -50,21 +50,41 @@ def configure(conf): else: conf.env.append_value('CXXFLAGS', '-O2') - # Arguments to pkg-config for things that we might want to link statically - pkgconfig_args = '--cflags --libs' - if conf.options.static: - pkgconfig_args += ' --static' - - conf.check_cfg(package = 'libdcp', atleast_version = '0.34', args = pkgconfig_args, uselib_store = 'DCP', mandatory = True) - conf.check_cfg(package = 'libavformat', args = pkgconfig_args, uselib_store = 'AVFORMAT', mandatory = True) - conf.check_cfg(package = 'libavfilter', args = pkgconfig_args, uselib_store = 'AVFILTER', mandatory = True) - conf.check_cfg(package = 'libavcodec', args = pkgconfig_args, uselib_store = 'AVCODEC', mandatory = True) - conf.check_cfg(package = 'libavutil', args = pkgconfig_args, uselib_store = 'AVUTIL', mandatory = True) - conf.check_cfg(package = 'libswscale', args = pkgconfig_args, uselib_store = 'SWSCALE', mandatory = True) - conf.check_cfg(package = 'libswresample', args = pkgconfig_args, uselib_store = 'SWRESAMPLE', mandatory = False) - conf.check_cfg(package = 'libpostproc', args = pkgconfig_args, uselib_store = 'POSTPROC', mandatory = True) + if not conf.options.static: + conf.check_cfg(package = 'libdcp', atleast_version = '0.34', args = '--cflags --libs', uselib_store = 'DCP', mandatory = True) + conf.check_cfg(package = 'libavformat', args = '--cflags --libs', uselib_store = 'AVFORMAT', mandatory = True) + conf.check_cfg(package = 'libavfilter', args = '--cflags --libs', uselib_store = 'AVFILTER', mandatory = True) + conf.check_cfg(package = 'libavcodec', args = '--cflags --libs', uselib_store = 'AVCODEC', mandatory = True) + conf.check_cfg(package = 'libavutil', args = '--cflags --libs', uselib_store = 'AVUTIL', mandatory = True) + conf.check_cfg(package = 'libswscale', args = '--cflags --libs', uselib_store = 'SWSCALE', mandatory = True) + conf.check_cfg(package = 'libswresample', args = '--cflags --libs', uselib_store = 'SWRESAMPLE', mandatory = False) + conf.check_cfg(package = 'libpostproc', args = '--cflags --libs', uselib_store = 'POSTPROC', mandatory = True) + else: + # This is hackio grotesquio for static builds (ie for .deb packages). We need to link some things + # statically and some dynamically, or things get horribly confused the dynamic linker (I think) + # crashes horribly. These calls do what the check_cfg calls would have done, but specify the + # different bits as static or dynamic as required. It'll break if you look at it funny, but + # I think anyone else who builds would do so dynamically. + conf.env.HAVE_DCP = 1 + conf.env.STLIB_DCP = ['dcp', 'asdcp-libdcp', 'kumu-libdcp'] + conf.env.LIB_DCP = ['glibmm-2.4', 'xml++-2.6', 'ssl3', 'gnutls-openssl', 'crypto', 'bz2'] + conf.env.HAVE_AVFORMAT = 1 + conf.env.STLIB_AVFORMAT = ['avformat'] + conf.env.HAVE_AVFILTER = 1 + conf.env.STLIB_AVFILTER = ['avfilter', 'swresample'] + conf.env.HAVE_AVCODEC = 1 + conf.env.STLIB_AVCODEC = ['avcodec'] + conf.env.LIB_AVCODEC = ['x264', 'z'] + conf.env.HAVE_AVUTIL = 1 + conf.env.STLIB_AVUTIL = ['avutil'] + conf.env.HAVE_SWSCALE = 1 + conf.env.STLIB_SWSCALE = ['swscale'] + conf.env.HAVE_SWRESAMPLE = 1 + conf.env.STLIB_SWRESAMPLE = ['swresample'] + conf.env.HAVE_POSTPROC = 1 + conf.env.STLIB_POSTPROC = ['postproc'] + conf.check_cfg(package = 'sndfile', args = '--cflags --libs', uselib_store = 'SNDFILE', mandatory = True) - conf.check_cfg(package = 'libdcp', atleast_version = '0.33', args = pkgconfig_args, uselib_store = 'DCP', mandatory = True) conf.check_cfg(package = 'glib-2.0', args = '--cflags --libs', uselib_store = 'GLIB', mandatory = True) conf.check_cfg(package = '', path = 'Magick++-config', args = '--cppflags --cxxflags --libs', uselib_store = 'MAGICK', mandatory = True) @@ -78,9 +98,9 @@ def configure(conf): """ if conf.options.static: - conf.check_cc(fragment = openjpeg_fragment, msg = 'Checking for library openjpeg', stlib = 'openjpeg', uselib_store = 'OPENJPEG') + conf.check_cc(fragment = openjpeg_fragment, msg = 'Checking for library openjpeg', stlib = 'openjpeg', uselib_store = 'OPENJPEG') else: - conf.check_cc(fragment = openjpeg_fragment, msg = 'Checking for library openjpeg', lib = 'openjpeg', uselib_store = 'OPENJPEG') + conf.check_cc(fragment = openjpeg_fragment, msg = 'Checking for library openjpeg', lib = 'openjpeg', uselib_store = 'OPENJPEG') conf.check_cc(fragment = """ #include \n -- 2.30.2