diff options
| author |   Julian Ospald <hasufell@gentoo.org> | 2012-11-14 23:31:43 +0000 |
|---|---|---|
| committer | Julian Ospald <hasufell@gentoo.org> | 2012-11-14 23:31:43 +0000 |
| commit | 8bca9dad191cd7c689d4e3e3da98486cfc725ebf (patch) | |
| tree | ecc72152fa91702de24a01cac60cec8b95e3cdac /media-libs | |
| parent | respect flags, CC and stuff wrt #443164 (diff) | |
| download | gentoo-2-8bca9dad191cd7c689d4e3e3da98486cfc725ebf.tar.gz gentoo-2-8bca9dad191cd7c689d4e3e3da98486cfc725ebf.tar.bz2 gentoo-2-8bca9dad191cd7c689d4e3e3da98486cfc725ebf.zip | |
respect CFLAGS, CC, AR and whatnot wrt #442740
(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key E73C35B3)
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/glfw/ChangeLog | 5 | ||||
| -rw-r--r-- | media-libs/glfw/glfw-2.6.ebuild | 19 |
2 files changed, 20 insertions, 4 deletions
diff --git a/media-libs/glfw/ChangeLog b/media-libs/glfw/ChangeLog index 1321fc19b53a..0d3437c929b2 100644 --- a/media-libs/glfw/ChangeLog +++ b/media-libs/glfw/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-libs/glfw # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/glfw/ChangeLog,v 1.13 2012/10/18 20:35:22 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/glfw/ChangeLog,v 1.14 2012/11/14 23:31:43 hasufell Exp $ + + 14 Nov 2012; Julian Ospald <hasufell@gentoo.org> glfw-2.6.ebuild: + respect CFLAGS, CC, AR and whatnot wrt #442740 18 Oct 2012; Michael Sterrett <mr_bones_@gentoo.org> glfw-2.6.ebuild: add virtual/glu dep (bug #438828) diff --git a/media-libs/glfw/glfw-2.6.ebuild b/media-libs/glfw/glfw-2.6.ebuild index 247554ba8091..dfd67946d712 100644 --- a/media-libs/glfw/glfw-2.6.ebuild +++ b/media-libs/glfw/glfw-2.6.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/glfw/glfw-2.6.ebuild,v 1.7 2012/10/18 20:35:22 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/glfw/glfw-2.6.ebuild,v 1.8 2012/11/14 23:31:43 hasufell Exp $ EAPI=2 -inherit eutils multilib +inherit eutils multilib toolchain-funcs DESCRIPTION="The Portable OpenGL FrameWork" HOMEPAGE="http://glfw.sourceforge.net/" @@ -25,8 +25,21 @@ src_prepare() { -e "s:\"docs/:\"/usr/share/doc/${PF}/pdf/:" \ readme.html \ || die "sed failed" + + # respect cflags + sed -i \ + -e "/CFLAGS/s#-Os#${CFLAGS}#" \ + compile.sh \ + || die "sed compile.sh failed" + epatch "${FILESDIR}/${P}"-dyn.patch \ "${FILESDIR}"/${P}-ldflags.patch + + # respect cflags in linking command as well + sed -i \ + -e "/^libglfw.so/{n;s/\$(CC)/\$(CC) ${CFLAGS}/;}" \ + lib/x11/Makefile.x11.in \ + || die "sed Makefile.x11.in failed" } src_configure() { @@ -34,7 +47,7 @@ src_configure() { } src_compile() { - emake -C lib/x11 PREFIX=/usr -f Makefile.x11 default libglfw.pc || die "emake failed" + emake -C lib/x11 AR=$(tc-getAR) CC=$(tc-getCC) PREFIX=/usr -f Makefile.x11 default libglfw.pc || die "emake failed" } src_install() { |