From owner-svn-src-head@freebsd.org Wed Oct 14 20:16:23 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 84D17A13690; Wed, 14 Oct 2015 20:16:23 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id 692DAC9B; Wed, 14 Oct 2015 20:16:23 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (localhost [IPv6:::1]) by freefall.freebsd.org (Postfix) with ESMTP id 5DAC114C0; Wed, 14 Oct 2015 20:16:23 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (localhost [172.31.3.2]) by mail.xzibition.com (Postfix) with ESMTP id E31BF9EBF; Wed, 14 Oct 2015 20:16:22 +0000 (UTC) X-Virus-Scanned: amavisd-new at mail.xzibition.com Received: from mail.xzibition.com ([172.31.3.2]) by mail.xzibition.com (mail.xzibition.com [172.31.3.2]) (amavisd-new, port 10026) with LMTP id w1Gae7OoB6r2; Wed, 14 Oct 2015 20:16:19 +0000 (UTC) Subject: Re: svn commit: r289253 - head/share/mk DKIM-Filter: OpenDKIM Filter v2.9.2 mail.xzibition.com 647619EB9 To: NGie Cooper References: <201510131911.t9DJBMTc034025@repo.freebsd.org> <561D7549.2070202@FreeBSD.org> <561D8B38.7030202@FreeBSD.org> Cc: "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" From: Bryan Drewery Openpgp: id=F9173CB2C3AAEA7A5C8A1F0935D771BB6E4697CF; url=http://www.shatow.net/bryan/bryan2.asc Organization: FreeBSD Message-ID: <561EB815.6050600@FreeBSD.org> Date: Wed, 14 Oct 2015 13:16:21 -0700 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:38.0) Gecko/20100101 Thunderbird/38.3.0 MIME-Version: 1.0 In-Reply-To: Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="ae60GpdT2SquElEpUFkHeamoOPTR3bP2t" X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Oct 2015 20:16:23 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --ae60GpdT2SquElEpUFkHeamoOPTR3bP2t Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 10/13/2015 4:30 PM, NGie Cooper wrote: > On Tue, Oct 13, 2015 at 3:52 PM, Bryan Drewery w= rote: >> On 10/13/2015 3:51 PM, NGie Cooper wrote: >>> On Tue, Oct 13, 2015 at 2:19 PM, Bryan Drewery = wrote: >>> ... >>>>>> On Oct 13, 2015, at 12:11, Bryan Drewery wr= ote: >>>>>> >>>>>> Author: bdrewery >>>>>> Date: Tue Oct 13 19:11:22 2015 >>>>>> New Revision: 289253 >>>>>> URL: https://svnweb.freebsd.org/changeset/base/289253 >>>>>> >>>>>> Log: >>>>>> bsd.subdir.mk: Handle cleanobj. >>>>>> >>>>>> Before this, the target was unknown. Now it will recurse on subd= irs and run >>>>>> the target in the current directory. It is required to recurse a= s there >>>>>> may be subdirs that have objs in their directory or in the object= directory, >>>>>> so it is not enough to just delete the objdir of the subdir paren= t. >>> >>> ... >>> >>>> You sent no text... >>> >>> Hit send on my phone by accident. >>> >>> make cleanobj appears broken with bsd.progs.mk (maybe related to that= >>> makefile snippet). >> >> Can you elaborate? It seems fine to me. >=20 > (cd tests; make cleandir) # does not seem to clean up everything that > was created, like before >=20 I think what is being seen here is because I removed 'cleanobj' from bsd.progs.mk (in r288201) to let bsd.obj.mk handle it. It sometimes recurses clean when needed. If there's an obj dir 'cleanobj' will just remove that and avoid 'clean'. For example (without bsd.progs.mk) ~/svn/clean2/usr.bin/vi # make obj /usr/obj/root/svn/clean2/usr.bin/vi created for /root/svn/clean2/usr.bin/= vi =3D=3D=3D> catalog (obj) /usr/obj/root/svn/clean2/usr.bin/vi/catalog created for /root/svn/clean2/usr.bin/vi/catalog ~/svn/clean2/usr.bin/vi # make cleanobj =3D=3D=3D> catalog (cleanobj) rm -f dump dutch english french german polish ru_RU.KOI8-R spanish swedish uk_UA.KOI8-U zh_CN.GB2312 dutch.UTF-8 french.UTF-8 german.UTF-8 polish.UTF-8 spanish.UTF-8 swedish.UTF-8 zh_CN.UTF-8 ru_RU.UTF-8 uk_UA.UTF-8 english.base *.check __ck1 __ck2 Next call finds no obj dir and tries cleaning in local dirs: ~/svn/clean2/usr.bin/vi # make cleanobj rm -f nex nvi nvi.full nvi.debug cl_funcs.o cl_main.o cl_read.o cl_screen.o cl_term.o conv.o cut.o delete.o encoding.o exf.o key.o line.o log.o main.o mark.o msg.o options.o options_f.o put.o recover.o screen.o search.o seq.o util.o ex.o ex_abbrev.o ex_append.o ex_args.o ex_argv.o ex_at.o ex_bang.o ex_cd.o ex_cmd.o ex_cscope.o ex_delete.o ex_display.o ex_edit.o ex_equal.o ex_file.o ex_filter.o ex_global.o ex_init.o ex_join.o ex_map.o ex_mark.o ex_mkexrc.o ex_move.o ex_open.o ex_preserve.o ex_print.o ex_put.o ex_quit.o ex_read.o ex_screen.o ex_script.o ex_set.o ex_shell.o ex_shift.o ex_source.o ex_stop.o ex_subst.o ex_tag.o ex_txt.o ex_undo.o ex_usage.o ex_util.o ex_version.o ex_visual.o ex_write.o ex_yank.o ex_z.o getc.o v_at.o v_ch.o v_cmd.o v_delete.o v_ex.o v_increment.o v_init.o v_itxt.o v_left.o v_mark.o v_match.o v_paragraph.o v_put.o v_redraw.o v_replace.o v_right.o v_screen.o v_scroll.o v_search.o v_section.o v_sentence.o v_status.o v_txt.o v_ulcase.o v_undo.o v_util.o v_word.o v_xchar.o v_yank.o v_z.o v_zexit.o vi.o vs_line.o vs_msg.o vs_refresh.o vs_relative.o vs_smap.o vs_split.o regcomp.o regerror.o regexec.o regfree.o vi.1.gz vi.1.cat.gz =3D=3D=3D> catalog (clean) rm -f dump dutch english french german polish ru_RU.KOI8-R spanish swedish uk_UA.KOI8-U zh_CN.GB2312 dutch.UTF-8 french.UTF-8 german.UTF-8 polish.UTF-8 spanish.UTF-8 swedish.UTF-8 zh_CN.UTF-8 ru_RU.UTF-8 uk_UA.UTF-8 english.base *.check __ck1 __ck2 rm -f .depend tags =3D=3D=3D> catalog (cleandepend) =3D=3D=3D> catalog (cleanobj) rm -f dump dutch english french german polish ru_RU.KOI8-R spanish swedish uk_UA.KOI8-U zh_CN.GB2312 dutch.UTF-8 french.UTF-8 german.UTF-8 polish.UTF-8 spanish.UTF-8 swedish.UTF-8 zh_CN.UTF-8 ru_RU.UTF-8 uk_UA.UTF-8 english.base *.check __ck1 __ck2 Similar behavior will happen with bsd.progs.mk usage now. 'cleandir' also has this flip-flopping behavior. --=20 Regards, Bryan Drewery --ae60GpdT2SquElEpUFkHeamoOPTR3bP2t Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAEBAgAGBQJWHrgVAAoJEDXXcbtuRpfPlEEH/Asifp/AfYiGh1fG+MI8IaMT U0v0y0iL56TeFbsqaWx5BsY0HViJ1MHrfNw0pv4nAZT7RmiP+4m0OUZZvr3lx4Xi 8XezD7rNvcEDDH4ytMImC7mrhOiLSFPRHyeBagA3nvEv7Pz/4Z9OniBSNp2hLUkb fO0Nar2HeXLxtpCgiVtn/f9pvzdJ/grp/R+lzvoyaITOvH+y9b3ZISeBCm+X4BNi sin28dedrDVNxH0zFi0vRCQ2zKPAd2sigDLP8MD0mvfXgsVYp3l4Oc16Oh3jZtg+ lEefh9Fqw582xKkQ9ZBPOU+YV26I9+GweNcUYlt4QGedGE9MaDVFyJ0lkrvLOzQ= =i4fm -----END PGP SIGNATURE----- --ae60GpdT2SquElEpUFkHeamoOPTR3bP2t--