diff options
| author | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2014-12-29 20:10:20 +0000 |
|---|---|---|
| committer | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2014-12-29 20:10:20 +0000 |
| commit | 8de9d2b8c6fbe4e3f61bfcc2dcc84a74a0cb3528 (patch) | |
| tree | 2f38a184c07f7875cd4cf5d3a39273d731ca672f | |
| parent | - Bump PORTREVISION to match master port (mail/mutt) and remove false alarm o... (diff) | |
Check for WITH_DEBUG when changing INSTALL_TARGET.
We have the same problem described in https://reviews.freebsd.org/D875:
> bsd.ports.mk sets STRIP= after all Uses files have been processed
> initially. If you have WITH_DEBUG=yes set, cmake's INSTALL_TARGET has been
> set already to install/strip, before STRIP is reset.
In other words, INSTALL_TARGET would always be set to "install/strip"
even when WITH_DEBUG was set.
Since we do not use USES=cmake here the fix (check for WITH_DEBUG besides
evaluating STRIP) needs to be duplicated in the Makefile.
| -rw-r--r-- | devel/cmake/Makefile | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/devel/cmake/Makefile b/devel/cmake/Makefile index 5afc54877b89..dea2d087ef28 100644 --- a/devel/cmake/Makefile +++ b/devel/cmake/Makefile @@ -23,7 +23,9 @@ CONFIGURE_ARGS= --prefix=${PREFIX} \ --parallel=${MAKE_JOBS_NUMBER} \ --init="${PATCHDIR}/InitialCache.cmake" -.if defined(STRIP) && ${STRIP} != "" +.include <bsd.port.pre.mk> + +.if defined(STRIP) && ${STRIP} != "" && !defined(WITH_DEBUG) INSTALL_TARGET= install/strip .endif @@ -62,4 +64,4 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/Auxiliary/cmake-mode.el ${STAGEDIR}${PREFIX}/share/emacs/site-lisp .endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> |