From 9b6fb5232b87cf1191ab920131ac4b2cb8a13abb Mon Sep 17 00:00:00 2001 From: Leonardo Valeri Manera Date: Tue, 6 May 2008 22:49:05 +0200 Subject: [PATCH] app-office/lyx: LyX's PCH only slow compliation down - disable them outright. --- app-office/lyx/Manifest | 4 ++-- app-office/lyx/lyx-1.5.4.ebuild | 6 +++--- app-office/lyx/lyx-9999.ebuild | 14 +++++++++++--- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/app-office/lyx/Manifest b/app-office/lyx/Manifest index 1f41db4..976b546 100644 --- a/app-office/lyx/Manifest +++ b/app-office/lyx/Manifest @@ -4,5 +4,5 @@ DIST hebrew.bind 45 RMD160 1621bd311aa053798815fd6c795406a505761531 SHA1 85c39df DIST latex-xft-fonts-0.1.tar.gz 91730 RMD160 0a516eeba71ddc474e97f315e45e41028efa2e4d SHA1 50edf35ff08354bdf08517add33e16ee37f769e9 SHA256 78bceea8a055bc43bd0d246ae8e69f81d2f161ae4d8f1aaaa2dfff9e293ae964 DIST lyx-1.5.4.tar.bz2 9045016 RMD160 fca3cb9c9c9437e879c8abea820fbd28a5d1d72d SHA1 75c2be653b64eedeb443caf2b0401fb74a15e908 SHA256 6c8b9aafc287ee683b68ebb08166e660e27af9942a30291f14c18de39aca8f2b DIST preferences 1669 RMD160 26986d7bcc48c4ecf60f84d95490148a5e171785 SHA1 3567ad4d4a2a041c295e40fef76ca53de6cb260d SHA256 41867ac67bc729d1057253bf305aced1ff666ee4d648dfefc99fd0c3c0501d43 -EBUILD lyx-1.5.4.ebuild 3280 RMD160 72ebaff94f884794f1694e434fd5f50db60bc34d SHA1 4011e7229f4dca68d68d6ee11fb7857e28bacb7f SHA256 754b934cca18355117d6b9e2da1410c4e3017104db528e814211a28b072439b7 -EBUILD lyx-9999.ebuild 4101 RMD160 66ab4db199f8b48950fac7b774d4d2353b0b8d53 SHA1 01f9c7d530acdc22c6cd1f63ce4440cb204a78dc SHA256 1f9c591e00bd2a235e82cc234f58ec36785cf646952d6db304775740485fc5d1 +EBUILD lyx-1.5.4.ebuild 3272 RMD160 497a198e52670f4f1b5719cbe07a48e6847b5ffc SHA1 2de74b35a4717b82326cfbbb8b70a8ba3412870d SHA256 9b153373678f6647d1c3982ad11e9ef9fa65131e9acbb0ac1b9eef24b03e59d5 +EBUILD lyx-9999.ebuild 4315 RMD160 6060e8be083f9b2ac21f73e1b776113cdbb31498 SHA1 6f542e752306da895669cab9f3163d2680308cc6 SHA256 0a18332c43185c585284d4c516ce7800ff5e767c3932fffdae25b25905afc05d diff --git a/app-office/lyx/lyx-1.5.4.ebuild b/app-office/lyx/lyx-1.5.4.ebuild index 37ba73a..ddc4aa3 100644 --- a/app-office/lyx/lyx-1.5.4.ebuild +++ b/app-office/lyx/lyx-1.5.4.ebuild @@ -22,7 +22,7 @@ SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/${P}.tar.bz2 LICENSE="GPL-2" SLOT="0" KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86" -IUSE="cups debug nls pch linguas_he latex" +IUSE="cups debug nls linguas_he latex" RESTRICT="test" RDEPEND="|| ( @@ -85,8 +85,8 @@ src_compile() { econf \ $(use_enable nls) \ $(use_enable debug) \ - $(use_enable pch) \ - --with-aspell --without-included-boost || die "econf failed" + --disable-pch --with-aspell --without-included-boost || \ + die "econf failed" emake || die "emake failed" } diff --git a/app-office/lyx/lyx-9999.ebuild b/app-office/lyx/lyx-9999.ebuild index 51214f5..d3a5f06 100644 --- a/app-office/lyx/lyx-9999.ebuild +++ b/app-office/lyx/lyx-9999.ebuild @@ -20,7 +20,7 @@ SRC_URI="ftp://ftp.lyx.org/pub/lyx/contrib/${FONT_P}.tar.gz LICENSE="GPL-2" SLOT="0" KEYWORDS="" -IUSE="cups debug latex monolithic nls pch linguas_he" +IUSE="cups debug latex monolithic nls linguas_he" RESTRICT="test" RDEPEND="|| ( @@ -74,6 +74,15 @@ DEPEND="${RDEPEND} S="${WORKDIR}"/${P} +pkg_setup() { + if use monolithic; then + ewarn ":WARNING:" + ewarn "Bulding LyX with USE=monolithic needs 512Mb of RAM or more" + ewarn "for each make job (-j). Don't come crying to me if you run" + ewarn "out of ram." + fi +} + src_unpack() { unpack ${A} subversion_fetch || die "Fetch with SVN failed kthnx." @@ -115,9 +124,8 @@ src_compile() { econf ${monolithic} \ $(use_enable nls) \ $(use_enable debug) \ - $(use_enable pch) \ ${build_type} \ - --with-aspell --without-included-boost || die "econf failed" + --disable-pch --with-aspell --without-included-boost || die "econf failed" emake || die "emake failed" } -- 2.11.4.GIT