diff options
| author | tv <tv@pkgsrc.org> | 2005-03-18 18:16:34 +0000 |
|---|---|---|
| committer | tv <tv@pkgsrc.org> | 2005-03-18 18:16:34 +0000 |
| commit | b46a7543a3014a232c8826bd855b0481d5f7995a (patch) | |
| tree | 5147a40e92074d16fee67bfab7670e3b69d7b28a /mk/platform/FreeBSD.mk | |
| parent | 447770bff046561280ea20cb131b39334aa7d111 (diff) | |
| download | pkgsrc-b46a7543a3014a232c8826bd855b0481d5f7995a.tar.gz | |
Fix a gleaming illustration of why using YES/NO variables everywhere
possible, just for the sake of doing so, is not a good thing to do:
The platform files define _STRIPFLAG_* to determine whether to strip things.
But since this is included in bsd.prefs.mk, ".if ..." checks cannot take
things set in the Makefile into account. So convert INSTALL_UNSTRIPPED=YES
to a defined/undefined variable check in bsd.pkg.mk, and use the :D:U idiom
in the _STRIPFLAG_* variables.
This should fix PR pkg/28772 and PR pkg/29031.
Diffstat (limited to 'mk/platform/FreeBSD.mk')
| -rw-r--r-- | mk/platform/FreeBSD.mk | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/mk/platform/FreeBSD.mk b/mk/platform/FreeBSD.mk index 3757aca975f..e7d9c74364f 100644 --- a/mk/platform/FreeBSD.mk +++ b/mk/platform/FreeBSD.mk @@ -1,4 +1,4 @@ -# $NetBSD: FreeBSD.mk,v 1.7 2005/01/28 21:05:59 jlam Exp $ +# $NetBSD: FreeBSD.mk,v 1.8 2005/03/18 18:16:35 tv Exp $ # # Variable definitions for the FreeBSD operating system. @@ -141,10 +141,8 @@ _USE_RPATH= yes # add rpath to LDFLAGS _OPSYS_WHOLE_ARCHIVE_FLAG= -Wl,--whole-archive _OPSYS_NO_WHOLE_ARCHIVE_FLAG= -Wl,--no-whole-archive -.if (!defined(INSTALL_UNSTRIPPED) || empty(INSTALL_UNSTRIPPED:M[yY][eE][sS])) && !defined(DEBUG_FLAGS) -_STRIPFLAG_CC?= -s # cc(1) option to strip -_STRIPFLAG_INSTALL?= -s # install(1) option to strip -.endif +_STRIPFLAG_CC?= ${_INSTALL_UNSTRIPPED:D:U-s} # cc(1) option to strip +_STRIPFLAG_INSTALL?= ${_INSTALL_UNSTRIPPED:D:U-s} # install(1) option to strip DEFAULT_SERIAL_DEVICE?= /dev/cuaa0 SERIAL_DEVICES?= /dev/cuaa0 |