From mboxrd@z Thu Jan 1 00:00:00 1970 From: Junio C Hamano Subject: Re: [PATCH 4/4] Move initialization of Git::SVN variables into Git::SVN. Date: Fri, 27 Jul 2012 00:09:51 -0700 Message-ID: <7vlii51xz4.fsf@alter.siamese.dyndns.org> References: <1343344945-3717-1-git-send-email-schwern@pobox.com> <1343344945-3717-5-git-send-email-schwern@pobox.com> <7vhast3hpb.fsf@alter.siamese.dyndns.org> <20120727053800.GC4685@burratino> <7v394d3ffc.fsf@alter.siamese.dyndns.org> <7vpq7h1z1q.fsf@alter.siamese.dyndns.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: "Michael G. Schwern" , git@vger.kernel.org, robbat2@gentoo.org, bwalton@artsci.utoronto.ca, normalperson@yhbt.net To: Jonathan Nieder X-From: git-owner@vger.kernel.org Fri Jul 27 09:10:01 2012 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1SuegT-0004kx-3x for gcvg-git-2@plane.gmane.org; Fri, 27 Jul 2012 09:10:01 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751941Ab2G0HJz (ORCPT ); Fri, 27 Jul 2012 03:09:55 -0400 Received: from b-pb-sasl-quonix.pobox.com ([208.72.237.35]:59691 "EHLO smtp.pobox.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751719Ab2G0HJy (ORCPT ); Fri, 27 Jul 2012 03:09:54 -0400 Received: from smtp.pobox.com (unknown [127.0.0.1]) by b-sasl-quonix.pobox.com (Postfix) with ESMTP id B148A7BB1; Fri, 27 Jul 2012 03:09:53 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=pobox.com; h=from:to:cc :subject:references:date:in-reply-to:message-id:mime-version :content-type; s=sasl; bh=DTGkvSx19wYNvsX3zAIx2QjaUhs=; b=Uy7pCL 3FPsNb4StmXrjP1Y9SghNucOkalr14Y92gt7+5ZW3OLhn0tWqYi228Zp0oI0FnHz ym2q8O/0O+CcQTUNHBR+6y43IQc2S9r0B1Dp3yDPgs+/Z/JF1Fm0mrS3/U5lytHH kZuu+XsNySMrD/U9wO9ib/jsPNt4n9M0x0m7k= DomainKey-Signature: a=rsa-sha1; c=nofws; d=pobox.com; h=from:to:cc :subject:references:date:in-reply-to:message-id:mime-version :content-type; q=dns; s=sasl; b=BuGipLDvwlqIp/5M635NcDrkBOqSrk32 qJ2In0yYyy4RXJTx73Qj1asi+lWvWDV8vfIcQRUmhR7eVp1byQ89QoYVw7DDLk1H eYaPqXntH8OnqFb1ItpR0OeLn3FclD2cRYPGOKeNT+ouTTRbdfIQvi4023lT9vhd Soyhs7huTCQ= Received: from b-pb-sasl-quonix.pobox.com (unknown [127.0.0.1]) by b-sasl-quonix.pobox.com (Postfix) with ESMTP id 971307BB0; Fri, 27 Jul 2012 03:09:53 -0400 (EDT) Received: from pobox.com (unknown [98.234.214.94]) (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by b-sasl-quonix.pobox.com (Postfix) with ESMTPSA id D4BDD7BAF; Fri, 27 Jul 2012 03:09:52 -0400 (EDT) In-Reply-To: <7vpq7h1z1q.fsf@alter.siamese.dyndns.org> (Junio C. Hamano's message of "Thu, 26 Jul 2012 23:46:41 -0700") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.2 (gnu/linux) X-Pobox-Relay-ID: 0FEB8CD0-D7BA-11E1-B5CC-01B42E706CDE-77302942!b-pb-sasl-quonix.pobox.com Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Junio C Hamano writes: > Junio C Hamano writes: > >> t91XX series seem to fail in 'pu' with "Can't locate Git/SVN.pm in >> @INC" for me. I see perl/blib/lib/Git/SVN/ directory and files >> under it, but there is no perl/blib/lib/Git/SVN.pm installed. I see >> Git/I18N.pm and Git/SVN/Ra.pm (and friends) mentioned in >> perl/perl.mak generated by MakeMaker, but Git/SVN.pm does not appear >> anywhere. >> >> I think it is some interaction with other topics, as the tip of >> ms/git-svn-pm topic that parks this series does not exhibit the >> symptom, but it is getting late for me already, so I won't dig into >> this further. > > Actually there is no difference between ms/git-svn-pm and pu in perl/ > directory. I _think_ there is some dependency missing that makes > this sequence break: > > (in one repository) > git checkout pu ;# older pu without ms/git-svn-pm > make ; make test > > (in another repository that shares the refs) > git checkout pu > git merge ms/git-svn-pm > > (in the first repository) > git reset --hard ;# update the working tree > make ; make test What was happening was that originally, pu had ms/makefile-pl but not ms/git-svn-pm. Hence, perl/Git/SVN.pm did not exist. I ran "make" and it created perl/perl.mak that does not know about Git/SVN.pm; Then ms/git-svn-pm is merged to pu and now we have perl/Git/SVN.pm. But there is nothing in ms/makefile-pl that says on what files perl.mak depends on. I think there needs to be a dependency in to recreate perl/perl.mak when any of the *.pm files are changed, perhaps like this. I am not sure why perl/perl.mak is built by the top-level Makefile, instead of just using "$(MAKE) -C perl/", though... Makefile | 7 +++++++ perl/Makefile | 1 + 2 files changed, 8 insertions(+) diff --git a/Makefile b/Makefile index b0b3493..e2a4ac7 100644 --- a/Makefile +++ b/Makefile @@ -2090,6 +2090,13 @@ $(SCRIPT_LIB) : % : %.sh GIT-SCRIPT-DEFINES ifndef NO_PERL $(patsubst %.perl,%,$(SCRIPT_PERL)): perl/perl.mak +perl/perl.mak: perl/PM.stamp + +perl/PM.stamp: FORCE + $(QUIET_GEN)find perl -type f -name '*.pm' | sort >$@+ && \ + { cmp $@+ $@ >/dev/null 2>/dev/null || mv $@+ $@; } && \ + $(RM) $@+ + perl/perl.mak: GIT-CFLAGS GIT-PREFIX perl/Makefile perl/Makefile.PL $(QUIET_SUBDIR0)perl $(QUIET_SUBDIR1) PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' $(@F) diff --git a/perl/Makefile b/perl/Makefile index 6ca7d47..d6f8478 100644 --- a/perl/Makefile +++ b/perl/Makefile @@ -20,6 +20,7 @@ clean: $(RM) ppport.h $(RM) $(makfile) $(RM) $(makfile).old + $(RM) PM.stamp ifdef NO_PERL_MAKEMAKER instdir_SQ = $(subst ','\'',$(prefix)/lib)