Gentoo Archives: gentoo-commits

From: "Mu Qiao (qiaomuf)" <qiaomuf@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-i18n/ibus-sunpinyin/files: ibus-sunpinyin-2.0.3-force-switch.patch
Date: Sat, 26 Feb 2011 08:16:23
Message-Id: 20110226081558.6E84120057@flycatcher.gentoo.org
1 qiaomuf 11/02/26 08:15:58
2
3 Added: ibus-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/ibus-sunpinyin/files/ibus-sunpinyin-2.0.3-force-switch.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/ibus-sunpinyin/files/ibus-sunpinyin-2.0.3-force-switch.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/ibus-sunpinyin/files/ibus-sunpinyin-2.0.3-force-switch.patch?rev=1.1&content-type=text/plain
14
15 Index: ibus-sunpinyin-2.0.3-force-switch.patch
16 ===================================================================
17 diff --git a/wrapper/ibus/SConstruct b/wrapper/ibus/SConstruct
18 index 92b1094..3e1166f 100644
19 --- a/wrapper/ibus/SConstruct
20 +++ b/wrapper/ibus/SConstruct
21 @@ -14,7 +14,7 @@ sources = ['src/debug.cpp',
22
23 locales = ['zh_CN']
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 @@ -62,9 +62,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 @@ -85,6 +82,9 @@ extra_cflags += ' -DGETTEXT_PACKAGE=\'"%s"\'' % gettext_package
41 env.Append(CFLAGS=extra_cflags)
42 env.Append(CXXFLAGS=extra_cflags)
43
44 +if GetOption('rpath') is not None:
45 + env.Append(LINKFLAGS=' -Wl,-R -Wl,%s' % GetOption('rpath'))
46 +
47 #
48 #==============================configure================================
49 #