* [gentoo-commits] gentoo-x86 commit in app-i18n/xsunpinyin/files: xsunpinyin-2.0.3-force-switch.patch
@ 2011-02-26 8:24 Mu Qiao (qiaomuf)
0 siblings, 0 replies; only message in thread
From: Mu Qiao (qiaomuf) @ 2011-02-26 8:24 UTC (permalink / raw
To: gentoo-commits
qiaomuf 11/02/26 08:24:47
Added: xsunpinyin-2.0.3-force-switch.patch
Log:
Include upstream patch.
(Portage version: 2.1.9.41/cvs/Linux x86_64)
Revision Changes Path
1.1 app-i18n/xsunpinyin/files/xsunpinyin-2.0.3-force-switch.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/xsunpinyin/files/xsunpinyin-2.0.3-force-switch.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/xsunpinyin/files/xsunpinyin-2.0.3-force-switch.patch?rev=1.1&content-type=text/plain
Index: xsunpinyin-2.0.3-force-switch.patch
===================================================================
diff --git a/wrapper/xim/SConstruct b/wrapper/xim/SConstruct
index 9d1cafd..495871d 100644
--- a/wrapper/xim/SConstruct
+++ b/wrapper/xim/SConstruct
@@ -32,7 +32,7 @@ imdkit_sources = ['IMdkit/FrameMgr.c',
'IMdkit/IMValues.c']
-cflags='-O2 -g -pipe'
+cflags='-O2 -g -pipe '
# options
AddOption('--prefix', dest='prefix', type='string', nargs=1, action='store',
@@ -52,7 +52,6 @@ def PassVariables(envvar, env):
env = Environment(ENV=os.environ,
CFLAGS=cflags, CXXFLAGS=cflags,
- LINKFLAGS=['-export-dynamic'],
CPPPATH=['.', 'IMdkit'])
opts.Update(env)
@@ -62,11 +61,6 @@ if GetOption('prefix') is not None:
opts.Save('configure.conf', env)
-
-# set rpath
-if GetOption('rpath') is not None:
- env.Append(LINKFLAGS='-Wl,-R -Wl,%s' % GetOption('rpath'))
-
envvar = [('CC', 'CC'),
('CXX', 'CXX'),
('CFLAGS', 'CFLAGS'),
@@ -83,7 +77,11 @@ extra_cflags += ' -DSUNPINYIN_XIM_SETTING_DIR=\\"%s\\"' % data_dir
env.Append(CFLAGS=extra_cflags)
env.Append(CXXFLAGS=extra_cflags)
+env.Append(LINKFLAGS=' -export-dynamic')
+# set rpath
+if GetOption('rpath') is not None:
+ env.Append(LINKFLAGS=' -Wl,-R -Wl,%s' % GetOption('rpath'))
#
#==============================configure================================
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2011-02-26 8:24 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-26 8:24 [gentoo-commits] gentoo-x86 commit in app-i18n/xsunpinyin/files: xsunpinyin-2.0.3-force-switch.patch Mu Qiao (qiaomuf)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox