git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Alex Riesen" <raa.lkml@gmail.com>
To: "Brian Gernhardt" <benji@silverinsanity.com>
Cc: git@vger.kernel.org
Subject: Re: Commit f84871 breaks build on OS X
Date: Thu, 7 Dec 2006 16:42:40 +0100	[thread overview]
Message-ID: <81b0412b0612070742x51af6011ua96962c53158cea0@mail.gmail.com> (raw)
In-Reply-To: <E8038C15-B359-4DE9-B3E0-45B065AEDBFA@silverinsanity.com>

[-- Attachment #1: Type: text/plain, Size: 445 bytes --]

Does the attached patch help? I highly suspect the perl.mak generated
by MakeMaker.

diff --git a/perl/Makefile b/perl/Makefile
index bd483b0..b936e0d 100644
--- a/perl/Makefile
+++ b/perl/Makefile
@@ -29,6 +29,8 @@ $(makfile): ../GIT-CFLAGS Makefile
 	echo '	echo $(instdir_SQ)' >> $@
 else
 $(makfile): Makefile.PL ../GIT-CFLAGS
+	$(RM) $(makfile)
+	$(RM) $(makfile).old
 	'$(PERL_PATH_SQ)' $< FIRST_MAKEFILE='$@' PREFIX='$(prefix_SQ)'
 endif

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: perl.mak.old.patch --]
[-- Type: text/x-diff; name="perl.mak.old.patch", Size: 715 bytes --]

From 5e00f865fa13a425d4395a70aaca798dfaf093dc Mon Sep 17 00:00:00 2001
From: Alex Riesen <raa.lkml@gmail.com>
Date: Thu, 7 Dec 2006 16:40:06 +0100
Subject: [PATCH] workaround for MakeMaker-generated Makefiles

It seems to try to mv perl.mak into perl.mak.old file without checking if
.old exists first.

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>

diff --git a/perl/Makefile b/perl/Makefile
index bd483b0..b936e0d 100644
--- a/perl/Makefile
+++ b/perl/Makefile
@@ -29,6 +29,8 @@ $(makfile): ../GIT-CFLAGS Makefile
 	echo '	echo $(instdir_SQ)' >> $@
 else
 $(makfile): Makefile.PL ../GIT-CFLAGS
+	$(RM) $(makfile)
+	$(RM) $(makfile).old
 	'$(PERL_PATH_SQ)' $< FIRST_MAKEFILE='$@' PREFIX='$(prefix_SQ)'
 endif
 

  reply	other threads:[~2006-12-07 15:43 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-12-07 13:54 Commit f84871 breaks build on OS X Brian Gernhardt
2006-12-07 14:33 ` Alex Riesen
2006-12-07 15:20   ` Pazu
2006-12-07 20:18   ` Randal L. Schwartz
2006-12-07 22:36     ` Junio C Hamano
2006-12-07 22:55       ` Junio C Hamano
2006-12-08  7:40         ` Alex Riesen
2006-12-08 11:51           ` Brian Gernhardt
2006-12-07 14:55 ` Johannes Schindelin
2006-12-07 15:23   ` Andreas Ericsson
2006-12-07 15:29   ` Brian Gernhardt
2006-12-07 15:42     ` Alex Riesen [this message]
  -- strict thread matches above, loose matches on Subject: below --
2006-12-07 16:04 Brian Gernhardt

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=81b0412b0612070742x51af6011ua96962c53158cea0@mail.gmail.com \
    --to=raa.lkml@gmail.com \
    --cc=benji@silverinsanity.com \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).