diff options
author | Fabian Groffen <grobian@gentoo.org> | 2012-05-06 08:02:39 +0000 |
---|---|---|
committer | Fabian Groffen <grobian@gentoo.org> | 2012-05-06 08:02:39 +0000 |
commit | 204220039f7c9a68848342dc09b68c5be5d545d1 (patch) | |
tree | 77068e4773447deaf70ff63f8106c3895f3fc082 /x11-libs/libXpm | |
parent | Version bump, passwords are now kept in non-pageable memory and redacted from... (diff) | |
download | gentoo-2-204220039f7c9a68848342dc09b68c5be5d545d1.tar.gz gentoo-2-204220039f7c9a68848342dc09b68c5be5d545d1.tar.bz2 gentoo-2-204220039f7c9a68848342dc09b68c5be5d545d1.zip |
Fix -lintl fixup for Solaris
(Portage version: 2.2.01.20430-prefix/cvs/SunOS i386)
Diffstat (limited to 'x11-libs/libXpm')
-rw-r--r-- | x11-libs/libXpm/ChangeLog | 5 | ||||
-rw-r--r-- | x11-libs/libXpm/libXpm-3.5.10.ebuild | 10 |
2 files changed, 9 insertions, 6 deletions
diff --git a/x11-libs/libXpm/ChangeLog b/x11-libs/libXpm/ChangeLog index e62cd4beacf2..ba736a7624d6 100644 --- a/x11-libs/libXpm/ChangeLog +++ b/x11-libs/libXpm/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-libs/libXpm # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXpm/ChangeLog,v 1.78 2012/04/26 19:09:14 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXpm/ChangeLog,v 1.79 2012/05/06 08:02:39 grobian Exp $ + + 06 May 2012; Fabian Groffen <grobian@gentoo.org> libXpm-3.5.10.ebuild: + Fix -lintl fixup for Solaris 26 Apr 2012; Alexis Ballier <aballier@gentoo.org> libXpm-3.5.10.ebuild: keyword ~amd64-fbsd diff --git a/x11-libs/libXpm/libXpm-3.5.10.ebuild b/x11-libs/libXpm/libXpm-3.5.10.ebuild index 85b28f43b001..3ed167dc9401 100644 --- a/x11-libs/libXpm/libXpm-3.5.10.ebuild +++ b/x11-libs/libXpm/libXpm-3.5.10.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXpm/libXpm-3.5.10.ebuild,v 1.2 2012/04/26 19:09:14 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXpm/libXpm-3.5.10.ebuild,v 1.3 2012/05/06 08:02:39 grobian Exp $ EAPI=4 -inherit xorg-2 flag-o-matic +inherit xorg-2 DESCRIPTION="X.Org Xpm library" @@ -18,10 +18,10 @@ RDEPEND="x11-libs/libX11 DEPEND="${RDEPEND} sys-devel/gettext" -src_compile() { +src_configure() { # 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 - xorg-2_src_compile + [[ ${CHOST} == *-solaris* ]] && export ac_cv_search_gettext=-lintl + xorg-2_src_configure } |