svn commit: r227797 - head/share/mk

[Rui Paulo]

With this change, I can no longer update a FreeBSD 9.0-current system from June 2010 to FreeBSD 10.0. I suspect I'm not the only one.

On 2011/11/21, at 16:35, Dag-Erling Smorgrav wrote:

> Author: des
> Date: Mon Nov 21 16:35:57 2011
> New Revision: 227797
> URL: http://svn.freebsd.org/changeset/base/227797
> 
> Log:
>  As threatened on -arch, add {SHARED,STATIC}_{C,CXX}FLAGS, which allow a
>  Makefile to specify different CFLAGS for shared and static libraries.
> 
>  MFC after:	3 weeks
> 
> Modified:
>  head/share/mk/bsd.lib.mk
> 
> Modified: head/share/mk/bsd.lib.mk
> ==============================================================================
> --- head/share/mk/bsd.lib.mk	Mon Nov 21 16:06:23 2011	(r227796)
> +++ head/share/mk/bsd.lib.mk	Mon Nov 21 16:35:57 2011	(r227797)
> @@ -67,23 +67,29 @@ PICFLAG=-fpic
> 
> PO_FLAG=-pg
> 
> +.c.o:
> +	${CC} ${STATIC_CFLAGS} ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET}
> +
> .c.po:
> -	${CC} ${PO_FLAG} ${PO_CFLAGS} -c ${.IMPSRC} -o ${.TARGET}
> +	${CC} ${PO_FLAG} ${STATIC_CFLAGS} ${PO_CFLAGS} -c ${.IMPSRC} -o ${.TARGET}
> 	@[ -z "${CTFCONVERT}" -o -n "${NO_CTF}" ] || \
> 		(${ECHO} ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} && \
> 		${CTFCONVERT} ${CTFFLAGS} ${.TARGET})
> 
> .c.So:
> -	${CC} ${PICFLAG} -DPIC ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET}
> +	${CC} ${PICFLAG} -DPIC ${SHARED_CFLAGS} ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET}
> 	@[ -z "${CTFCONVERT}" -o -n "${NO_CTF}" ] || \
> 		(${ECHO} ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} && \
> 		${CTFCONVERT} ${CTFFLAGS} ${.TARGET})
> 
> +.cc.o:
> +	${CXX} ${STATIC_CXXFLAGS} ${CXXFLAGS} -c ${.IMPSRC} -o ${.TARGET}
> +
> .cc.po .C.po .cpp.po .cxx.po:
> -	${CXX} ${PO_FLAG} ${PO_CXXFLAGS} -c ${.IMPSRC} -o ${.TARGET}
> +	${CXX} ${PO_FLAG} ${STATIC_CXXFLAGS} ${PO_CXXFLAGS} -c ${.IMPSRC} -o ${.TARGET}
> 
> .cc.So .C.So .cpp.So .cxx.So:
> -	${CXX} ${PICFLAG} -DPIC ${CXXFLAGS} -c ${.IMPSRC} -o ${.TARGET}
> +	${CXX} ${PICFLAG} -DPIC ${SHARED_CXXFLAGS} ${CXXFLAGS} -c ${.IMPSRC} -o ${.TARGET}
> 
> .f.po:
> 	${FC} -pg ${FFLAGS} -o ${.TARGET} -c ${.IMPSRC}
> _______________________________________________
> svn-src-head at freebsd.org mailing list
> http://lists.freebsd.org/mailman/listinfo/svn-src-head
> To unsubscribe, send any mail to "svn-src-head-unsubscribe at freebsd.org"

Regards,
--
Rui Paulo