creffett 15/04/19 01:23:29 Added: glosung-3.6.2-scons-2.3.2-respectflags.patch Log: Fix build with newer scons wrt bug 544130 (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0xD1BAB6B528DB029C)
Revision Changes Path 1.1 app-text/glosung/files/glosung-3.6.2-scons-2.3.2-respectflags.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/glosung/files/glosung-3.6.2-scons-2.3.2-respectflags.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/glosung/files/glosung-3.6.2-scons-2.3.2-respectflags.patch?rev=1.1&content-type=text/plain Index: glosung-3.6.2-scons-2.3.2-respectflags.patch =================================================================== --- a/SConstruct +++ b/SConstruct @@ -17,6 +17,7 @@ import os +import SCons.Util version = '3.6.2' @@ -32,14 +33,22 @@ (this option is only for packaging)''') env = Environment ( - LINK = 'gcc', - CC = 'gcc', CPPPATH = '', LINKFLAGS = '', CCFLAGS = '', ENV = os.environ, TARFLAGS = '-c -j') +if os.environ.has_key('CC'): + env['CC'] = os.environ['CC'] +if os.environ.has_key('CFLAGS'): + env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS']) +if os.environ.has_key('CXX'): + env['CXX'] = os.environ['CXX'] +if os.environ.has_key('CXXFLAGS'): + env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CXXFLAGS']) +if os.environ.has_key('LDFLAGS'): + env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS']) if env['PLATFORM'] == 'win32': prefix = ARGUMENTS.get ('PREFIX', '') @@ -58,7 +68,7 @@ BuildDir ('build', 'src') cpppath = ['#', '#build'] -ccflags = ['-O2', '-std=c99', '-Wall', '-g', '-Wl,--export-dynamic', +ccflags = ['-std=c99', # '-DLIBXML_STATIC', '-DVERSION=\\"' + version + '\\"', '-DGLOSUNG_DATA_DIR=\\"' + data_dir + '\\"', @@ -74,7 +74,7 @@ '-DGLOSUNG_DATA_DIR=\\"' + data_dir + '\\"', '-DPACKAGE_PIXMAPS_DIR=\\"' + pixmap_dir + '\\"'] -linkflags = ['-Wl,--export-dynamic', '-L.'] +linkflags = [] # -L/usr/lib' # `pkg-config --libs gtk+-2.0 libxml-2.0 gconf-2.0 libcurl` @@ -83,9 +83,6 @@ ccflags.append ('-pg', '-fprofile-arcs') linkflags.append ('-pg', '-fprofile-arcs') -if env['PLATFORM'] != 'win32': - linkflags.append ('-Wl,--as-needed') - #if not (ARGUMENTS.get ('dev')): if (ARGUMENTS.get ('dev')): ccflags += [
