diff options
Diffstat (limited to 'x11-libs/libSM')
| -rw-r--r-- | x11-libs/libSM/ChangeLog | 5 | ||||
| -rw-r--r-- | x11-libs/libSM/libSM-1.2.0.ebuild | 40 |
2 files changed, 30 insertions, 15 deletions
diff --git a/x11-libs/libSM/ChangeLog b/x11-libs/libSM/ChangeLog index fe8939afa1be..a2e6aa25d9ed 100644 --- a/x11-libs/libSM/ChangeLog +++ b/x11-libs/libSM/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-libs/libSM # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libSM/ChangeLog,v 1.89 2011/06/22 18:29:20 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libSM/ChangeLog,v 1.90 2011/08/28 12:05:00 grobian Exp $ + + 28 Aug 2011; Fabian Groffen <grobian@gentoo.org> libSM-1.2.0.ebuild: + Fix compilation with USE=uuid on Solaris and Darwin, bug #353787 22 Jun 2011; Fabian Groffen <grobian@gentoo.org> libSM-1.2.0.ebuild: Marked ~x64-macos, bug #371861 diff --git a/x11-libs/libSM/libSM-1.2.0.ebuild b/x11-libs/libSM/libSM-1.2.0.ebuild index 8679a69004bb..f02b42c381f4 100644 --- a/x11-libs/libSM/libSM-1.2.0.ebuild +++ b/x11-libs/libSM/libSM-1.2.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libSM/libSM-1.2.0.ebuild,v 1.12 2011/06/22 18:29:20 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libSM/libSM-1.2.0.ebuild,v 1.13 2011/08/28 12:05:00 grobian Exp $ EAPI=3 inherit xorg-2 @@ -20,23 +20,35 @@ DEPEND="${RDEPEND} doc? ( app-text/xmlto )" pkg_setup() { + local withuuid=$(use_with uuid libuuid) xorg-2_pkg_setup + # do not use uuid even if available in libc (like on FreeBSD) + use uuid || export ac_cv_func_uuid_create=no + + if use uuid ; then + case ${CHOST} in + *-solaris*|*-darwin*) + if [[ ! -d ${EROOT}usr/include/uuid ]] && + [[ -d ${ROOT}usr/include/uuid ]] + then + # Solaris and Darwin have uuid provided by the host + # system. Since util-linux's version is based on this + # version, and on Darwin actually breaks host headers when + # installed, we can "pretend" for libSM we have libuuid + # installed, while in fact we don't + withuuid="--without-libuuid" + export HAVE_LIBUUID=yes + export LIBUUID_CFLAGS="-I${ROOT}usr/include/uuid" + # Darwin has uuid in libSystem + [[ ${CHOST} == *-solaris* ]] && export LIBUUID_LIBS="-luuid" + fi + ;; + esac + fi CONFIGURE_OPTIONS="$(use_enable ipv6) $(use_enable doc docs) $(use_with doc xmlto) - $(use_with uuid libuuid) + ${withuuid} --without-fop" - # do not use uuid even if available in libc (like on FreeBSD) - use uuid || export ac_cv_func_uuid_create=no - # solaris hack - if use uuid && - [[ ${CHOST} == *-solaris* ]] && - [[ ! -d ${EROOT}/usr/include/uuid ]] && - [[ -d ${ROOT}/usr/include/uuid ]] - then - # ${ROOT} is proper here - export LIBUUID_CFLAGS="-I${ROOT}/usr/include/uuid" - export LIBUUID_LIBS="-luuid" - fi } |