summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Reffett <creffett@gentoo.org>2016-01-22 22:19:40 -0500
committerChris Reffett <creffett@gentoo.org>2016-01-22 22:19:40 -0500
commit64db96ccd892c0cf7cec5949908220776328d22d (patch)
tree9fa812880d6cbc611798b70ae35716ca8cd2be39 /app-text/glosung/files
parentgames-roguelike/dwarf-fortress: Version bump (diff)
downloadgentoo-64db96ccd892c0cf7cec5949908220776328d22d.tar.gz
gentoo-64db96ccd892c0cf7cec5949908220776328d22d.tar.bz2
gentoo-64db96ccd892c0cf7cec5949908220776328d22d.zip
app-text/glosung: Version bump
Gentoo-Bug: 571144 Package-Manager: portage-2.2.26
Diffstat (limited to 'app-text/glosung/files')
-rw-r--r--app-text/glosung/files/glosung-3.6.4-scons-respectflags.patch61
1 files changed, 61 insertions, 0 deletions
diff --git a/app-text/glosung/files/glosung-3.6.4-scons-respectflags.patch b/app-text/glosung/files/glosung-3.6.4-scons-respectflags.patch
new file mode 100644
index 000000000000..9adece925b19
--- /dev/null
+++ b/app-text/glosung/files/glosung-3.6.4-scons-respectflags.patch
@@ -0,0 +1,61 @@
+diff -ruN glosung-3.6.4-original/SConstruct glosung-3.6.4/SConstruct
+--- glosung-3.6.4-original/SConstruct 2016-01-22 22:11:00.785053522 -0500
++++ glosung-3.6.4/SConstruct 2016-01-22 22:14:04.434058592 -0500
+@@ -17,6 +17,7 @@
+
+
+ import os
++import SCons.Util
+
+ version = '3.6.4'
+
+@@ -32,14 +33,23 @@
+ (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', '')
+ install_dir = ARGUMENTS.get ('DESTDIR', '')
+@@ -57,21 +67,18 @@
+ VariantDir('build', 'src')
+
+ cpppath = ['#', '#build']
+-ccflags = ['-O2', '-std=c99', '-Wall', '-g',
++ccflags = ['-std=c99',
+ # '-DLIBXML_STATIC',
+ '-DVERSION=\\"' + version + '\\"',
+ '-DGLOSUNG_DATA_DIR=\\"' + data_dir + '\\"',
+ '-DPACKAGE_PIXMAPS_DIR=\\"' + pixmap_dir + '\\"']
+
+-linkflags = ['-L.']
++linkflags = []
+
+ if ARGUMENTS.get ('profile'):
+ ccflags.append ('-pg', '-fprofile-arcs')
+ linkflags.append ('-pg', '-fprofile-arcs', '-Wl,--export-dynamic')
+
+-if env['PLATFORM'] != 'win32':
+- linkflags.append ('-Wl,--as-needed')
+-
+ #if not (ARGUMENTS.get ('dev')):
+ if (ARGUMENTS.get ('dev')):
+ ccflags += [