diff options
| author | Bryan Drewery <bdrewery@FreeBSD.org> | 2013-05-04 14:06:08 +0000 |
|---|---|---|
| committer | Bryan Drewery <bdrewery@FreeBSD.org> | 2013-05-04 14:06:08 +0000 |
| commit | 63f76304d6f21c191cb8e08ab49787bcf031fb6d (patch) | |
| tree | 20dbde6d95ce50dde89bcaeaaee0c6c3ee84e6b1 /math | |
| parent | 72e61e01d5850e4a1b7f817ff8c3f51d32dc101c (diff) | |
| download | ports-63f76304d6f21c191cb8e08ab49787bcf031fb6d.tar.gz ports-63f76304d6f21c191cb8e08ab49787bcf031fb6d.zip | |
- When DISABLE_MAKE_JOBS or MAKE_JOBS_UNSAFE is set, also set
MAKE_JOBS_NUMBER to 1. This makes it safe to do -j${MAKE_JOBS_NUMBER}
without any extra logic.
- Cleanup ports working around the empty MAKE_JOBS_NUMBER
- This also fixes several ports that were expecting MAKE_JOBS_NUMBER
to always have a number
Reviewed by: bapt
Spotted by: John Marino <draco@marino.st>
With hat: portmgr
Notes
Notes:
svn path=/head/; revision=317320
Diffstat (limited to 'math')
| -rw-r--r-- | math/polymake/Makefile | 7 | ||||
| -rw-r--r-- | math/sage/Makefile | 2 |
2 files changed, 2 insertions, 7 deletions
diff --git a/math/polymake/Makefile b/math/polymake/Makefile index ccfec34013e9..cfdce3314cb8 100644 --- a/math/polymake/Makefile +++ b/math/polymake/Makefile @@ -53,18 +53,15 @@ USE_LDCONFIG= yes IGNORE= does not build with Perl 5.14+ .endif -.if !defined(DISABLE_MAKE_JOBS) pre-fetch: - @MAKE_JOBS_NUMBER=${MAKE_JOBS_NUMBER}; \ - if [ $${MAKE_JOBS_NUMBER} -gt 1 ]; then \ + @if [ ${MAKE_JOBS_NUMBER} -gt 1 ]; then \ ${ECHO_CMD} "Building this port uses a lot of CPU power, and a lot of memory to the point"; \ ${ECHO_CMD} "that swap space might be used extensively. Consider using less threads, as"; \ ${ECHO_CMD} "this might cause the build to be considerably faster. Currently the build is"; \ - ${ECHO_CMD} "set to use $${MAKE_JOBS_NUMBER} threads. To change to <n> threads, use"; \ + ${ECHO_CMD} "set to use ${MAKE_JOBS_NUMBER} threads. To change to <n> threads, use"; \ ${ECHO_CMD}; \ ${ECHO_CMD} "make MAKE_JOBS_NUMBER=<n>"; \ fi -.endif post-install: ${INSTALL_DATA} ${PREFIX}/libexec/polymake/conf.make ${PREFIX}/libexec/polymake/conf.make.in diff --git a/math/sage/Makefile b/math/sage/Makefile index 0c5dd229422e..2d2b62adf8d0 100644 --- a/math/sage/Makefile +++ b/math/sage/Makefile @@ -168,8 +168,6 @@ FPM_FLAG= -mfpmath=387 FPM_FLAG= .endif -.if !defined(DISABLE_MAKE_JOBS) MAKE_ENV+= MAKE="${MAKE} -j${MAKE_JOBS_NUMBER}" -.endif .include <bsd.port.post.mk> |