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

--- ../Makefile.SH	2003-08-22 09:49:04.000000000 -0500
+++ Makefile.SH	2003-09-05 02:38:40.000000000 -0500
@@ -110,18 +110,7 @@
 	    # INSTALL file, under "Building a shared perl library".
 	    # If there is no pre-existing $libperl, we don't need
 	    # to do anything further.
-	    if test -f $archlib/CORE/$libperl; then
-		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"
-	    fi
+	    echo linux libraries overwritten by cross-compile patches
 	    ;;
 	os390)	test -f /bin/env && ldlibpth="/bin/env $ldlibpth"
 		;;
@@ -349,9 +338,21 @@
 .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
 
@@ -361,10 +362,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
 
 
@@ -541,7 +542,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*)
@@ -549,7 +550,7 @@
 miniperl: $& miniperlmain$(OBJ_EXT) $(LIBPERL) opmini$(OBJ_EXT)
 	$(CC) -o miniperl `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!
 		;;
 	darwin*)
@@ -716,7 +717,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; \
@@ -728,11 +729,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
@@ -740,18 +741,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 \
@@ -796,18 +797,7 @@
 INSTALL_DEPENDENCE = all

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