diff options
| author |   Julian Ospald <hasufell@gentoo.org> | 2012-12-09 16:16:36 +0000 |
|---|---|---|
| committer | Julian Ospald <hasufell@gentoo.org> | 2012-12-09 16:16:36 +0000 |
| commit | bb5a3eb49430c61bae937ebaeede7bf40ea4c240 (patch) | |
| tree | 6919e7087d6475894add0c27f57480c5837c477c | |
| parent | Fix install for Prefix, bug #446568 (diff) | |
| download | gentoo-2-bb5a3eb49430c61bae937ebaeede7bf40ea4c240.tar.gz gentoo-2-bb5a3eb49430c61bae937ebaeede7bf40ea4c240.tar.bz2 gentoo-2-bb5a3eb49430c61bae937ebaeede7bf40ea4c240.zip | |
respect CC and RANLIB wrt #446598 and #446600
(Portage version: 2.2.0_alpha144/cvs/Linux x86_64, signed Manifest commit with key E73C35B3)
| -rw-r--r-- | media-libs/nas/ChangeLog | 5 | ||||
| -rw-r--r-- | media-libs/nas/nas-1.9.3.ebuild | 38 |
2 files changed, 27 insertions, 16 deletions
diff --git a/media-libs/nas/ChangeLog b/media-libs/nas/ChangeLog index 1871d9574321..1c2b65ff63d3 100644 --- a/media-libs/nas/ChangeLog +++ b/media-libs/nas/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-libs/nas # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/nas/ChangeLog,v 1.75 2012/12/03 23:14:19 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/nas/ChangeLog,v 1.76 2012/12/09 16:16:36 hasufell Exp $ + + 09 Dec 2012; Julian Ospald <hasufell@gentoo.org> nas-1.9.3.ebuild: + respect CC and RANLIB wrt #446598 and #446600 03 Dec 2012; Ulrich Müller <ulm@gentoo.org> nas-1.9.2.ebuild, nas-1.9.2-r1.ebuild, nas-1.9.3.ebuild: diff --git a/media-libs/nas/nas-1.9.3.ebuild b/media-libs/nas/nas-1.9.3.ebuild index 6dbed5bce1d8..b7b2f799ecb7 100644 --- a/media-libs/nas/nas-1.9.3.ebuild +++ b/media-libs/nas/nas-1.9.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/nas/nas-1.9.3.ebuild,v 1.2 2012/12/03 23:14:19 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/nas/nas-1.9.3.ebuild,v 1.3 2012/12/09 16:16:36 hasufell Exp $ inherit eutils toolchain-funcs @@ -41,23 +41,31 @@ src_compile() { # touch doc/man/lib/tmp.{_man,man} # EXTRA_LDOPTIONS, SHLIBGLOBALSFLAGS #336564#c2 - emake \ - AR="$(tc-getAR) clq" \ - AS="$(tc-getAS)" \ - CC="$(tc-getCC)" \ - CDEBUGFLAGS="${CFLAGS}" \ - CXX="$(tc-getCXX)" \ - CXXDEBUFLAGS="${CXXFLAGS}" \ - EXTRA_LDOPTIONS="${LDFLAGS}" \ - LD="$(tc-getLD)" \ - MAKE="${MAKE:-gmake}" \ - RANLIB="$(tc-getRANLIB)" \ - SHLIBGLOBALSFLAGS="${LDFLAGS}" \ - World || die + local emakeopts=( + AR="$(tc-getAR) clq" + AS="$(tc-getAS)" + CC="$(tc-getCC)" + CDEBUGFLAGS="${CFLAGS}" + CXX="$(tc-getCXX)" + CXXDEBUFLAGS="${CXXFLAGS}" + EXTRA_LDOPTIONS="${LDFLAGS}" + LD="$(tc-getLD)" + MAKE="${MAKE:-gmake}" + RANLIB="$(tc-getRANLIB)" + SHLIBGLOBALSFLAGS="${LDFLAGS}" + ) + + # dumb fix for parallel make issue wrt #446598, Imake sux + emake "${emakeopts[@]}" -C server/dia all || die + emake "${emakeopts[@]}" -C server/dda/voxware all || die + emake "${emakeopts[@]}" -C server/os all || die + + emake "${emakeopts[@]}" World || die } src_install() { - emake DESTDIR="${D}" install install.man || die + # ranlib is used at install phase too wrt #446600 + emake RANLIB="$(tc-getRANLIB)" DESTDIR="${D}" install install.man || die dodoc BUILDNOTES FAQ HISTORY README RELEASE TODO if use doc; then |