| 1 |
qiaomuf 11/02/26 08:24:47 |
| 2 |
|
| 3 |
Added: xsunpinyin-2.0.3-force-switch.patch |
| 4 |
Log: |
| 5 |
Include upstream patch. |
| 6 |
|
| 7 |
(Portage version: 2.1.9.41/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 app-i18n/xsunpinyin/files/xsunpinyin-2.0.3-force-switch.patch |
| 11 |
|
| 12 |
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 |
| 13 |
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 |
| 14 |
|
| 15 |
Index: xsunpinyin-2.0.3-force-switch.patch |
| 16 |
=================================================================== |
| 17 |
diff --git a/wrapper/xim/SConstruct b/wrapper/xim/SConstruct |
| 18 |
index 9d1cafd..495871d 100644 |
| 19 |
--- a/wrapper/xim/SConstruct |
| 20 |
+++ b/wrapper/xim/SConstruct |
| 21 |
@@ -32,7 +32,7 @@ imdkit_sources = ['IMdkit/FrameMgr.c', |
| 22 |
'IMdkit/IMValues.c'] |
| 23 |
|
| 24 |
|
| 25 |
-cflags='-O2 -g -pipe' |
| 26 |
+cflags='-O2 -g -pipe ' |
| 27 |
|
| 28 |
# options |
| 29 |
AddOption('--prefix', dest='prefix', type='string', nargs=1, action='store', |
| 30 |
@@ -52,7 +52,6 @@ def PassVariables(envvar, env): |
| 31 |
|
| 32 |
env = Environment(ENV=os.environ, |
| 33 |
CFLAGS=cflags, CXXFLAGS=cflags, |
| 34 |
- LINKFLAGS=['-export-dynamic'], |
| 35 |
CPPPATH=['.', 'IMdkit']) |
| 36 |
opts.Update(env) |
| 37 |
|
| 38 |
@@ -62,11 +61,6 @@ if GetOption('prefix') is not None: |
| 39 |
|
| 40 |
opts.Save('configure.conf', env) |
| 41 |
|
| 42 |
- |
| 43 |
-# set rpath |
| 44 |
-if GetOption('rpath') is not None: |
| 45 |
- env.Append(LINKFLAGS='-Wl,-R -Wl,%s' % GetOption('rpath')) |
| 46 |
- |
| 47 |
envvar = [('CC', 'CC'), |
| 48 |
('CXX', 'CXX'), |
| 49 |
('CFLAGS', 'CFLAGS'), |
| 50 |
@@ -83,7 +77,11 @@ extra_cflags += ' -DSUNPINYIN_XIM_SETTING_DIR=\\"%s\\"' % data_dir |
| 51 |
|
| 52 |
env.Append(CFLAGS=extra_cflags) |
| 53 |
env.Append(CXXFLAGS=extra_cflags) |
| 54 |
+env.Append(LINKFLAGS=' -export-dynamic') |
| 55 |
|
| 56 |
+# set rpath |
| 57 |
+if GetOption('rpath') is not None: |
| 58 |
+ env.Append(LINKFLAGS=' -Wl,-R -Wl,%s' % GetOption('rpath')) |
| 59 |
|
| 60 |
# |
| 61 |
#==============================configure================================ |
Archives