diff options
| author |   Mu Qiao <qiaomuf@gentoo.org> | 2011-02-26 08:24:47 +0000 |
|---|---|---|
| committer | Mu Qiao <qiaomuf@gentoo.org> | 2011-02-26 08:24:47 +0000 |
| commit | d724fadf1a0aad47828903870fa8310531a5638d (patch) | |
| tree | 0156adde27529940d05099b5f782fd11b7ff433a /app-i18n/scim-sunpinyin/files | |
| parent | ppc64 stable wrt #346661 (diff) | |
| download | historical-d724fadf1a0aad47828903870fa8310531a5638d.tar.gz historical-d724fadf1a0aad47828903870fa8310531a5638d.tar.bz2 historical-d724fadf1a0aad47828903870fa8310531a5638d.zip | |
Include upstream patch.
Package-Manager: portage-2.1.9.41/cvs/Linux x86_64
Diffstat (limited to 'app-i18n/scim-sunpinyin/files')
| -rw-r--r-- | app-i18n/scim-sunpinyin/files/scim-sunpinyin-2.0.3-force-switch.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/app-i18n/scim-sunpinyin/files/scim-sunpinyin-2.0.3-force-switch.patch b/app-i18n/scim-sunpinyin/files/scim-sunpinyin-2.0.3-force-switch.patch new file mode 100644 index 000000000000..a0089ac11502 --- /dev/null +++ b/app-i18n/scim-sunpinyin/files/scim-sunpinyin-2.0.3-force-switch.patch @@ -0,0 +1,34 @@ +diff --git a/wrapper/scim/SConstruct b/wrapper/scim/SConstruct +index 7739300..ef7c69b 100644 +--- a/wrapper/scim/SConstruct ++++ b/wrapper/scim/SConstruct +@@ -3,7 +3,7 @@ import SCons.Tool.textfile + + locales = [] + +-cflags = '-O2 -g -pipe' ++cflags = '-O2 -g -pipe ' + version = '2.0.3' + + AddOption('--prefix', dest='prefix', metavar='DIR', +@@ -51,9 +51,6 @@ if GetOption('datadir') is not None: + + opts.Save('configure.conf', env) + +-if GetOption('rpath') is not None: +- env.Append(LINKFLAGS='-Wl,-R -Wl,%s' % GetOption('rpath')) +- + envvar = [('CC', 'CC'), + ('CXX', 'CXX'), + ('CFLAGS', 'CFLAGS'), +@@ -75,6 +72,10 @@ extra_cflags += ' -Isrc' + env.Append(CFLAGS=extra_cflags) + env.Append(CXXFLAGS=extra_cflags) + env.Replace(SHLIBPREFIX = '') ++ ++if GetOption('rpath') is not None: ++ env.Append(LINKFLAGS=' -Wl,-R -Wl,%s' % GetOption('rpath')) ++ + # + #==============================configure================================ + # |