commit:     32504cdd07879f891dbec667fa143abeed821871
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  2 14:14:02 2018 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Jun  2 14:14:31 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32504cdd

media-libs/fontconfig: use host uuid on Darwin

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild 
b/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild
index fb9e57feeeb..c80ddcea1c0 100644
--- a/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild
@@ -12,14 +12,14 @@ SRC_URI="https://fontconfig.org/release/${P}.tar.bz2";
 LICENSE="MIT"
 SLOT="1.0"
 [[ $(ver_cut 3) -ge 90 ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos"
 IUSE="doc static-libs"
 
 # Purposefully dropped the xml USE flag and libxml2 support.  Expat is the
 # default and used by every distro.  See bug #283191.
 RDEPEND=">=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
        >=media-libs/freetype-2.9[${MULTILIB_USEDEP}]
-       sys-apps/util-linux[${MULTILIB_USEDEP}]
+       !elibc_Darwin? ( sys-apps/util-linux[${MULTILIB_USEDEP}] )
        virtual/libintl[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
        virtual/pkgconfig
@@ -73,6 +73,13 @@ multilib_src_configure() {
                ;;
        esac
 
+       if [[ ${CHOST} == *-darwin* ]] ; then
+               # Darwin provides uuid in libSystem, avoid pkg-config check for
+               # it with some dummy values
+               export UUID_CFLAGS="-I/usr/include/uuid-dummy"
+               export UUID_LIBS="-lc"
+       fi
+
        local myeconfargs=(
                $(use_enable doc docbook)
                $(use_enable static-libs static)

Reply via email to