diff options
| author |   Andreas Proschofsky <suka@gentoo.org> | 2004-08-28 15:34:21 +0000 |
|---|---|---|
| committer | Andreas Proschofsky <suka@gentoo.org> | 2004-08-28 15:34:21 +0000 |
| commit | 2d1b70809f9badf88e7286d0f59f22d0896fdb75 (patch) | |
| tree | 0c1fbe306f6551af4007440078841ba914b69bf0 /app-office/openoffice-ximian | |
| parent | Added to ~ppc (Manifest recommit) (diff) | |
| download | gentoo-2-2d1b70809f9badf88e7286d0f59f22d0896fdb75.tar.gz gentoo-2-2d1b70809f9badf88e7286d0f59f22d0896fdb75.tar.bz2 gentoo-2-2d1b70809f9badf88e7286d0f59f22d0896fdb75.zip | |
enable parallel make
Diffstat (limited to 'app-office/openoffice-ximian')
| -rw-r--r-- | app-office/openoffice-ximian/ChangeLog | 6 | ||||
| -rw-r--r-- | app-office/openoffice-ximian/openoffice-ximian-1.3.2.ebuild | 23 |
2 files changed, 18 insertions, 11 deletions
diff --git a/app-office/openoffice-ximian/ChangeLog b/app-office/openoffice-ximian/ChangeLog index 3d7d1a3f8f3e..c0bb2be81d1c 100644 --- a/app-office/openoffice-ximian/ChangeLog +++ b/app-office/openoffice-ximian/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-office/openoffice-ximian # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/ChangeLog,v 1.65 2004/08/28 07:01:58 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/ChangeLog,v 1.66 2004/08/28 15:34:20 suka Exp $ + + 28 Aug 2004; suka@gentoo.org openoffice-ximian-1.3.2.ebuild: + At last enable parallel build! Should work fine now, although number of + parallel processes is limited to 10, otherwise dmake will fail *openoffice-ximian-1.3.2 (28 Aug 2004) diff --git a/app-office/openoffice-ximian/openoffice-ximian-1.3.2.ebuild b/app-office/openoffice-ximian/openoffice-ximian-1.3.2.ebuild index a100d1cd012d..16aa6865d7df 100644 --- a/app-office/openoffice-ximian/openoffice-ximian-1.3.2.ebuild +++ b/app-office/openoffice-ximian/openoffice-ximian-1.3.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.3.2.ebuild,v 1.1 2004/08/28 07:01:58 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.3.2.ebuild,v 1.2 2004/08/28 15:34:21 suka Exp $ # IMPORTANT: This is extremely alpha!!! @@ -345,18 +345,21 @@ src_compile() { # Build as minimal as possible export BUILD_MINIMAL="${LANGNO}" - # Set $ECPUS to amount of processes multiprocessing build should use. - # NOTE: Setting this too high might cause dmake to segfault!! - # Setting this to anything but "1" on my pentium4 causes things - # to segfault :( - [ -z "${ECPUS}" ] && export ECPUS="1" + #Get info for parallel build + export JOBS=`echo "${MAKEOPTS}" | sed -e "s/.*-j\([0-9]\+\).*/\1/"` + + if [ "${JOBS}" -gt 10 ] + then + export JOBS="10" + einfo "dmake fails with too much parallel jobs, so limiting to 10" + fi + + export buildcmd="${S}/solenv/bin/build.pl --all product=full strip=true --dlv_switch link" # Should the build use multiprocessing? - if [ "${ECPUS}" -gt 1 ] + if [ "${JOBS}" -gt 1 ] then - buildcmd="${S}/solenv/bin/build.pl --all -P${ECPUS} product=full strip=true --dlv_switch link" - else - buildcmd="${S}/solenv/bin/build.pl --all product=full strip=true --dlv_switch link" + export buildcmd="${buildcmd} -P${JOBS}" fi if [ -z "$(grep 'CCCOMP' ${S}/${LinuxEnvSet})" ] |