| 1 |
commit: 32504cdd07879f891dbec667fa143abeed821871 |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jun 2 14:14:02 2018 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jun 2 14:14:31 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32504cdd |
| 7 |
|
| 8 |
media-libs/fontconfig: use host uuid on Darwin |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
| 11 |
|
| 12 |
media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild | 11 +++++++++-- |
| 13 |
1 file changed, 9 insertions(+), 2 deletions(-) |
| 14 |
|
| 15 |
diff --git a/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild b/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild |
| 16 |
index fb9e57feeeb..c80ddcea1c0 100644 |
| 17 |
--- a/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild |
| 18 |
+++ b/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild |
| 19 |
@@ -12,14 +12,14 @@ SRC_URI="https://fontconfig.org/release/${P}.tar.bz2" |
| 20 |
LICENSE="MIT" |
| 21 |
SLOT="1.0" |
| 22 |
[[ $(ver_cut 3) -ge 90 ]] || \ |
| 23 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux" |
| 24 |
+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" |
| 25 |
IUSE="doc static-libs" |
| 26 |
|
| 27 |
# Purposefully dropped the xml USE flag and libxml2 support. Expat is the |
| 28 |
# default and used by every distro. See bug #283191. |
| 29 |
RDEPEND=">=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}] |
| 30 |
>=media-libs/freetype-2.9[${MULTILIB_USEDEP}] |
| 31 |
- sys-apps/util-linux[${MULTILIB_USEDEP}] |
| 32 |
+ !elibc_Darwin? ( sys-apps/util-linux[${MULTILIB_USEDEP}] ) |
| 33 |
virtual/libintl[${MULTILIB_USEDEP}]" |
| 34 |
DEPEND="${RDEPEND} |
| 35 |
virtual/pkgconfig |
| 36 |
@@ -73,6 +73,13 @@ multilib_src_configure() { |
| 37 |
;; |
| 38 |
esac |
| 39 |
|
| 40 |
+ if [[ ${CHOST} == *-darwin* ]] ; then |
| 41 |
+ # Darwin provides uuid in libSystem, avoid pkg-config check for |
| 42 |
+ # it with some dummy values |
| 43 |
+ export UUID_CFLAGS="-I/usr/include/uuid-dummy" |
| 44 |
+ export UUID_LIBS="-lc" |
| 45 |
+ fi |
| 46 |
+ |
| 47 |
local myeconfargs=( |
| 48 |
$(use_enable doc docbook) |
| 49 |
$(use_enable static-libs static) |
Archives