From owner-svn-src-all@FreeBSD.ORG Tue Nov 22 20:05:26 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0C8E61065670; Tue, 22 Nov 2011 20:05:26 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from stark.strangled.net (stark.strangled.net [IPv6:2607:f2f8:a528::3:1337:ca7]) by mx1.freebsd.org (Postfix) with ESMTP id E83278FC0C; Tue, 22 Nov 2011 20:05:25 +0000 (UTC) Received: from rui-macbook-pro.lan (bl17-149-5.dsl.telepac.pt [188.82.149.5]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (No client certificate requested) by stark.strangled.net (Postfix) with ESMTPSA id CAB423981E; Tue, 22 Nov 2011 12:05:24 -0800 (PST) Mime-Version: 1.0 (Apple Message framework v1251.1) Content-Type: text/plain; charset=us-ascii From: Rui Paulo In-Reply-To: <201111211635.pALGZvSS051067@svn.freebsd.org> Date: Tue, 22 Nov 2011 20:05:22 +0000 Content-Transfer-Encoding: quoted-printable Message-Id: <4A740CCF-AB73-41E3-B2C6-344B4A067B00@FreeBSD.org> References: <201111211635.pALGZvSS051067@svn.freebsd.org> To: Dag-Erling Smorgrav X-Mailer: Apple Mail (2.1251.1) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r227797 - head/share/mk X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Nov 2011 20:05:26 -0000 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 >=20 > Log: > As threatened on -arch, add {SHARED,STATIC}_{C,CXX}FLAGS, which allow = a > Makefile to specify different CFLAGS for shared and static libraries. >=20 > MFC after: 3 weeks >=20 > Modified: > head/share/mk/bsd.lib.mk >=20 > Modified: head/share/mk/bsd.lib.mk > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- 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=3D-fpic >=20 > PO_FLAG=3D-pg >=20 > +.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}) >=20 > .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}) >=20 > +.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} >=20 > .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} >=20 > .f.po: > ${FC} -pg ${FFLAGS} -o ${.TARGET} -c ${.IMPSRC} > _______________________________________________ > svn-src-head@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/svn-src-head > To unsubscribe, send any mail to = "svn-src-head-unsubscribe@freebsd.org" Regards, -- Rui Paulo