diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2011-08-28 12:05:00 +0000 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2011-08-28 12:05:00 +0000 |
| commit | 1ef669e255b79b6e82f82aeff4b6f898f68bad23 (patch) | |
| tree | d46e6651155c6e9f208baaeef3e2f5628fe49a17 /x11-libs/libSM | |
| parent | Change version scheme (diff) | |
| download | historical-1ef669e255b79b6e82f82aeff4b6f898f68bad23.tar.gz historical-1ef669e255b79b6e82f82aeff4b6f898f68bad23.tar.bz2 historical-1ef669e255b79b6e82f82aeff4b6f898f68bad23.zip | |
Fix compilation with USE=uuid on Solaris and Darwin, bug #353787
Package-Manager: portage-2.2.01.19074-prefix/cvs/Darwin i386
Diffstat (limited to 'x11-libs/libSM')
| -rw-r--r-- | x11-libs/libSM/ChangeLog | 5 | ||||
| -rw-r--r-- | x11-libs/libSM/Manifest | 12 | ||||
| -rw-r--r-- | x11-libs/libSM/libSM-1.2.0.ebuild | 40 |
3 files changed, 36 insertions, 21 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/Manifest b/x11-libs/libSM/Manifest index 4df31328c224..db06050c356b 100644 --- a/x11-libs/libSM/Manifest +++ b/x11-libs/libSM/Manifest @@ -2,13 +2,13 @@ Hash: SHA1 DIST libSM-1.2.0.tar.bz2 284287 RMD160 751e4cbd9e594959212ab47b68ca173628c90d30 SHA1 f78bc72f0b3ec26cbf980f84f014422ba854544d SHA256 0cd8df1b7067bfda10b05d38279777770677c6fecb5a14e804a28597da7a57cb -EBUILD libSM-1.2.0.ebuild 1325 RMD160 4ea75ff34ac421086481978e39d8f4fb50609ce8 SHA1 2ea089672cb190e1b12d026c5516ff64f6d629d0 SHA256 119fda3950981363043368503665d33c3cf78b1ab1af24ecda5e3665da78de63 -MISC ChangeLog 10195 RMD160 c86509f07831464852173f87ef1b2aaf5fb38d84 SHA1 d1abd2bfcd4044b0585c017678d467392a6e188f SHA256 3f376c6ab968d5947e9557d8a1d8af74e95b666d089a566cf3c45a5eff669ac2 +EBUILD libSM-1.2.0.ebuild 1774 RMD160 324b3b2c234440d97c1317cb6cb5f01387a1e4ea SHA1 d01874b83bdb51cb04e05c505eeb45d75e1717e8 SHA256 cfee3f884886c17b49f98b25c758b153b9afe9144ff403b31393a8d012fdd9f2 +MISC ChangeLog 10334 RMD160 2f943ef7ed5a536412684937ee923a1ee4cbad43 SHA1 b88e31c6f4d19be8ee9b49dff35130b83b024f67 SHA256 6145278920bf6ef18df3854c25e465bef97796e094e1c505b65eeb29bfad1de9 MISC metadata.xml 274 RMD160 d8553c975069891686530053f724977d4c9b04c0 SHA1 25898891236a55e46285bbe1022c87465049da6e SHA256 8f020073e4576192cb4f631849fd704f25a1ea176368eef75a3c24c4f9727e36 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (Darwin) +Version: GnuPG v2.0.18 (Darwin) -iEYEARECAAYFAk4CNFsACgkQX3X2B8XHTokMGgCfdx3/DfAVJOc0uTCxzlogqyaB -jXwAn0LD04FYpnXUa8zaFOVBbmQ/0liO -=jl9l +iEYEARECAAYFAk5aLvIACgkQX3X2B8XHTonwnQCgm0vFQgzU4Aq4Y0eHqu/S0mQ9 +0X8AnAi8QQjCq8dWeMTJOTkaqoImyZeC +=m4eP -----END PGP SIGNATURE----- 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 } |