FreeBSD Bugzilla – Attachment 143799 Details for
Bug 191056
bsd.progs.mk: bsd.prog.mk incompatibilities with variables being set and not set
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Proposed fix
bug-191056-no-append-to-some-vars-modifications.patch (text/plain), 703 bytes, created by
Enji Cooper
on 2014-06-15 08:55:07 UTC
(
hide
)
Description:
Proposed fix
Filename:
MIME Type:
Creator:
Enji Cooper
Created:
2014-06-15 08:55:07 UTC
Size:
703 bytes
patch
obsolete
>diff --git a/share/mk/bsd.progs.mk b/share/mk/bsd.progs.mk >index c5e8c3d..8392707 100644 >--- a/share/mk/bsd.progs.mk >+++ b/share/mk/bsd.progs.mk >@@ -42,10 +42,15 @@ PROG ?= $t > > .if defined(PROG) > # just one of many >-PROG_VARS += BINDIR CFLAGS CPPFLAGS CXXFLAGS DPADD DPLIBS LDADD MAN SRCS >+PROG_VARS_NO_APPEND += BINDIR MAN SRCS >+PROG_VARS += CFLAGS CPPFLAGS CXXFLAGS DPADD DPLIBS LDADD ${PROG_VARS_NO_APPEND} > .for v in ${PROG_VARS:O:u} >-.if defined(${v}.${PROG}) || defined(${v}_${PROG}) >-$v += ${${v}_${PROG}:U${${v}.${PROG}}} >+.if empty(${PROG_VARS_NO_APPEND:M$v}) >+.if defined(${v}.${PROG}) >+$v += ${${v}.${PROG}} >+.elif defined(${v}_${PROG}) >+$v += ${${v}_${PROG}} >+.endif > .else > $v ?= > .endif
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=143799">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 191056
: 143799