From 0483bc835ac9d7a98c6221c31164adab28d45012 Mon Sep 17 00:00:00 2001 From: "Todd C. Miller" Date: Wed, 7 Apr 2004 21:33:13 +0000 Subject: merge local changes into perl-5.8.3 --- gnu/usr.bin/perl/Cross/Makefile | 16 +++++++++++----- gnu/usr.bin/perl/Cross/README | 5 +++-- 2 files changed, 14 insertions(+), 7 deletions(-) (limited to 'gnu/usr.bin/perl/Cross') diff --git a/gnu/usr.bin/perl/Cross/Makefile b/gnu/usr.bin/perl/Cross/Makefile index 4e93f98644b..bef9f385b6e 100644 --- a/gnu/usr.bin/perl/Cross/Makefile +++ b/gnu/usr.bin/perl/Cross/Makefile @@ -1,8 +1,8 @@ ## Toplevel Makefile for cross-compilation of perl # -## $Id: Makefile,v 1.4 2003/09/05 00:48:19 red Exp red $ +## $Id: Makefile,v 1.2 2003/12/03 03:02:24 millert Exp $ -export TOPDIR?=${shell pwd} +export TOPDIR=${shell pwd} include $(TOPDIR)/config export CFLAGS export SYS=$(ARCH)-$(OS) @@ -39,9 +39,15 @@ gen_patch: diff -Bbur ../installperl installperl > installperl.patch patch: - cd .. ; patch -p1 < Cross/Makefile.SH.patch - cd .. ; patch -p1 < Cross/installperl.patch ; mv installperl installperl-patched - cd .. ; sed -e 's/XXSTRIPXX/$(SYS)/' installperl-patched > installperl + cd .. ; if [ ! -e ./CROSS_PATCHED ] ; then \ + patch -p1 < Cross/Makefile.SH.patch; \ + patch -p1 < Cross/installperl.patch ; mv installperl installperl-patched; \ + sed -e 's/XXSTRIPXX/$(SYS)/' installperl-patched > installperl; \ + touch CROSS_PATCHED ; fi + +dry_patch: + cd .. ; patch --dry-run -p1 < Cross/Makefile.SH.patch; \ + patch --dry-run -p1 < Cross/installperl.patch; \ perl: @echo Perl cross-build directory is $(TOPDIR) diff --git a/gnu/usr.bin/perl/Cross/README b/gnu/usr.bin/perl/Cross/README index 79d2b7d1756..51da64964ee 100644 --- a/gnu/usr.bin/perl/Cross/README +++ b/gnu/usr.bin/perl/Cross/README @@ -19,7 +19,7 @@ You need a working and tested cross-compiler for your build and target combination. The binary directory must be in your path. -1) You should be reading me (README) in perl-5.8.2/Cross +1) You should be reading me (README) in perl-5.8.3/Cross 2) Make sure you are in the Cross directory. @@ -68,6 +68,7 @@ Should you wish to produce optimised binaries for different architectures you can add the appropriate compiler flags to the Makefile in a new ifeq ($(ARCH),...) ... endif block. + Please refer to your cross-compiler documentation for details. @@ -83,4 +84,4 @@ References ---------- Redvers Davies Open Zaurus http://www.openzaurus.org/ -Perl OZ Packages http://www.openzaurus.org/official/testing/feed/ +Perl OZ Packages http://www.criticalintegration.com/perl-oz/ -- cgit v1.2.3