diff options
| author |   Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> | 2010-04-07 21:50:49 +0000 |
|---|---|---|
| committer | Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> | 2010-04-07 21:50:49 +0000 |
| commit | b0be579707eeab699d7ca90c5990d842bd3cf598 (patch) | |
| tree | 0c27c9dbf73bb6f4b5c46ecd241532b07f42795a /x11-libs/libXpm | |
| parent | Bug #313747 - Fix grammar in pam description. Thanks to Bartłomiej Majka (diff) | |
| download | gentoo-2-b0be579707eeab699d7ca90c5990d842bd3cf598.tar.gz gentoo-2-b0be579707eeab699d7ca90c5990d842bd3cf598.tar.bz2 gentoo-2-b0be579707eeab699d7ca90c5990d842bd3cf598.zip | |
x11-libs/libXpm: fix building in solaris prefix, bug #303197
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'x11-libs/libXpm')
| -rw-r--r-- | x11-libs/libXpm/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-libs/libXpm/libXpm-3.5.8.ebuild | 12 |
2 files changed, 15 insertions, 3 deletions
diff --git a/x11-libs/libXpm/ChangeLog b/x11-libs/libXpm/ChangeLog index 5978204fced6..266cb0cd5c20 100644 --- a/x11-libs/libXpm/ChangeLog +++ b/x11-libs/libXpm/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/libXpm # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXpm/ChangeLog,v 1.65 2010/02/25 07:31:11 abcd Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXpm/ChangeLog,v 1.66 2010/04/07 21:50:49 chithanh Exp $ + + 07 Apr 2010; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> + libXpm-3.5.8.ebuild: + Fix building in solaris prefix, bug #303197 25 Feb 2010; Jonathan Callen <abcd@gentoo.org> libXpm-3.5.8.ebuild: Transfer prefix keywords (no other changes) diff --git a/x11-libs/libXpm/libXpm-3.5.8.ebuild b/x11-libs/libXpm/libXpm-3.5.8.ebuild index 76038bc27272..243362cb6382 100644 --- a/x11-libs/libXpm/libXpm-3.5.8.ebuild +++ b/x11-libs/libXpm/libXpm-3.5.8.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXpm/libXpm-3.5.8.ebuild,v 1.12 2010/02/25 07:31:11 abcd Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXpm/libXpm-3.5.8.ebuild,v 1.13 2010/04/07 21:50:49 chithanh Exp $ -inherit x-modular +inherit x-modular flag-o-matic DESCRIPTION="X.Org Xpm library" @@ -15,3 +15,11 @@ RDEPEND="x11-libs/libX11 DEPEND="${RDEPEND} nls? ( sys-devel/gettext ) x11-proto/xproto" + +src_compile() { + # the gettext configure check and code in sxpm are incorrect; they assume + # gettext being in libintl, whereas Solaris has gettext by default + # resulting in libintl not being added to LIBS + [[ ${CHOST} == *-solaris* ]] && append-libs -lintl + x-modular_src_compile +} |