diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2013-02-28 23:17:21 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2013-02-28 23:17:21 +0000 |
| commit | 9ba22b64c389c7882db2fd029e78bc7f052d7173 (patch) | |
| tree | d0daf8a23efa172cc7762b13688cc579f6d9f4f4 /media-libs/freetype | |
| parent | Version bump wrt bug 459476 (diff) | |
| download | gentoo-2-9ba22b64c389c7882db2fd029e78bc7f052d7173.tar.gz gentoo-2-9ba22b64c389c7882db2fd029e78bc7f052d7173.tar.bz2 gentoo-2-9ba22b64c389c7882db2fd029e78bc7f052d7173.zip | |
Build demos in the way recommended upstream.
(Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key 9627F456F9DA7643!)
Diffstat (limited to 'media-libs/freetype')
| -rw-r--r-- | media-libs/freetype/ChangeLog | 5 | ||||
| -rw-r--r-- | media-libs/freetype/freetype-2.4.11-r1.ebuild | 12 |
2 files changed, 10 insertions, 7 deletions
diff --git a/media-libs/freetype/ChangeLog b/media-libs/freetype/ChangeLog index 0db9b44d7611..39d2883e77ac 100644 --- a/media-libs/freetype/ChangeLog +++ b/media-libs/freetype/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-libs/freetype # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v 1.363 2013/02/26 14:40:54 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v 1.364 2013/02/28 23:17:21 mgorny Exp $ + + 28 Feb 2013; Michał Górny <mgorny@gentoo.org> freetype-2.4.11-r1.ebuild: + Build demos in the way recommended upstream. 26 Feb 2013; Michał Górny <mgorny@gentoo.org> freetype-2.4.11-r1.ebuild: Fix out-of-source demo builds. diff --git a/media-libs/freetype/freetype-2.4.11-r1.ebuild b/media-libs/freetype/freetype-2.4.11-r1.ebuild index 3c5da4fbc24f..be5de4d5b1cd 100644 --- a/media-libs/freetype/freetype-2.4.11-r1.ebuild +++ b/media-libs/freetype/freetype-2.4.11-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.4.11-r1.ebuild,v 1.2 2013/02/26 14:40:54 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.4.11-r1.ebuild,v 1.3 2013/02/28 23:17:21 mgorny Exp $ EAPI=5 @@ -113,12 +113,12 @@ src_compile() { if use utils; then einfo "Building utils" - cd "${WORKDIR}/ft2demos-${PV}" || die # fix for Prefix, bug #339334 - # XXX: replace ${ARCH} assumption when bug #459210 is fixed - emake X11_PATH="${EPREFIX}/usr/$(get_libdir)" \ - TOP_DIR="${S}" \ - {BUILD_DIR,OBJ_DIR}="${S%%/}-${ARCH}" + # XXX: replace ${ARCH} hack when a proper solution is available + BUILD_DIR="${S}-${ARCH}" \ + autotools-utils_src_compile \ + X11_PATH="${EPREFIX}/usr/$(get_libdir)" \ + FT2DEMOS=1 TOP_DIR_2="${WORKDIR}/ft2demos-${PV}" fi } |