Re: PPC SHA-1 Updates in "pu"
- From
Petr Baudis <pasky@suse.cz>
- Date
- Jun 25, 2006, 01:02 UTC
- Message-ID
- <20060625010202.GX21864@pasky.or.cz>
- In-Reply-To
- <7vd5cyt8a3.fsf@assigned-by-dhcp.cox.net>
Dear diary, on Sun, Jun 25, 2006 at 01:59:16AM CEST, I got a letter where Junio C Hamano <junkio@cox.net> said that...
Show 22 quoted lines
> Linus Torvalds <torvalds@osdl.org> writes: > > > how does that compile for anybody else, when -DSHA1_HEADER isn't set > > correctly? The quotes have gone missing: > > > > -DSHA1_HEADER='ppc/sha1.h' > > > > don't ask me why. > > That is, as usual, caused by careless shell quoting. > > : gitster; PPC_SHA1=YesPlease Meta/Make perl/Makefile > GIT_VERSION = 1.4.1.rc1.g9adbe > (cd perl && /usr/bin/perl Makefile.PL \ > PREFIX="/home/junio/git-test" \ > DEFINE="-O2 -Wall -Wdeclaration-after-statement > -g -fPIC -DSHA1_HEADER='"ppc/sha1.h"' > -DGIT_VERSION=\\\"1.4.1.rc1.g9adbe\\\"" \ > LIBS="libgit.a xdiff/lib.a -lz") > Unrecognized argument in LIBS ignored: 'libgit.a' > Unrecognized argument in LIBS ignored: 'xdiff/lib.a' > Writing Makefile for Git
Oops...
----
Git.pm build: Fix $DEFINE quoting and missing GIT-CFLAGS dependency
Signed-off-by: Petr Baudis <pasky@suse.cz>
diff --git a/Makefile b/Makefile index 9a59466..64375f6 100644 --- a/Makefile +++ b/Makefile @@ -608,10 +608,12 @@ XDIFF_OBJS=xdiff/xdiffi.o xdiff/xprepare rm -f $@ && $(AR) rcs $@ $(XDIFF_OBJS) -perl/Makefile: perl/Git.pm perl/Makefile.PL +PERL_DEFINES = $(ALL_CFLAGS) -DGIT_VERSION='"$(GIT_VERSION)"' +PERL_DEFINES_SQ = $(subst ','\'',$(PERL_DEFINES)) +perl/Makefile: perl/Git.pm perl/Makefile.PL GIT-CFLAGS (cd perl && $(PERL_PATH) Makefile.PL \ PREFIX="$(prefix)" \ - DEFINE="$(ALL_CFLAGS) -DGIT_VERSION=\\\"$(GIT_VERSION)\\\"" \ + DEFINE='$(PERL_DEFINES_SQ)' \ LIBS="$(EXTLIBS)") doc:
-- Petr "Pasky" Baudis Stuff: http://pasky.or.cz/ A person is just about as big as the things that make them angry.