Hi,
Dear diary, on Wed, Jun 28, 2006 at 09:39:46AM CEST, I got a letter
where Johannes Schindelin <Johannes.Schindelin@xxxxxx> said that...
> on my iBook, make in pu outputs:
>
> GIT_VERSION = 1.4.1.rc1.gf5d3
> * new build flags or prefix
> (cd perl && /usr/bin/perl Makefile.PL \
> PREFIX='/Users/gene099' \
> DEFINE=' -I/sw/include -DSHA1_HEADER='\''<openssl/sha.h>'\''
> -DNO_STRCASESTR -DNO_STRLCPY -DGIT_VERSION='\''"1.4.1.rc1.gf5d3"'\''' \
> LIBS=' -L/sw/lib -lz -liconv -lcrypto -lssl')
> Can't locate Devel/PPPort.pm in @INC (@INC contains:
> /System/Library/Perl/darwin /System/Library/Perl /Library/Perl/darwin
> /Library/Perl /Library/Perl /Network/Library/Perl/darwin
> /Network/Library/Perl /Network/Library/Perl .) at Makefile.PL line 29.
> BEGIN failed--compilation aborted at Makefile.PL line 29.
> make: *** [perl/Makefile] Error 2
ow, Devel::PPPort might not be around all the way back to 5.6.0. What
is your Perl version, BTW?
->8-
This makes us not include ppport.h which seems not to give us anything real
anyway; it is useful for checking for portability warts but since Devel::PPPort
is a portability wart itself, we shouldn't require it for build. You can check
for portability problems by calling make check in perl/.
Signed-off-by: Petr Baudis <pasky@xxxxxxx>
---
perl/Git.xs | 2 --
perl/Makefile.PL | 10 +++++-----
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/perl/Git.xs b/perl/Git.xs
index cb23261..51bfac3 100644
--- a/perl/Git.xs
+++ b/perl/Git.xs
@@ -15,8 +15,6 @@ #include "EXTERN.h"
#include "perl.h"
#include "XSUB.h"
-#include "ppport.h"
-
#undef die
diff --git a/perl/Makefile.PL b/perl/Makefile.PL
index 25ae54a..97ee9af 100644
--- a/perl/Makefile.PL
+++ b/perl/Makefile.PL
@@ -5,6 +5,11 @@ sub MY::postamble {
instlibdir:
@echo '$(INSTALLSITEARCH)'
+check:
+ perl -MDevel::PPPort -le 'Devel::PPPort::WriteFile(".ppport.h")' && \
+ perl .ppport.h --compat-version=5.6.0 Git.xs && \
+ rm .ppport.h
+
MAKE_FRAG
}
@@ -24,8 +29,3 @@ WriteMakefile(
MYEXTLIB => '../libgit.a',
INC => '-I. -I..',
);
-
-
-use Devel::PPPort;
-
--s 'ppport.h' or Devel::PPPort::WriteFile();
--
Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
Snow falling on Perl. White noise covering line noise.
Hides all the bugs too. -- J. Putnam
-
: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html