1 |
qiaomuf 11/02/26 08:21:36 |
2 |
|
3 |
Added: scim-sunpinyin-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/scim-sunpinyin/files/scim-sunpinyin-2.0.3-force-switch.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/scim-sunpinyin/files/scim-sunpinyin-2.0.3-force-switch.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/scim-sunpinyin/files/scim-sunpinyin-2.0.3-force-switch.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: scim-sunpinyin-2.0.3-force-switch.patch |
16 |
=================================================================== |
17 |
diff --git a/wrapper/scim/SConstruct b/wrapper/scim/SConstruct |
18 |
index 7739300..ef7c69b 100644 |
19 |
--- a/wrapper/scim/SConstruct |
20 |
+++ b/wrapper/scim/SConstruct |
21 |
@@ -3,7 +3,7 @@ import SCons.Tool.textfile |
22 |
|
23 |
locales = [] |
24 |
|
25 |
-cflags = '-O2 -g -pipe' |
26 |
+cflags = '-O2 -g -pipe ' |
27 |
version = '2.0.3' |
28 |
|
29 |
AddOption('--prefix', dest='prefix', metavar='DIR', |
30 |
@@ -51,9 +51,6 @@ if GetOption('datadir') is not None: |
31 |
|
32 |
opts.Save('configure.conf', env) |
33 |
|
34 |
-if GetOption('rpath') is not None: |
35 |
- env.Append(LINKFLAGS='-Wl,-R -Wl,%s' % GetOption('rpath')) |
36 |
- |
37 |
envvar = [('CC', 'CC'), |
38 |
('CXX', 'CXX'), |
39 |
('CFLAGS', 'CFLAGS'), |
40 |
@@ -75,6 +72,10 @@ extra_cflags += ' -Isrc' |
41 |
env.Append(CFLAGS=extra_cflags) |
42 |
env.Append(CXXFLAGS=extra_cflags) |
43 |
env.Replace(SHLIBPREFIX = '') |
44 |
+ |
45 |
+if GetOption('rpath') is not None: |
46 |
+ env.Append(LINKFLAGS=' -Wl,-R -Wl,%s' % GetOption('rpath')) |
47 |
+ |
48 |
# |
49 |
#==============================configure================================ |
50 |
# |