misc/61322: [patch] bsd.dep.mk disallows shell generated flags in CFLAGS

Alex Kozlov spam at rm-rf.kiev.ua
Mon May 19 14:50:03 UTC 2008


The following reply was made to PR misc/61322; it has been noted by GNATS.

From: Alex Kozlov <spam at rm-rf.kiev.ua>
To: bug-followup at FreeBSD.org, valeks at novel-il.ru, linimon at freebsd.org,
	spam at rm-rf.kiev.ua
Cc:  
Subject: Re: misc/61322: [patch] bsd.dep.mk disallows shell generated flags
	in CFLAGS
Date: Mon, 19 May 2008 17:44:28 +0300

 Hi, bug-followup
 
 Restored patch:
 
 --- src/share/mk/bsd.dep.mk.orig        Tue Jan 13 20:34:30 2004         
 +++ src/share/mk/bsd.dep.mk     Tue Jan 13 20:58:57 2004                                                                         
 @@ -116,18 +116,18 @@
 rm -f ${DEPENDFILE}
 .if ${SRCS:M*.[cS]} != ""
 	${MKDEPCMD} -f ${DEPENDFILE} -a ${MKDEP} \
 -	${CFLAGS:M-nostdinc*} ${CFLAGS:M-[BID]*} \
 +	${CFLAGS:M-nostdinc*} ${CFLAGS:M-[BID]*} ${CFLAGS:M`*} ${CFLAGS:M*`}\
 	${.ALLSRC:M*.[cS]}
 .endif
 .if ${SRCS:M*.cc} != "" || ${SRCS:M*.C} != "" || ${SRCS:M*.cpp} != "" || \ 
 ${SRCS:M*.cxx} != ""
 	${MKDEPCMD} -f ${DEPENDFILE} -a ${MKDEP} \
 -	${CXXFLAGS:M-nostdinc*} ${CXXFLAGS:M-[BID]*} \
 +	${CXXFLAGS:M-nostdinc*} ${CXXFLAGS:M-[BID]*} ${CFLAGS:M`*} ${CFLAGS:M*`} \ 
 	${.ALLSRC:M*.cc} ${.ALLSRC:M*.C} ${.ALLSRC:M*.cpp} ${.ALLSRC:M*.cxx}
 .endif
 .if ${SRCS:M*.m} != ""
 	${MKDEPCMD} -f ${DEPENDFILE} -a ${MKDEP} \
 -	${OBJCFLAGS:M-nostdinc*} ${OBJCFLAGS:M-[BID]*} \
 +	${OBJCFLAGS:M-nostdinc*} ${OBJCFLAGS:M-[BID]*} ${CFLAGS:M`*} ${CFLAGS:M*`} \
 	${OBJCFLAGS:M-Wno-import*} \
 	${.ALLSRC:M*.m}
 .endif
 
 Adapted to fresh current:
 
 --- bsd.dep.mk
 +++ bsd.dep.mk.new
 @@ -130,9 +130,10 @@
  MKDEP_CXXFLAGS=	${CXXFLAGS:M-X*} ${CXXFLAGS:M-[BID]*}
  MKDEP_OBJCFLAGS=${OBJCFLAGS:M-X*} ${OBJCFLAGS:M-[BID]*}
  .else
 -MKDEP_CFLAGS=	${CFLAGS:M-nostdinc*} ${CFLAGS:M-[BID]*}
 -MKDEP_CXXFLAGS=	${CXXFLAGS:M-nostdinc*} ${CXXFLAGS:M-[BID]*}
 -MKDEP_OBJCFLAGS=${OBJCFLAGS:M-nostdinc*} ${OBJCFLAGS:M-[BID]*} ${OBJCFLAGS:M-Wno-import*}
 +MKDEP_CFLAGS=	${CFLAGS:M-nostdinc*} ${CFLAGS:M-[BID]*} ${CFLAGS:M`*} ${CFLAGS:M*`}
 +MKDEP_CXXFLAGS=	${CXXFLAGS:M-nostdinc*} ${CXXFLAGS:M-[BID]*} ${CXXFLAGS:M`*} ${CXXFLAGS:M*`}
 +MKDEP_OBJCFLAGS=${OBJCFLAGS:M-nostdinc*} ${OBJCFLAGS:M-[BID]*} ${OBJCFLAGS:M-Wno-import*} \
 +					${OBJCFLAGS:M`*} ${OBJCFLAGS:M*`}
  .endif
  
  DPSRCS+= ${SRCS}


More information about the freebsd-bugs mailing list