[prev in list] [next in list] [prev in thread] [next in thread]
List: perl5-changes
Subject: Change 35114: Integrate:
From: Dave Mitchell <davem () iabyn ! com>
Date: 2008-12-15 23:00:03
Message-ID: 20081215230003.0135814017 () mx ! activestate ! com
[Download RAW message or body]
Change 35114 by davem@davem-pigeon on 2008/12/15 22:54:40
Integrate:
[ 34317]
Subject: [PATCH at 34306] - crosscompilation - step 1 of N+1
From: Vadim Konovalov <vadim@vkonovalov.ru>
Date: Mon, 08 Sep 2008 07:04:09 +0400
Message-ID: <48C49629.4000208@vkonovalov.ru>
Affected files ...
... //depot/maint-5.10/perl/Cross/build-arm-n770-sh#2 integrate
... //depot/maint-5.10/perl/Cross/cflags-cross-arm#2 integrate
... //depot/maint-5.10/perl/Cross/config.sh-arm-linux#7 integrate
... //depot/maint-5.10/perl/Cross/config.sh-arm-linux-n770#2 integrate
... //depot/maint-5.10/perl/Makefile.SH#12 integrate
Differences ...
==== //depot/maint-5.10/perl/Cross/build-arm-n770-sh#2 (xtext) ====
Index: perl/Cross/build-arm-n770-sh
--- perl/Cross/build-arm-n770-sh#1~32694~ 2007-12-22 01:23:09.000000000 -0800
+++ perl/Cross/build-arm-n770-sh 2008-12-15 14:54:40.000000000 -0800
@@ -35,7 +35,7 @@
if [[ "x$1" != xnoconf* ]] ; then
# do miniperl on HOST
-./Configure -des -D prefix=./dummy -Dusedevel
+CROSS_NAME= ./Configure -des -D prefix=./dummy -Dusedevel
make miniperl
make uudmap.h
# fake uudmap, which should be on HOST
@@ -58,7 +58,7 @@
rm cflags-cross-$CROSS_NAME
cp Cross/cflags-cross-$CROSS_NAME .
rm Makefile-cross-$CROSS_NAME
-sh Cross/Makefile-cross-SH
+CROSS_NAME=$CROSS_NAME sh Makefile.SH
cp Cross/Makefile-cross-$CROSS_NAME .
mkdir xlib
@@ -67,8 +67,21 @@
#??OBJ_EXT=.${CROSS_NAME}o
# TODO these -- AR=${CCPREF}ar LD=${CCPREF}ld
-make -f Makefile-cross-$CROSS_NAME xconfig.h
-make -f Makefile-cross-$CROSS_NAME libperl.${CROSS_NAME}a OBJ_EXT=.${CROSS_NAME}o \
EXE_EXT=.$CROSS_NAME LIB_EXT=.${CROSS_NAME}a AR=${CCPREF}ar \
LD=${CCPREF}ld
-make -f Makefile-cross-$CROSS_NAME DynaLoader.${CROSS_NAME}o \
OBJ_EXT=.${CROSS_NAME}o EXE_EXT=.$CROSS_NAME LIB_EXT=.${CROSS_NAME}a AR=${CCPREF}ar \
LD=${CCPREF}ld
-make -f Makefile-cross-$CROSS_NAME perl.${CROSS_NAME}
+cmd="make -f Makefile-cross-$CROSS_NAME xconfig.h"
+echo "running $cmd"
+$cmd
+
+echo "running $cmd"
+cmd="make -f Makefile-cross-$CROSS_NAME libperl.${CROSS_NAME}a \
OBJ_EXT=.${CROSS_NAME}o EXE_EXT=.$CROSS_NAME LIB_EXT=.${CROSS_NAME}a AR=${CCPREF}ar \
LD=${CCPREF}ld" +$cmd
+
+exit
+
+cmd="make -f Makefile-cross-$CROSS_NAME DynaLoader.${CROSS_NAME}o \
OBJ_EXT=.${CROSS_NAME}o EXE_EXT=.$CROSS_NAME LIB_EXT=.${CROSS_NAME}a AR=${CCPREF}ar \
LD=${CCPREF}ld" +echo "running $cmd"
+$cmd
+
+cmd="make -f Makefile-cross-$CROSS_NAME perl.${CROSS_NAME}"
+echo "running $cmd"
+$cmd
==== //depot/maint-5.10/perl/Cross/cflags-cross-arm#2 (xtext) ====
Index: perl/Cross/cflags-cross-arm
--- perl/Cross/cflags-cross-arm#1~32694~ 2007-12-22 01:23:09.000000000 -0800
+++ perl/Cross/cflags-cross-arm 2008-12-15 14:54:40.000000000 -0800
@@ -149,7 +149,7 @@
fi
: Can we perhaps use $ansi2knr here
- echo "$CROSSCC -c -DPERL_CORE $ccflags $stdflags $optimize $warn $extra"
+ echo "$CROSSCC -c -DUSE_CROSS_COMPILE -DPERL_CORE $ccflags $stdflags $optimize \
$warn $extra"
eval "$also "'"$CROSSCC -DUSE_CROSS_COMPILE -DPERL_CORE -c $ccflags $stdflags \
$optimize $warn $extra"'
. $TOP/Cross/config-arm.sh
==== //depot/maint-5.10/perl/Cross/config.sh-arm-linux#7 (text) ====
Index: perl/Cross/config.sh-arm-linux
--- perl/Cross/config.sh-arm-linux#6~33955~ 2008-05-30 18:54:46.000000000 -0700
+++ perl/Cross/config.sh-arm-linux 2008-12-15 14:54:40.000000000 -0800
@@ -483,6 +483,7 @@
d_telldir='define'
d_telldirproto='define'
d_time='define'
+d_timegm='define'
d_times='define'
d_tm_tm_gmtoff='define'
d_tm_tm_zone='define'
==== //depot/maint-5.10/perl/Cross/config.sh-arm-linux-n770#2 (text) ====
Index: perl/Cross/config.sh-arm-linux-n770
--- perl/Cross/config.sh-arm-linux-n770#1~32694~ 2007-12-22 01:23:09.000000000 -0800
+++ perl/Cross/config.sh-arm-linux-n770 2008-12-15 14:54:40.000000000 -0800
@@ -483,6 +483,7 @@
d_telldir='define'
d_telldirproto='define'
d_time='define'
+d_timegm='define'
d_times='define'
d_tm_tm_gmtoff='define'
d_tm_tm_zone='define'
@@ -611,6 +612,7 @@
i8size='1'
i8type='char'
i_arpainet='define'
+i_assert='define'
i_bsdioctl=''
i_crypt='define'
i_db='undef'
@@ -623,6 +625,8 @@
i_fp='undef'
i_fp_class='undef'
i_gdbm='undef'
+i_gdbm_ndbm='undef'
+i_gdbmndbm='undef'
i_grp='define'
i_ieeefp='undef'
i_inttypes='define'
@@ -632,6 +636,7 @@
i_locale='define'
i_machcthr='undef'
i_malloc='define'
+i_mallocmalloc='undef'
i_math='define'
i_memory='undef'
i_mntent='define'
@@ -665,6 +670,7 @@
i_sysmode='undef'
i_sysmount='define'
i_sysndir='undef'
+i_syspoll='define'
i_sysparam='define'
i_sysresrc='define'
i_syssecrt='undef'
@@ -806,6 +812,7 @@
nvFUformat='"F"'
nvGUformat='"G"'
nv_preserves_uv_bits='32'
+nv_overflows_integers_at='256.0*256.0*256.0*256.0*256.0*256.0*2.0*2.0*2.0*2.0*2.0'
nveformat='"e"'
nvfformat='"f"'
nvgformat='"g"'
@@ -984,6 +991,7 @@
use64bitint='undef'
usecrosscompile='undef'
usedl='define'
+usedtrace='undef'
usefaststdio='define'
useithreads='undef'
uselargefiles='define'
==== //depot/maint-5.10/perl/Makefile.SH#12 (text) ====
Index: perl/Makefile.SH
--- perl/Makefile.SH#11~35062~ 2008-12-09 07:35:03.000000000 -0800
+++ perl/Makefile.SH 2008-12-15 14:54:40.000000000 -0800
@@ -10,6 +10,17 @@
;;
esac
+case $CROSS_NAME in
+'')
+ Makefile=Makefile
+ ;;
+*)
+ # if cross-compilation, the Makefile named accordingly
+ Makefile=Makefile-cross-$CROSS_NAME
+ . Cross/config-${CROSS_NAME}.sh
+ ;;
+esac
+
# H.Merijn Brand [17 Feb 2004]
# This comment is just to ensure that Configure will find variables that
# are removed/replaced in patches on blead, but are still needed in the
@@ -211,9 +222,9 @@
;;
esac
-echo "Extracting Makefile (with variable substitutions)"
-$spitshell >Makefile <<!GROK!THIS!
-# Makefile.SH
+echo "Extracting $Makefile (with variable substitutions)"
+$spitshell >$Makefile <<!GROK!THIS!
+# $Makefile
# This file is derived from Makefile.SH. Any changes made here will
# be lost the next time you run Configure.
# Makefile is used to generate $firstmakefile. The only difference
@@ -274,6 +285,15 @@
# Sometimes running an executable is an adventure.
RUN = $run
+# These variables may need to be manually set for non-Unix systems.
+AR = $full_ar
+HOST_EXE_EXT =
+EXE_EXT = $_exe
+LIB_EXT = $_a
+OBJ_EXT = $_o
+PATH_SEP = $p_
+
+#
dynamic_ext = $dynamic_list
static_ext = $static_list
nonxs_ext = $nonxs_list
@@ -292,13 +312,6 @@
# Mention $gmake here so it gets probed for by Configure.
-# These variables may need to be manually set for non-Unix systems.
-AR = $full_ar
-EXE_EXT = $_exe
-LIB_EXT = $_a
-OBJ_EXT = $_o
-PATH_SEP = $p_
-
# If you're going to use valgrind and it can't be invoked as plain valgrind
# then you'll need to change this, or override it on the make command line.
VALGRIND=valgrind
@@ -334,7 +347,7 @@
case "${osname}:${osvers}" in
darwin:*)
-$spitshell >>Makefile <<EOF
+$spitshell >>$Makefile <<EOF
# Your locales are broken (osname $osname, osvers $osvers)
# and to avoid the numerous
@@ -348,15 +361,48 @@
;;
esac
+case $CROSS_NAME in
+'')
## In the following dollars and backticks do not need the extra backslash.
-$spitshell >>Makefile <<'!NO!SUBS!'
+$spitshell >>$Makefile <<'!NO!SUBS!'
CCCMD = `sh $(shellflags) cflags "optimize='$(OPTIMIZE)'" $@`
CCCMDSRC = `sh $(shellflags) cflags "optimize='$(OPTIMIZE)'" $<`
CONFIGPM = lib/Config.pm lib/Config_heavy.pl
-private = preplibrary $(CONFIGPM) lib/Config.pod lib/ExtUtils/Miniperl.pm
+
+CONFIGPOD = lib/Config.pod
+
+CONFIGH = config.h
+!NO!SUBS!
+ ;;
+*)
+ # if cross-compilation
+$spitshell >>$Makefile <<!GROK!THIS!
+CROSS_NAME = $CROSS_NAME
+CROSS_LIB = xlib/$CROSS_NAME
+
+CCCMD = \`sh \$(shellflags) cflags-cross-$CROSS_NAME "optimize='\$(OPTIMIZE)'" \
\$@\` -I\$(CROSS_LIB) +CCCMDSRC = \`sh \$(shellflags) cflags-cross-$CROSS_NAME \
"optimize='\$(OPTIMIZE)'" \$<\` -I\$(CROSS_LIB) +CONFIGPM = \
xlib/\$(CROSS_NAME)/Config.pm +CONFIGPOD = xlib/\$(CROSS_NAME)/Config.pod
+CONFIGH = xconfig.h
+
+xconfig.h: config_h.SH Cross/config-\$(CROSS_NAME).sh
+ CONFIG_SH=Cross/config-\$(CROSS_NAME).sh CONFIG_H=xconfig.h \$(SHELL) config_h.SH
+ #TODO \$(LDLIBPTH) ./miniperl -Ilib -MCross=\$(CROSS_NAME) config_h.PL \
"INST_VER=\$(INST_VER)" "CORE_DIR=\$(CROSS_LIB)" "CONFIG_H=xconfig.h" + cp xconfig.h \
\$(CROSS_LIB)/ + cp xconfig.h \$(CROSS_LIB)/config.h
+
+!GROK!THIS!
+ ;;
+esac
+
+## In the following dollars and backticks do not need the extra backslash.
+$spitshell >>$Makefile <<'!NO!SUBS!'
+
+private = preplibrary $(CONFIGPM) $(CONFIGPOD) lib/ExtUtils/Miniperl.pm
# Files to be built with variable substitution before miniperl
# is available.
@@ -386,7 +432,7 @@
# Directories of Unicode data files generated by mktables
unidatadirs = lib/unicore/To lib/unicore/lib
-h1 = EXTERN.h INTERN.h XSUB.h av.h config.h cop.h cv.h dosish.h
+h1 = EXTERN.h INTERN.h XSUB.h av.h $(CONFIGH) cop.h cv.h dosish.h
h2 = embed.h form.h gv.h handy.h hv.h keywords.h mg.h op.h opcode.h
h3 = pad.h patchlevel.h perl.h perlapi.h perly.h pp.h proto.h regcomp.h
h4 = regexp.h scope.h sv.h unixish.h util.h iperlsys.h thread.h
@@ -506,7 +552,7 @@
FORCE:
@sh -c true
!NO!SUBS!
-$spitshell >>Makefile <<!GROK!THIS!
+$spitshell >>$Makefile <<!GROK!THIS!
# We do a copy of the op.c instead of a symlink because gcc gets huffy
# if we have a symlink forest to another disk (it complains about too many
@@ -521,14 +567,14 @@
globals\$(OBJ_EXT): uudmap.h
-uudmap.h: generate_uudmap\$(EXE_EXT)
- \$(RUN) ./generate_uudmap\$(EXE_EXT) >uudmap.h
+uudmap.h: generate_uudmap\$(HOST_EXE_EXT)
+ \$(RUN) ./generate_uudmap\$(HOST_EXE_EXT) >uudmap.h
-generate_uudmap\$(EXE_EXT): generate_uudmap\$(OBJ_EXT)
- \$(CC) -o generate_uudmap \$(LDFLAGS) generate_uudmap\$(OBJ_EXT) \$(libs)
+generate_uudmap\$(HOST_EXE_EXT): generate_uudmap\$(OBJ_EXT)
+ \$(CC) -o generate_uudmap\$(EXE_EXT) \$(LDFLAGS) generate_uudmap\$(OBJ_EXT) \
\$(libs)
!GROK!THIS!
-$spitshell >>Makefile <<'!NO!SUBS!'
+$spitshell >>$Makefile <<'!NO!SUBS!'
miniperlmain$(OBJ_EXT): miniperlmain.c patchlevel.h
$(CCCMD) $(PLDLFLAGS) $*.c
@@ -566,7 +612,7 @@
case "$osname" in
aix)
- $spitshell >>Makefile <<!GROK!THIS!
+ $spitshell >>$Makefile <<!GROK!THIS!
LIBS = $perllibs
# In AIX we need to change this for building Perl itself from
# its earlier definition (which is for building external
@@ -576,7 +622,7 @@
!GROK!THIS!
case "$useshrplib" in
define|true|[yY]*)
- $spitshell >>Makefile <<'!NO!SUBS!'
+ $spitshell >>$Makefile <<'!NO!SUBS!'
LIBPERL_NONSHR = libperl_nonshr$(LIB_EXT)
MINIPERL_NONSHR = miniperl_nonshr$(EXE_EXT)
@@ -597,7 +643,7 @@
;;
*)
- $spitshell >>Makefile <<'!NO!SUBS!'
+ $spitshell >>$Makefile <<'!NO!SUBS!'
MINIPERLEXP = miniperl$(EXE_EXT)
PERLEXPORT = perl.exp
@@ -605,33 +651,35 @@
!NO!SUBS!
;;
esac
- $spitshell >>Makefile <<'!NO!SUBS!'
+ $spitshell >>$Makefile <<'!NO!SUBS!'
perl.exp: $(MINIPERLEXP) makedef.pl config.sh $(SYM) $(SYMH)
./$(MINIPERLEXP) makedef.pl PLATFORM=aix CC_FLAGS="$(OPTIMIZE)" | sort -u | sort -f \
> perl.exp
!NO!SUBS!
;;
os2)
- $spitshell >>Makefile <<'!NO!SUBS!'
+ $spitshell >>$Makefile <<'!NO!SUBS!'
MINIPERLEXP = miniperl
perl5.def: $(MINIPERLEXP) makedef.pl config.sh $(SYM) $(SYMH) miniperl.map
./$(MINIPERLEXP) makedef.pl PLATFORM=os2 -DPERL_DLL=$(PERL_DLL) \
CC_FLAGS="$(OPTIMIZE)" > perl5.def
!NO!SUBS!
+# XXX for 5.10.x, if merging #34200, s/Makefile/\$Makefile/ in the
+# chunk that goes below (dropped from #34306)
;;
esac
if test -r $Makefile_s ; then
. $Makefile_s
- $spitshell >>Makefile <<!GROK!THIS!
+ $spitshell >>$Makefile <<!GROK!THIS!
Makefile: $Makefile_s
!GROK!THIS!
else
case "$dtrace_h" in
?*)
- $spitshell >>Makefile <<'!NO!SUBS!'
+ $spitshell >>$Makefile <<'!NO!SUBS!'
$(DTRACE_H): perldtrace.d
$(DTRACE) -h -s perldtrace.d -o $(DTRACE_H)
@@ -642,25 +690,25 @@
esac
case "$dtrace_o" in
?*)
- $spitshell >>Makefile <<'!NO!SUBS!'
+ $spitshell >>$Makefile <<'!NO!SUBS!'
$(DTRACE_O): perldtrace.d
$(DTRACE) -G -s perldtrace.d -o $(DTRACE_O) $(ndt_obj)
!NO!SUBS!
;;
esac
- $spitshell >>Makefile <<'!NO!SUBS!'
+ $spitshell >>$Makefile <<'!NO!SUBS!'
$(LIBPERL): $& $(obj) $(DYNALOADER) $(LIBPERLEXPORT)
!NO!SUBS!
case "$useshrplib" in
true)
- $spitshell >>Makefile <<'!NO!SUBS!'
+ $spitshell >>$Makefile <<'!NO!SUBS!'
rm -f $@
$(LD) -o $@ $(SHRPLDFLAGS) $(obj) $(DYNALOADER) $(libs)
!NO!SUBS!
case "$osname" in
aix)
- $spitshell >>Makefile <<'!NO!SUBS!'
+ $spitshell >>$Makefile <<'!NO!SUBS!'
rm -f libperl$(OBJ_EXT)
mv $@ libperl$(OBJ_EXT)
$(AR) qv $(LIBPERL) libperl$(OBJ_EXT)
@@ -669,14 +717,14 @@
esac
;;
*)
- $spitshell >>Makefile <<'!NO!SUBS!'
+ $spitshell >>$Makefile <<'!NO!SUBS!'
rm -f $(LIBPERL)
$(AR) rcu $(LIBPERL) $(obj) $(DYNALOADER)
@$(ranlib) $(LIBPERL)
!NO!SUBS!
;;
esac
- $spitshell >>Makefile <<'!NO!SUBS!'
+ $spitshell >>$Makefile <<'!NO!SUBS!'
# How to build executables.
@@ -692,20 +740,20 @@
case "${osname}${osvers}" in
aix*|beos*)
- $spitshell >>Makefile <<'!NO!SUBS!'
-miniperl: $& miniperlmain$(OBJ_EXT) $(obj) opmini$(OBJ_EXT)
- $(CC) -o miniperl $(CLDFLAGS) \
+ $spitshell >>$Makefile <<'!NO!SUBS!'
+miniperl$(EXE_EXT): $& miniperlmain$(OBJ_EXT) $(obj) opmini$(OBJ_EXT)
+ $(CC) -o miniperl$(EXE_EXT) $(CLDFLAGS) \
`echo $(obj) | sed 's/ op$(OBJ_EXT) / /'` \
miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) $(libs)
- $(LDLIBPTH) $(RUN) ./miniperl -w -Ilib -MExporter -e '<?>' || $(MAKE) minitest
+ $(LDLIBPTH) $(RUN) ./miniperl$(HOST_EXE_EXT) -w -Ilib -MExporter -e '<?>' || \
$(MAKE) minitest
!NO!SUBS!
;;
next4*)
- $spitshell >>Makefile <<'!NO!SUBS!'
-miniperl: $& miniperlmain$(OBJ_EXT) $(obj) opmini$(OBJ_EXT)
- $(CC) -o miniperl `echo $(obj) | sed 's/ op$(OBJ_EXT) / /'` \
+ $spitshell >>$Makefile <<'!NO!SUBS!'
+miniperl$(EXE_EXT): $& miniperlmain$(OBJ_EXT) $(obj) opmini$(OBJ_EXT)
+ $(CC) -o miniperl$(EXE_EXT) `echo $(obj) | sed 's/ op$(OBJ_EXT) / /'` \
miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) $(libs)
- $(LDLIBPTH) $(RUN) ./miniperl -w -Ilib -MExporter -e '<?>' || $(MAKE) minitest
+ $(LDLIBPTH) $(RUN) ./miniperl$(HOST_EXE_EXT) -w -Ilib -MExporter -e '<?>' || \
$(MAKE) minitest
!NO!SUBS!
;;
darwin*)
@@ -714,35 +762,35 @@
*) case "$ldflags" in
*"-flat_namespace"*) ;;
*) # to allow opmini.o to override stuff in libperl.dylib
- $spitshell >>Makefile <<!NO!SUBS!
+ $spitshell >>$Makefile <<!NO!SUBS!
NAMESPACEFLAGS = -force_flat_namespace
!NO!SUBS!
;;
esac
;;
esac
- $spitshell >>Makefile <<'!NO!SUBS!'
+ $spitshell >>$Makefile <<'!NO!SUBS!'
miniperl$(EXE_EXT): $& miniperlmain$(OBJ_EXT) $(obj) opmini$(OBJ_EXT)
-@rm -f miniperl.xok
- $(CC) $(CLDFLAGS) $(NAMESPACEFLAGS) -o miniperl \
+ $(CC) $(CLDFLAGS) $(NAMESPACEFLAGS) -o miniperl$(EXE_EXT) \
`echo $(obj) | sed 's/ op$(OBJ_EXT) / /'` \
miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) $(libs)
- $(LDLIBPTH) $(RUN) ./miniperl -w -Ilib -MExporter -e '<?>' || $(MAKE) minitest
+ $(LDLIBPTH) $(RUN) ./miniperl$(HOST_EXE_EXT) -w -Ilib -MExporter -e '<?>' || \
$(MAKE) minitest
!NO!SUBS!
;;
*)
- $spitshell >>Makefile <<'!NO!SUBS!'
+ $spitshell >>$Makefile <<'!NO!SUBS!'
miniperl$(EXE_EXT): $& miniperlmain$(OBJ_EXT) $(obj) opmini$(OBJ_EXT)
-@rm -f miniperl.xok
- $(LDLIBPTH) $(CC) $(CLDFLAGS) -o miniperl \
+ $(LDLIBPTH) $(CC) $(CLDFLAGS) -o miniperl$(EXE_EXT) \
`echo $(obj) | sed 's/ op$(OBJ_EXT) / /'` \
miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) $(libs)
- $(LDLIBPTH) $(RUN) ./miniperl -w -Ilib -MExporter -e '<?>' || $(MAKE) minitest
+ $(LDLIBPTH) $(RUN) ./miniperl$(HOST_EXE_EXT) -w -Ilib -MExporter -e '<?>' || \
$(MAKE) minitest
!NO!SUBS!
;;
esac
- $spitshell >>Makefile <<'!NO!SUBS!'
+ $spitshell >>$Makefile <<'!NO!SUBS!'
perl$(EXE_EXT): $& perlmain$(OBJ_EXT) $(LIBPERL) $(static_ext) ext.libs \
$(PERLEXPORT)
-@rm -f miniperl.xok
@@ -879,7 +927,7 @@
# Let's try running the commands with shell.
case "${osname}" in
catamount)
-$spitshell >>Makefile <<!GROK!THIS!
+$spitshell >>$Makefile <<!GROK!THIS!
.PHONY: makeppport
makeppport: miniperl\$(EXE_EXT) \$(CONFIGPM)
-@for f in Makefile.PL PPPort_pm.PL PPPort_xs.PL ppport_h.PL; do \
@@ -889,7 +937,7 @@
!GROK!THIS!
;;
*)
-$spitshell >>Makefile <<'!NO!SUBS!'
+$spitshell >>$Makefile <<'!NO!SUBS!'
.PHONY: makeppport
makeppport: miniperl$(EXE_EXT) $(CONFIGPM)
$(LDLIBPTH) $(RUN) ./miniperl$(EXE_EXT) -Ilib mkppport
@@ -898,7 +946,7 @@
;;
esac
-$spitshell >>Makefile <<'!NO!SUBS!'
+$spitshell >>$Makefile <<'!NO!SUBS!'
# We have to call our ./makedir because Ultrix 4.3 make can't handle the line
# test -d lib/auto || mkdir lib/auto
@@ -911,10 +959,10 @@
$(LDLIBPTH) $(RUN) ./miniperl -Ilib -MAutoSplit -MFile::Find -e 'find \
({no_chdir=>1, wanted => sub {autosplit_lib_modules($$_) if /\.pm$$/}}, "lib")' \
$(MAKE) lib/re.pm
-lib/Config.pod: config.sh miniperl$(EXE_EXT) configpm Porting/Glossary
+$(CONFIGPOD): config.sh miniperl$(EXE_EXT) configpm Porting/Glossary
$(LDLIBPTH) $(RUN) ./miniperl -Ilib configpm
-$(CONFIGPM): lib/Config.pod
+$(CONFIGPM): $(CONFIGPOD)
lib/ExtUtils/Miniperl.pm: miniperlmain.c miniperl$(EXE_EXT) minimod.pl $(CONFIGPM)
$(LDLIBPTH) $(RUN) ./miniperl minimod.pl > lib/ExtUtils/Miniperl.pm
@@ -1106,11 +1154,11 @@
@$(LDLIBPTH) sh ext/util/make_ext nonxs $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL)
!NO!SUBS!
-$spitshell >>Makefile <<EOF
+$spitshell >>$Makefile <<EOF
$extra_dep
EOF
-$spitshell >>Makefile <<'!NO!SUBS!'
+$spitshell >>$Makefile <<'!NO!SUBS!'
.PHONY: printconfig
printconfig:
End of Patch.
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic