[p5sagit/p5-mst-13.2.git] / Cross / Makefile.SH.patch

--- ../Makefile.SH	2003-04-22 14:13:52.000000000 +0000
+++ Makefile.SH	2003-05-27 21:07:07.000000000 +0000
@@ -104,16 +104,17 @@
 
 	case "$osname" in
 	linux)
-		rm -f preload
-		cat <<-'EOT' > preload
-		#! /bin/sh
-		lib=$1
-		shift
-		test -r $lib && export LD_PRELOAD="$lib $LD_PRELOAD"
-		exec "$@"
-		EOT
-		chmod 755 preload
-		ldlibpth="$ldlibpth `pwd`/preload `pwd`/$libperl"
+#		rm -f preload
+#		cat <<-'EOT' > preload
+#		#! /bin/sh
+#		lib=$1
+#		shift
+#		test -r $lib && export LD_PRELOAD="$lib $LD_PRELOAD"
+#		exec "$@"
+#		EOT
+#		chmod 755 preload
+#		ldlibpth="$ldlibpth `pwd`/preload `pwd`/$libperl"
+		echo linux libraries overridden my cross-compile patches
 		;;
 	os390)	test -f /bin/env && ldlibpth="/bin/env $ldlibpth"
 		;;
@@ -343,9 +344,20 @@
 .c.s:
 	$(CCCMDSRC) -S $*.c
 
-all: $(FIRSTMAKEFILE) miniperl$(EXE_EXT) extra.pods $(private) $(public) $(dynamic_ext) $(nonxs_ext) extras.make
-	@echo " ";
-	@echo "	Everything is up to date. Type '$(MAKE) test' to run test suite."
+#all: $(FIRSTMAKEFILE) miniperl$(EXE_EXT) extra.pods $(private) $(public) $(dynamic_ext) $(nonxs_ext) extras.make
+#	@echo " ";
+#	@echo "	Everything is up to date. Type '$(MAKE) test' to run test suite."
+all: $(FIRSTMAKEFILE) miniperl$(EXE_EXT)
+	mv miniperl miniperl-arm
+	ln -s /usr/bin/perl miniperl
+
+more: extra.pods $(private) $(public)
+
+more2: $(dynamic_ext)
+
+more3: $(nonxs_ext)
+
+more4: extras.make 
 
 .PHONY: all compile translators utilities
 
@@ -355,10 +367,10 @@
 	cd x2p; $(MAKE) compile;
 	cd pod; $(MAKE) compile;
 
-translators:	miniperl$(EXE_EXT) lib/Config.pm FORCE
+translators:	lib/Config.pm FORCE
 	@echo " "; echo "	Making x2p stuff"; cd x2p; $(LDLIBPTH) $(MAKE) all
 
-utilities:	miniperl$(EXE_EXT) lib/Config.pm $(plextract) lib/lib.pm FORCE
+utilities:	lib/Config.pm $(plextract) lib/lib.pm FORCE
 	@echo " "; echo "	Making utilities"; cd utils; $(LDLIBPTH) $(MAKE) all
 
 
@@ -535,7 +547,7 @@
 	$(CC) -o miniperl $(CLDFLAGS) \
 	    `echo $(obj) | sed 's/ op$(OBJ_EXT) / /'` \
 	    miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) perl$(OBJ_EXT) $(libs)
-	$(LDLIBPTH) ./miniperl -w -Ilib -MExporter -e '<?>' || $(MAKE) minitest
+#	$(LDLIBPTH) ./miniperl -w -Ilib -MExporter -e '<?>' || $(MAKE) minitest
 !NO!SUBS!
 		;;
 	beos*|next4*)
@@ -552,7 +564,7 @@
 	-@rm -f miniperl.xok
 	$(CC) $(CLDFLAGS) -o miniperl \
 	    miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) $(LLIBPERL) $(libs)
-	$(LDLIBPTH) ./miniperl -w -Ilib -MExporter -e '<?>' || $(MAKE) minitest
+#	$(LDLIBPTH) ./miniperl -w -Ilib -MExporter -e '<?>' || $(MAKE) minitest
 !NO!SUBS!
 		;;
 	esac
@@ -678,7 +690,7 @@
 # We need to autosplit in two steps because VOS can't handle so many args
 #
 .PHONY: preplibrary
-preplibrary: miniperl$(EXE_EXT) lib/Config.pm lib/lib.pm $(PREPLIBRARY_LIBPERL)
+preplibrary: lib/Config.pm lib/lib.pm $(PREPLIBRARY_LIBPERL)
 	@sh ./makedir lib/auto
 	@echo "	AutoSplitting perl library"
 	$(LDLIBPTH) ./miniperl -Ilib -e 'use AutoSplit; \
@@ -690,11 +702,11 @@
 # Take care to avoid modifying lib/Config.pm without reason
 # (If trying to create a new port and having problems with the configpm script,
 # try 'make minitest' and/or commenting out the tests at the end of configpm.)
-lib/Config.pm: config.sh miniperl$(EXE_EXT) configpm Porting/Glossary
+lib/Config.pm: config.sh configpm Porting/Glossary
 	$(LDLIBPTH) ./miniperl -Ilib configpm configpm.tmp
 	sh mv-if-diff configpm.tmp $@
 
-lib/ExtUtils/Miniperl.pm: miniperlmain.c miniperl$(EXE_EXT) minimod.pl lib/Config.pm
+lib/ExtUtils/Miniperl.pm: miniperlmain.c minimod.pl lib/Config.pm
 	$(LDLIBPTH) ./miniperl minimod.pl > minimod.tmp
 	sh mv-if-diff minimod.tmp $@
 	-touch lib/ExtUtils/Miniperl.pm
@@ -702,18 +714,18 @@
 lib/re.pm: ext/re/re.pm
 	cp ext/re/re.pm ext/re/re.tmp && sh mv-if-diff ext/re/re.tmp lib/re.pm
 
-$(plextract):	miniperl$(EXE_EXT) lib/Config.pm x2p/s2p
+$(plextract):	lib/Config.pm x2p/s2p
 	@-rm -f $@
 	$(LDLIBPTH) ./miniperl -Ilib $@.PL
 
-x2p/s2p: miniperl$(EXE_EXT) lib/Config.pm x2p/s2p.PL
+x2p/s2p: lib/Config.pm x2p/s2p.PL
 	cd x2p; $(LDLIBPTH) $(MAKE) s2p
 
-lib/lib.pm:	miniperl$(EXE_EXT) lib/Config.pm
+lib/lib.pm:	lib/Config.pm
 	@-rm -f $@
 	$(LDLIBPTH) ./miniperl -Ilib lib/lib_pm.PL
 
-extra.pods: miniperl$(EXE_EXT)
+extra.pods:
 	-@test -f extra.pods && rm -f `cat extra.pods`
 	-@rm -f extra.pods
 	-@for x in `grep -l '^=[a-z]' README.* | grep -v README.vms` ; do \
@@ -752,18 +764,10 @@
 	$(MAKE) install.perl install.man STRIPFLAGS=$(STRIPFLAGS) INSTALLFLAGS=-n
 
 install.perl:	all installperl
-	if [ -n "$(COMPILE)" ]; \
-	then \
-		cd utils; $(MAKE) compile; \
-		cd ../x2p; $(MAKE) compile; \
-		cd ../pod; $(MAKE) compile; \
-	else :; \
-	fi
-	$(LDLIBPTH) ./perl installperl $(INSTALLFLAGS) $(STRIPFLAGS)
-	$(MAKE) extras.install
+	/usr/bin/perl -Ifake_config_library -MConfig installperl $(INSTALLFLAGS) $(STRIPFLAGS)
 
-install.man:	all installman
-	$(LDLIBPTH) ./perl installman $(INSTALLFLAGS)
+install.man:	installman
+	/usr/bin/perl -Ifake_config_library -MConfig installman $(INSTALLFLAGS)
 
 # XXX Experimental. Hardwired values, but useful for testing.
 # Eventually Configure could ask for some of these values.
@@ -870,16 +874,16 @@
 #
 # DynaLoader may be needed for extensions that use Makefile.PL.
 
-$(DYNALOADER):	miniperl$(EXE_EXT) preplibrary FORCE
+$(DYNALOADER):	preplibrary FORCE
 	@$(LDLIBPTH) sh ext/util/make_ext $(STATIC) $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL)
 
-d_dummy $(dynamic_ext):	miniperl$(EXE_EXT) preplibrary $(DYNALOADER) FORCE
+d_dummy $(dynamic_ext):	preplibrary $(DYNALOADER) FORCE
 	@$(LDLIBPTH) sh ext/util/make_ext dynamic $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL)
 
-s_dummy $(static_ext):	miniperl$(EXE_EXT) preplibrary $(DYNALOADER) FORCE
+s_dummy $(static_ext):	preplibrary $(DYNALOADER) FORCE
 	@$(LDLIBPTH) sh ext/util/make_ext $(STATIC) $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL)
 
-n_dummy $(nonxs_ext):	miniperl$(EXE_EXT) preplibrary $(DYNALOADER) FORCE
+n_dummy $(nonxs_ext):	 preplibrary $(DYNALOADER) FORCE
 	@$(LDLIBPTH) sh ext/util/make_ext nonxs $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL)
 
 .PHONY: clean _tidy _mopup _cleaner1 _cleaner2 \
@@ -1019,7 +1023,7 @@
 
 test_prep_pre: preplibrary utilities $(nonxs_ext)
 
-test_prep: test_prep_pre miniperl$(EXE_EXT) perl$(EXE_EXT) $(dynamic_ext) $(TEST_PERL_DLL)
+test_prep: test_prep_pre perl$(EXE_EXT) $(dynamic_ext) $(TEST_PERL_DLL)
 	PERL=./perl $(MAKE) _test_prep
 
 _test_tty:
@@ -1088,7 +1092,7 @@
 
 # Can't depend on lib/Config.pm because that might be where miniperl
 # is crashing.
-minitest: miniperl$(EXE_EXT) lib/re.pm
+minitest: lib/re.pm
 	-@test -f lib/lib.pm && test -f lib/Config.pm || \
 	  $(MAKE) lib/Config.pm lib/lib.pm
 	@echo " "
Commit	Line	Data
e42fa77b	1	--- ../Makefile.SH 2003-04-22 14:13:52.000000000 +0000
	2	+++ Makefile.SH 2003-05-27 21:07:07.000000000 +0000
	3	@@ -104,16 +104,17 @@
	4
	5	case "$osname" in
	6	linux)
	7	- rm -f preload
	8	- cat <<-'EOT' > preload
	9	- #! /bin/sh
	10	- lib=$1
	11	- shift
	12	- test -r $lib && export LD_PRELOAD="$lib $LD_PRELOAD"
	13	- exec "$@"
	14	- EOT
	15	- chmod 755 preload
	16	- ldlibpth="$ldlibpth `pwd`/preload `pwd`/$libperl"
	17	+# rm -f preload
	18	+# cat <<-'EOT' > preload
	19	+# #! /bin/sh
	20	+# lib=$1
	21	+# shift
	22	+# test -r $lib && export LD_PRELOAD="$lib $LD_PRELOAD"
	23	+# exec "$@"
	24	+# EOT
	25	+# chmod 755 preload
	26	+# ldlibpth="$ldlibpth `pwd`/preload `pwd`/$libperl"
	27	+ echo linux libraries overridden my cross-compile patches
	28	;;
	29	os390) test -f /bin/env && ldlibpth="/bin/env $ldlibpth"
	30	;;
	31	@@ -343,9 +344,20 @@
6a809565	32	.c.s:
	33	$(CCCMDSRC) -S $*.c
	34
	35	-all: $(FIRSTMAKEFILE) miniperl$(EXE_EXT) extra.pods $(private) $(public) $(dynamic_ext) $(nonxs_ext) extras.make
	36	- @echo " ";
	37	- @echo " Everything is up to date. Type '$(MAKE) test' to run test suite."
	38	+#all: $(FIRSTMAKEFILE) miniperl$(EXE_EXT) extra.pods $(private) $(public) $(dynamic_ext) $(nonxs_ext) extras.make
	39	+# @echo " ";
	40	+# @echo " Everything is up to date. Type '$(MAKE) test' to run test suite."
	41	+all: $(FIRSTMAKEFILE) miniperl$(EXE_EXT)
	42	+ mv miniperl miniperl-arm
	43	+ ln -s /usr/bin/perl miniperl
	44	+
	45	+more: extra.pods $(private) $(public)
	46	+
	47	+more2: $(dynamic_ext)
	48	+
	49	+more3: $(nonxs_ext)
	50	+
	51	+more4: extras.make
	52
	53	.PHONY: all compile translators utilities
	54
e42fa77b	55	@@ -355,10 +367,10 @@
6a809565	56	cd x2p; $(MAKE) compile;
	57	cd pod; $(MAKE) compile;
	58
	59	-translators: miniperl$(EXE_EXT) lib/Config.pm FORCE
	60	+translators: lib/Config.pm FORCE
	61	@echo " "; echo " Making x2p stuff"; cd x2p; $(LDLIBPTH) $(MAKE) all
	62
	63	-utilities: miniperl$(EXE_EXT) lib/Config.pm $(plextract) lib/lib.pm FORCE
	64	+utilities: lib/Config.pm $(plextract) lib/lib.pm FORCE
	65	@echo " "; echo " Making utilities"; cd utils; $(LDLIBPTH) $(MAKE) all
	66
	67
e42fa77b	68	@@ -535,7 +547,7 @@
6a809565	69	$(CC) -o miniperl $(CLDFLAGS) \
	70	`echo $(obj) \| sed 's/ op$(OBJ_EXT) / /'` \
	71	miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) perl$(OBJ_EXT) $(libs)
	72	- $(LDLIBPTH) ./miniperl -w -Ilib -MExporter -e '<?>' \|\| $(MAKE) minitest
	73	+# $(LDLIBPTH) ./miniperl -w -Ilib -MExporter -e '<?>' \|\| $(MAKE) minitest
	74	!NO!SUBS!
	75	;;
	76	beos\|next4)
e42fa77b	77	@@ -552,7 +564,7 @@
6a809565	78	-@rm -f miniperl.xok
e42fa77b	79	$(CC) $(CLDFLAGS) -o miniperl \
6a809565	80	miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) $(LLIBPERL) $(libs)
	81	- $(LDLIBPTH) ./miniperl -w -Ilib -MExporter -e '<?>' \|\| $(MAKE) minitest
	82	+# $(LDLIBPTH) ./miniperl -w -Ilib -MExporter -e '<?>' \|\| $(MAKE) minitest
	83	!NO!SUBS!
	84	;;
	85	esac
e42fa77b	86	@@ -678,7 +690,7 @@
6a809565	87	# We need to autosplit in two steps because VOS can't handle so many args
	88	#
	89	.PHONY: preplibrary
	90	-preplibrary: miniperl$(EXE_EXT) lib/Config.pm lib/lib.pm $(PREPLIBRARY_LIBPERL)
	91	+preplibrary: lib/Config.pm lib/lib.pm $(PREPLIBRARY_LIBPERL)
	92	@sh ./makedir lib/auto
	93	@echo " AutoSplitting perl library"
	94	$(LDLIBPTH) ./miniperl -Ilib -e 'use AutoSplit; \
e42fa77b	95	@@ -690,11 +702,11 @@
6a809565	96	# Take care to avoid modifying lib/Config.pm without reason
	97	# (If trying to create a new port and having problems with the configpm script,
	98	# try 'make minitest' and/or commenting out the tests at the end of configpm.)
	99	-lib/Config.pm: config.sh miniperl$(EXE_EXT) configpm Porting/Glossary
	100	+lib/Config.pm: config.sh configpm Porting/Glossary
	101	$(LDLIBPTH) ./miniperl -Ilib configpm configpm.tmp
	102	sh mv-if-diff configpm.tmp $@
	103
	104	-lib/ExtUtils/Miniperl.pm: miniperlmain.c miniperl$(EXE_EXT) minimod.pl lib/Config.pm
	105	+lib/ExtUtils/Miniperl.pm: miniperlmain.c minimod.pl lib/Config.pm
	106	$(LDLIBPTH) ./miniperl minimod.pl > minimod.tmp
	107	sh mv-if-diff minimod.tmp $@
	108	-touch lib/ExtUtils/Miniperl.pm
e42fa77b	109	@@ -702,18 +714,18 @@
6a809565	110	lib/re.pm: ext/re/re.pm
	111	cp ext/re/re.pm ext/re/re.tmp && sh mv-if-diff ext/re/re.tmp lib/re.pm
	112
	113	-$(plextract): miniperl$(EXE_EXT) lib/Config.pm x2p/s2p
	114	+$(plextract): lib/Config.pm x2p/s2p
	115	@-rm -f $@
	116	$(LDLIBPTH) ./miniperl -Ilib $@.PL
	117
	118	-x2p/s2p: miniperl$(EXE_EXT) lib/Config.pm x2p/s2p.PL
	119	+x2p/s2p: lib/Config.pm x2p/s2p.PL
	120	cd x2p; $(LDLIBPTH) $(MAKE) s2p
	121
	122	-lib/lib.pm: miniperl$(EXE_EXT) lib/Config.pm
	123	+lib/lib.pm: lib/Config.pm
	124	@-rm -f $@
	125	$(LDLIBPTH) ./miniperl -Ilib lib/lib_pm.PL
	126
	127	-extra.pods: miniperl$(EXE_EXT)
	128	+extra.pods:
	129	-@test -f extra.pods && rm -f `cat extra.pods`
	130	-@rm -f extra.pods
	131	-@for x in `grep -l '^=[a-z]' README.* \| grep -v README.vms` ; do \
e42fa77b	132	@@ -752,18 +764,10 @@
6a809565	133	$(MAKE) install.perl install.man STRIPFLAGS=$(STRIPFLAGS) INSTALLFLAGS=-n
	134
	135	install.perl: all installperl
	136	- if [ -n "$(COMPILE)" ]; \
	137	- then \
	138	- cd utils; $(MAKE) compile; \
	139	- cd ../x2p; $(MAKE) compile; \
	140	- cd ../pod; $(MAKE) compile; \
	141	- else :; \
	142	- fi
	143	- $(LDLIBPTH) ./perl installperl $(INSTALLFLAGS) $(STRIPFLAGS)
	144	- $(MAKE) extras.install
	145	+ /usr/bin/perl -Ifake_config_library -MConfig installperl $(INSTALLFLAGS) $(STRIPFLAGS)
	146
	147	-install.man: all installman
	148	- $(LDLIBPTH) ./perl installman $(INSTALLFLAGS)
	149	+install.man: installman
	150	+ /usr/bin/perl -Ifake_config_library -MConfig installman $(INSTALLFLAGS)
	151
	152	# XXX Experimental. Hardwired values, but useful for testing.
	153	# Eventually Configure could ask for some of these values.
e42fa77b	154	@@ -870,16 +874,16 @@
6a809565	155	#
	156	# DynaLoader may be needed for extensions that use Makefile.PL.
	157
	158	-$(DYNALOADER): miniperl$(EXE_EXT) preplibrary FORCE
	159	+$(DYNALOADER): preplibrary FORCE
	160	@$(LDLIBPTH) sh ext/util/make_ext $(STATIC) $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL)
	161
	162	-d_dummy $(dynamic_ext): miniperl$(EXE_EXT) preplibrary $(DYNALOADER) FORCE
	163	+d_dummy $(dynamic_ext): preplibrary $(DYNALOADER) FORCE
	164	@$(LDLIBPTH) sh ext/util/make_ext dynamic $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL)
	165
	166	-s_dummy $(static_ext): miniperl$(EXE_EXT) preplibrary $(DYNALOADER) FORCE
	167	+s_dummy $(static_ext): preplibrary $(DYNALOADER) FORCE
	168	@$(LDLIBPTH) sh ext/util/make_ext $(STATIC) $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL)
	169
	170	-n_dummy $(nonxs_ext): miniperl$(EXE_EXT) preplibrary $(DYNALOADER) FORCE
	171	+n_dummy $(nonxs_ext): preplibrary $(DYNALOADER) FORCE
	172	@$(LDLIBPTH) sh ext/util/make_ext nonxs $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL)
	173
	174	.PHONY: clean _tidy _mopup _cleaner1 _cleaner2 \
e42fa77b	175	@@ -1019,7 +1023,7 @@
6a809565	176
	177	test_prep_pre: preplibrary utilities $(nonxs_ext)
	178
	179	-test_prep: test_prep_pre miniperl$(EXE_EXT) perl$(EXE_EXT) $(dynamic_ext) $(TEST_PERL_DLL)
	180	+test_prep: test_prep_pre perl$(EXE_EXT) $(dynamic_ext) $(TEST_PERL_DLL)
	181	PERL=./perl $(MAKE) _test_prep
	182
	183	_test_tty:
e42fa77b	184	@@ -1088,7 +1092,7 @@
6a809565	185
	186	# Can't depend on lib/Config.pm because that might be where miniperl
	187	# is crashing.
	188	-minitest: miniperl$(EXE_EXT) lib/re.pm
	189	+minitest: lib/re.pm
	190	-@test -f lib/lib.pm && test -f lib/Config.pm \|\| \
	191	$(MAKE) lib/Config.pm lib/lib.pm
	192	@echo " "