diff options
author | marcel <marcel@FreeBSD.org> | 2000-11-20 02:17:34 +0000 |
---|---|---|
committer | marcel <marcel@FreeBSD.org> | 2000-11-20 02:17:34 +0000 |
commit | e7311b7ac2441666be75cb77be2a589c48ea3740 (patch) | |
tree | f36cfe02f588f903a36b8a68c88096b817f0bbb9 /gnu | |
parent | 7d8a00561233be5c4ecfe188e55c8e3770012ae1 (diff) | |
download | FreeBSD-src-e7311b7ac2441666be75cb77be2a589c48ea3740.zip FreeBSD-src-e7311b7ac2441666be75cb77be2a589c48ea3740.tar.gz |
Fix cross-building.
o Move building libperl and miniperl from build-tools to
cross-tools. libperl uses MACHINE_ARCH to determine the
right configuration, which doesn't match the build
machine when cross-building if they are built as build-
tools.
o Since miniperl needs to be built as a cross-tool, it
needs to be installed under /usr/obj so that it can be
used (cross-tools have a special object directory to
avoid build conflicts. As a downside, you can't easily
run cross-tools from their object directory). Remove
the install and distribute override targets. To avoid
having miniperl installed by installworld, remove it
from SUBDIR.
o We can't pickup miniperl from the object directory but
since it's installed, depend on PATH. This is save,
because the makefiles are run with a known path.
o Build libperl again as part of the library target. A
_libperl variable existed, but it was never defined.
o Add chmod to the list of saved tools, because perl
conditionally uses it during install.
The bootstrap-tools and cross-tools targets are modified to
avoid building profiled and shared libraries. While here,
have these targets build static binaries instead of shared
binaries.
Approved by: markm
Diffstat (limited to 'gnu')
-rw-r--r-- | gnu/usr.bin/perl/Makefile | 6 | ||||
-rw-r--r-- | gnu/usr.bin/perl/Makefile.inc | 2 | ||||
-rw-r--r-- | gnu/usr.bin/perl/library/Makefile.inc | 2 | ||||
-rw-r--r-- | gnu/usr.bin/perl/miniperl/Makefile | 2 | ||||
-rw-r--r-- | gnu/usr.bin/perl/pod/Makefile.inc | 2 | ||||
-rw-r--r-- | gnu/usr.bin/perl/utils/Makefile.inc | 2 | ||||
-rw-r--r-- | gnu/usr.bin/perl/x2p/Makefile.inc | 2 |
7 files changed, 6 insertions, 12 deletions
diff --git a/gnu/usr.bin/perl/Makefile b/gnu/usr.bin/perl/Makefile index 3cce3ab..6770bae 100644 --- a/gnu/usr.bin/perl/Makefile +++ b/gnu/usr.bin/perl/Makefile @@ -1,11 +1,7 @@ # $FreeBSD$ -SUBDIR= libperl miniperl perl suidperl library pod utils x2p +SUBDIR= libperl perl suidperl library pod utils x2p MAINTAINER=markm@freebsd.org -build-tools: - cd ${.CURDIR}/libperl && make build-tools - cd ${.CURDIR}/miniperl && make build-tools - .include <bsd.subdir.mk> diff --git a/gnu/usr.bin/perl/Makefile.inc b/gnu/usr.bin/perl/Makefile.inc index 26f7889..88620ea 100644 --- a/gnu/usr.bin/perl/Makefile.inc +++ b/gnu/usr.bin/perl/Makefile.inc @@ -2,7 +2,7 @@ PERL5SRC?= ${.CURDIR}/../../../../contrib/perl5 PERL5LIBSRC?= ${.CURDIR}/../libperl -MINIPERL?= ${.OBJDIR}/../miniperl/miniperl +MINIPERL?= miniperl BINDIR?= /usr/bin diff --git a/gnu/usr.bin/perl/library/Makefile.inc b/gnu/usr.bin/perl/library/Makefile.inc index e2aa8f1..bde6f9a 100644 --- a/gnu/usr.bin/perl/library/Makefile.inc +++ b/gnu/usr.bin/perl/library/Makefile.inc @@ -2,7 +2,7 @@ PERL5SRC?= ${.CURDIR}/../../../../../contrib/perl5 PERL5LIBSRC?= ${.CURDIR}/../../libperl -MINIPERL= ${.OBJDIR}/../../miniperl/miniperl +MINIPERL= miniperl MODULEDIR?= ${MODULE} diff --git a/gnu/usr.bin/perl/miniperl/Makefile b/gnu/usr.bin/perl/miniperl/Makefile index 62a1a8a..81d29c9 100644 --- a/gnu/usr.bin/perl/miniperl/Makefile +++ b/gnu/usr.bin/perl/miniperl/Makefile @@ -17,8 +17,6 @@ LDADD= ${MYLIBPERL} -lm -lcrypt -lutil build-tools: cleandepend cd ${.CURDIR} && ${MAKE} ${PROG} -install distribute: - NO_PERL_SCRIPT_MAKE= true .include <bsd.prog.mk> diff --git a/gnu/usr.bin/perl/pod/Makefile.inc b/gnu/usr.bin/perl/pod/Makefile.inc index e4440c7..e030390 100644 --- a/gnu/usr.bin/perl/pod/Makefile.inc +++ b/gnu/usr.bin/perl/pod/Makefile.inc @@ -4,7 +4,7 @@ PERL5SRC?= ${.CURDIR}/../../../../../contrib/perl5 MINIPERLOPT?= -I${.OBJDIR}/../../perl/lib -I${.OBJDIR}/../../perl -MINIPERL= ${.OBJDIR}/../../miniperl/miniperl +MINIPERL= miniperl CLEANFILES+= ${PROG}.1 ${PROG}.PL diff --git a/gnu/usr.bin/perl/utils/Makefile.inc b/gnu/usr.bin/perl/utils/Makefile.inc index 6ab43e2..726602b 100644 --- a/gnu/usr.bin/perl/utils/Makefile.inc +++ b/gnu/usr.bin/perl/utils/Makefile.inc @@ -4,7 +4,7 @@ PERL5SRC= ${.CURDIR}/../../../../../contrib/perl5 PERL5LIBSRC= ${.CURDIR}/../../libperl -MINIPERL= ${.OBJDIR}/../../miniperl/miniperl +MINIPERL= miniperl .include "../Makefile.inc" diff --git a/gnu/usr.bin/perl/x2p/Makefile.inc b/gnu/usr.bin/perl/x2p/Makefile.inc index 9653614..b7a7fef 100644 --- a/gnu/usr.bin/perl/x2p/Makefile.inc +++ b/gnu/usr.bin/perl/x2p/Makefile.inc @@ -5,7 +5,7 @@ PERL5SRC= ${.CURDIR}/../../../../../contrib/perl5 PERL5LIBSRC= ${.CURDIR}/../../libperl MINIPERLOPT?= -I${.OBJDIR}/../../perl/lib -I${.OBJDIR}/../../perl -MINIPERL= ${.OBJDIR}/../../miniperl/miniperl +MINIPERL= miniperl LDFLAGS+= -L${.OBJDIR}/../../libperl |