This is a live mirror of the Perl 5 development currently hosted at
https://github.com/perl/perl5
https://perl5.git.perl.org
/
perl5.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Larry's fix for buggy propagation of utf8-ness in join(); add test
[perl5.git]
/
Makefile.SH
diff --git
a/Makefile.SH
b/Makefile.SH
index
1646478
..
285269d
100644
(file)
--- a/
Makefile.SH
+++ b/
Makefile.SH
@@
-45,6
+45,14
@@
true)
-compatibility_version 1 -current_version $patchlevel \
-prebind -seg1addr 0x27000000 -install_name \$(shrpdir)/\$@"
;;
-compatibility_version 1 -current_version $patchlevel \
-prebind -seg1addr 0x27000000 -install_name \$(shrpdir)/\$@"
;;
+ rhapsody*|darwin*)
+ shrpldflags="${ldflags} -dynamiclib \
+ -compatibility_version 1 \
+ -current_version \
+ ${api_version}.${api_subversion} \
+ -image_base 0x4be00000 \
+ -install_name \$(shrpdir)/\$@"
+ ;;
cygwin*)
linklibperl="-lperl"
;;
cygwin*)
linklibperl="-lperl"
;;
@@
-76,9
+84,6
@@
true)
os2)
ldlibpth=''
;;
os2)
ldlibpth=''
;;
- rhapsody)
- eval "ldlibpth=\"$ldlibpthname=`pwd`/Perl:\$$ldlibpthname\""
- ;;
*)
eval "ldlibpth=\"$ldlibpthname=`pwd`:\$$ldlibpthname\""
;;
*)
eval "ldlibpth=\"$ldlibpthname=`pwd`:\$$ldlibpthname\""
;;
@@
-320,9
+325,6
@@
ext.libs: $(static_ext)
# How to build libperl. This is still rather convoluted.
# Load up custom Makefile.SH fragment for shared loading and executables:
case "$osname" in
# How to build libperl. This is still rather convoluted.
# Load up custom Makefile.SH fragment for shared loading and executables:
case "$osname" in
-cygwin*)
- Makefile_s="cygwin/Makefile.SHs"
- ;;
*)
Makefile_s="$osname/Makefile.SHs"
;;
*)
Makefile_s="$osname/Makefile.SHs"
;;
@@
-527,11
+529,15
@@
$(plextract): miniperl lib/Config.pm
extra.pods: miniperl
-@test -f extra.pods && rm -f `cat extra.pods`
-@rm -f extra.pods
extra.pods: miniperl
-@test -f extra.pods && rm -f `cat extra.pods`
-@rm -f extra.pods
- -@for x in `grep -l '^=[a-z]' README.*` ; do \
+ -@for x in `grep -l '^=[a-z]' README.*
| grep -v README.vms
` ; do \
nx=`echo $$x | sed -e "s/README\.//"`; \
$(LNS) ../$$x "pod/perl"$$nx".pod" ; \
echo "pod/perl"$$nx".pod" >> extra.pods ; \
done
nx=`echo $$x | sed -e "s/README\.//"`; \
$(LNS) ../$$x "pod/perl"$$nx".pod" ; \
echo "pod/perl"$$nx".pod" >> extra.pods ; \
done
+ -@test -f vms/perlvms.pod && $(LNS) ../vms/perlvms.pod pod/perlvms.pod && echo "pod/perlvms.pod" >> extra.pods
+
+install-strip:
+ $(MAKE) STRIPFLAGS=-s install
install: all install.perl install.man
install: all install.perl install.man
@@
-543,7
+549,7
@@
install.perl: all installperl
cd ../pod; $(MAKE) compile; \
else :; \
fi
cd ../pod; $(MAKE) compile; \
else :; \
fi
- $(LDLIBPTH) ./perl installperl
+ $(LDLIBPTH) ./perl installperl
$(STRIPFLAGS)
install.man: all installman
$(LDLIBPTH) ./perl installman
install.man: all installman
$(LDLIBPTH) ./perl installman
@@
-551,6
+557,7
@@
install.man: all installman
# XXX Experimental. Hardwired values, but useful for testing.
# Eventually Configure could ask for some of these values.
install.html: all installhtml
# XXX Experimental. Hardwired values, but useful for testing.
# Eventually Configure could ask for some of these values.
install.html: all installhtml
+ -@test -f README.vms && $(LNS) ../README.vms vms/README_vms.pod
$(LDLIBPTH) ./perl installhtml \
--podroot=. --podpath=. --recurse \
--htmldir=$(privlib)/html \
$(LDLIBPTH) ./perl installhtml \
--podroot=. --podpath=. --recurse \
--htmldir=$(privlib)/html \
@@
-612,20
+619,21
@@
CHMOD_W = chmod +w
# To force them to be regenerated, type
# make regen_headers
# To force them to be regenerated, type
# make regen_headers
-AUTOGEN_FILES = keywords.h opcode.h opnames.h pp_proto.h pp.sym embed.h \
- embedvar.h global.sym pod/perlintern.pod pod/perlapi.pod \
+AUTOGEN_FILES = keywords.h opcode.h opnames.h pp_proto.h pp.sym proto.h \
+ embed.h embedvar.h global.sym \
+ pod/perlintern.pod pod/perlapi.pod \
objXSUB.h perlapi.h perlapi.c ext/ByteLoader/byterun.h \
ext/ByteLoader/byterun.c ext/B/B/Asmdata.pm regnodes.h \
warnings.h lib/warnings.pm
regen_headers: FORCE
objXSUB.h perlapi.h perlapi.c ext/ByteLoader/byterun.h \
ext/ByteLoader/byterun.c ext/B/B/Asmdata.pm regnodes.h \
warnings.h lib/warnings.pm
regen_headers: FORCE
- $(CHMOD_W) $(AUTOGEN_FILES)
- perl keywords.pl
- perl opcode.pl
- perl embed.pl
- perl bytecode.pl
- perl regcomp.pl
- perl warnings.pl
+
-
$(CHMOD_W) $(AUTOGEN_FILES)
+
-
perl keywords.pl
+
-
perl opcode.pl
+
-
perl embed.pl
+
-
perl bytecode.pl
+
-
perl regcomp.pl
+
-
perl warnings.pl
# Extensions:
# Names added to $(dynamic_ext) or $(static_ext) or $(nonxs_ext) will
# Extensions:
# Names added to $(dynamic_ext) or $(static_ext) or $(nonxs_ext) will
@@
-663,6
+671,7
@@
distclean: clobber
_mopup:
rm -f *$(OBJ_EXT) *$(LIB_EXT) all perlmain.c
-@test -f extra.pods && rm -f `cat extra.pods`
_mopup:
rm -f *$(OBJ_EXT) *$(LIB_EXT) all perlmain.c
-@test -f extra.pods && rm -f `cat extra.pods`
+ -@test -f vms/README_vms.pod && rm -f vms/README_vms.pod
-rm -f perl.exp ext.libs extra.pods
-rm -f perl.export perl.dll perl.libexp perl.map perl.def
-rm -f perl.loadmap miniperl.loadmap perl.prelmap miniperl.prelmap
-rm -f perl.exp ext.libs extra.pods
-rm -f perl.export perl.dll perl.libexp perl.map perl.def
-rm -f perl.loadmap miniperl.loadmap perl.prelmap miniperl.prelmap
@@
-687,7
+696,7
@@
_cleaner:
-@for x in $(DYNALOADER) $(dynamic_ext) $(static_ext) $(nonxs_ext) ; do \
$(LDLIBPTH) sh ext/util/make_ext realclean $$x MAKE=$(MAKE) ; \
done
-@for x in $(DYNALOADER) $(dynamic_ext) $(static_ext) $(nonxs_ext) ; do \
$(LDLIBPTH) sh ext/util/make_ext realclean $$x MAKE=$(MAKE) ; \
done
- rm -f *.orig */*.orig *~ */*~ core core.*perl.*.? *perl.core t/core t/core.perl.*.? t/*perl.core t/misctmp* t/tmp* t/c t/perl so_locations $(LIBPERL_NONSHR) $(MINIPERL_NONSHR)
+ rm -f *.orig */*.orig *~ */*~ core core.*perl.*.? *perl.core t/core t/core.perl.*.? t/*perl.core t/misctmp* t/tmp* t/c t/perl
.?*.c
so_locations $(LIBPERL_NONSHR) $(MINIPERL_NONSHR)
rm -rf $(addedbyconf)
rm -f $(FIRSTMAKEFILE) $(FIRSTMAKEFILE).old
rm -f $(private)
rm -rf $(addedbyconf)
rm -f $(FIRSTMAKEFILE) $(FIRSTMAKEFILE).old
rm -f $(private)
@@
-774,6
+783,9
@@
okfile: utilities
nok: utilities
$(LDLIBPTH) ./perl -Ilib utils/perlbug -nok -s '(UNINSTALLED)'
nok: utilities
$(LDLIBPTH) ./perl -Ilib utils/perlbug -nok -s '(UNINSTALLED)'
+nokfile: utilities
+ $(LDLIBPTH) ./perl -Ilib utils/perlbug -nok -s '(UNINSTALLED)' -F perl.nok
+
clist: $(c)
echo $(c) | tr ' ' $(TRNL) >.clist
clist: $(c)
echo $(c) | tr ' ' $(TRNL) >.clist