X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.SH;h=1567e2f18a0d32d352abb05dfd50b3998fbba08b;hb=4499d6b9d14594604210bc28005c5e4ab2e49947;hp=d4c51978d227eef16baa87487cce78f8c97b45c3;hpb=86959918b69bd7566746d776574341f410f68755;p=p5sagit%2Fp5-mst-13.2.git diff --git a/Makefile.SH b/Makefile.SH index d4c5197..1567e2f 100644 --- a/Makefile.SH +++ b/Makefile.SH @@ -29,56 +29,57 @@ ldlibpth='' case "$useshrplib" in true) # Prefix all runs of 'miniperl' and 'perl' with - # $ldlibpth so that ./perl finds *this* libperl.so. + # $ldlibpth so that ./perl finds *this* shared libperl. ldlibpth="LD_LIBRARY_PATH=`pwd`:$LD_LIBRARY_PATH" pldlflags="$cccdlflags" - # NeXT-4 specific stuff. Can't we do this in the hint file? case "${osname}${osvers}" in next4*) ld=libtool lddlflags="-dynamic -undefined warning -framework System \ -compatibility_version 1 -current_version $patchlevel \ -prebind -seg1addr 0x27000000 -install_name \$(shrpdir)/\$@" - # NeXT uses a different name. - ldlibpth="DYLD_LIBRARY_PATH=`pwd`:$DYLD_LIBRARY_PATH" ;; - rhapsody*) - ldlibpth="DYLD_LIBRARY_PATH=`pwd`/Perl:$DYLD_LIBRARY_PATH" - ;; - cygwin*) ldlibpth="PATH=`pwd`:$PATH" + cygwin*) linklibperl="-lperl" ;; - os2*) # OS/2 doesn't need anything special for LD_LIBRARY_PATH. - ldlibpth='' - ;; sunos*) linklibperl="-lperl" ;; - netbsd*|freebsd[234]*) + netbsd*|freebsd[234]*|openbsd*) linklibperl="-L. -lperl" ;; aix*) shrpldflags="-H512 -T512 -bhalt:4 -bM:SRE -bE:perl.exp" case "$osvers" in - 3*) - shrpldflags="$shrpldflags -e _nostart $ldflags $libs $cryptlib" + 3*) shrpldflags="$shrpldflags -e _nostart" ;; - *) - shrpldflags="$shrpldflags -b noentry $ldflags $libs $cryptlib" + *) shrpldflags="$shrpldflags -b noentry" ;; esac - aixinstdir=`pwd | sed 's/\/UU$//'` - linklibperl="-L $archlibexp/CORE -L $aixinstdir -lperl" - ldlibpth="LIBPATH=`pwd`:${LIBPATH}" + shrpldflags="$shrpldflags $ldflags $libs $cryptlib" + linklibperl="-L $archlibexp/CORE -L `pwd | sed 's/\/UU$//'` -lperl" ;; hpux*) linklibperl="-L `pwd | sed 's/\/UU$//'` -Wl,+s -Wl,+b$archlibexp/CORE -lperl" - ldlibpth="SHLIB_PATH=`pwd`:${SHLIB_PATH}" - ;; - beos*) ldlibpth="LIBRARY_PATH=`pwd`:$LIBRARY_PATH" ;; esac + case "$ldlibpthname" in + '') ;; + *) + case "$osname" in + os2) + ldlibpth='' + ;; + rhapsody) + eval "ldlibpth=\"$ldlibpthname=`pwd`/Perl:\$$ldlibpthname\"" + ;; + *) + eval "ldlibpth=\"$ldlibpthname=`pwd`:\$$ldlibpthname\"" + ;; + esac + ;; + esac ;; *) pldlflags='' ;; @@ -154,7 +155,7 @@ LLIBPERL= $linklibperl SHRPENV = $shrpenv # The following is used to include the current directory in -# LD_LIBRARY_PATH if you are building a shared libperl.so. +# the dynamic loader path you are building a shared libperl. LDLIBPTH = $ldlibpth dynamic_ext = $dynamic_list @@ -205,10 +206,10 @@ private = preplibrary lib/ExtUtils/Miniperl.pm lib/Config.pm # Files to be built with variable substitution before miniperl # is available. sh = Makefile.SH cflags.SH config_h.SH makeaperl.SH makedepend.SH \ - makedir.SH perl_exp.SH writemain.SH + makedir.SH myconfig.SH writemain.SH shextract = Makefile cflags config.h makeaperl makedepend \ - makedir perl.exp writemain + makedir myconfig writemain # Files to be built with variable substitution after miniperl is # available. Dependencies handled manually below (for now). @@ -302,13 +303,72 @@ ext.libs: $(static_ext) # Load up custom Makefile.SH fragment for shared loading and executables: case "$osname" in cygwin*) - Makefile_s="cygwin32/Makefile.SHs" + Makefile_s="cygwin/Makefile.SHs" ;; *) Makefile_s="$osname/Makefile.SHs" ;; esac +case "$osname" in +aix) + $spitshell >>Makefile <>Makefile <<'!NO!SUBS!' + +LIBPERL_NONSHR = libperl_nonshr$(LIB_EXT) +MINIPERL_NONSHR = miniperl_nonshr$(EXE_EXT) + +$(LIBPERL_NONSHR): perl$(OBJ_EXT) $(obj) + $(RMS) $(LIBPERL_NONSHR) + $(AR) rcu $(LIBPERL_NONSHR) perl$(OBJ_EXT) $(obj) + +$(MINIPERL_NONSHR): $(LIBPERL_NONSHR) miniperlmain$(OBJ_EXT) + $(CC) $(LDFLAGS) -o $(MINIPERL_NONSHR) miniperlmain$(OBJ_EXT) $(LIBPERL_NONSHR) $(LIBS) + +MINIPERLEXP = $(MINIPERL_NONSHR) + +LIBPERLEXPORT = perl.exp + +!NO!SUBS! + + ;; + *) + $spitshell >>Makefile <<'!NO!SUBS!' +MINIPERLEXP = miniperl$(EXE_EXT) + +PERLEXPORT = perl.exp + +!NO!SUBS! + ;; + esac + $spitshell >>Makefile <<'!NO!SUBS!' +perl.exp: $(MINIPERLEXP) makedef.pl config.sh $(SYM) $(SYMH) + ./$(MINIPERLEXP) makedef.pl PLATFORM=aix | sort -u | sort -f > perl.exp.tmp + sh mv-if-diff perl.exp.tmp perl.exp + +!NO!SUBS! + ;; +os2) + $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) > perl.exp.tmp + sh mv-if-diff perl.exp.tmp perl5.def + +!NO!SUBS! + ;; +esac + if test -r $Makefile_s ; then . $Makefile_s $spitshell >>Makefile <>Makefile <<'!NO!SUBS!' -$(LIBPERL): $& perl$(OBJ_EXT) $(obj) +$(LIBPERL): $& perl$(OBJ_EXT) $(obj) $(LIBPERLEXPORT) !NO!SUBS! case "$useshrplib" in true) @@ -358,16 +418,16 @@ miniperl: $& miniperlmain$(OBJ_EXT) $(LIBPERL) $(LDLIBPTH) $(CC) $(LARGE) $(CLDFLAGS) -o miniperl miniperlmain$(OBJ_EXT) $(LLIBPERL) $(libs) $(LDLIBPTH) ./miniperl -w -Ilib -MExporter -e 0 || $(MAKE) minitest -perl: $& perlmain$(OBJ_EXT) $(LIBPERL) $(DYNALOADER) $(static_ext) ext.libs +perl: $& perlmain$(OBJ_EXT) $(LIBPERL) $(DYNALOADER) $(static_ext) ext.libs $(PERLEXPORT) $(SHRPENV) $(LDLIBPTH) $(CC) $(LARGE) $(CLDFLAGS) $(CCDLFLAGS) -o perl perlmain$(OBJ_EXT) $(DYNALOADER) $(static_ext) $(LLIBPERL) `cat ext.libs` $(libs) -pureperl: $& perlmain$(OBJ_EXT) $(LIBPERL) $(DYNALOADER) $(static_ext) ext.libs +pureperl: $& perlmain$(OBJ_EXT) $(LIBPERL) $(DYNALOADER) $(static_ext) ext.libs $(PERLEXPORT) $(SHRPENV) $(LDLIBPTH) purify $(CC) $(LARGE) $(CLDFLAGS) $(CCDLFLAGS) -o pureperl perlmain$(OBJ_EXT) $(DYNALOADER) $(static_ext) $(LLIBPERL) `cat ext.libs` $(libs) -purecovperl: $& perlmain$(OBJ_EXT) $(LIBPERL) $(DYNALOADER) $(static_ext) ext.libs +purecovperl: $& perlmain$(OBJ_EXT) $(LIBPERL) $(DYNALOADER) $(static_ext) ext.libs $(PERLEXPORT) $(SHRPENV) $(LDLIBPTH) purecov $(CC) $(LARGE) $(CLDFLAGS) $(CCDLFLAGS) -o purecovperl perlmain$(OBJ_EXT) $(DYNALOADER) $(static_ext) $(LLIBPERL) `cat ext.libs` $(libs) -quantperl: $& perlmain$(OBJ_EXT) $(LIBPERL) $(DYNALOADER) $(static_ext) ext.libs +quantperl: $& perlmain$(OBJ_EXT) $(LIBPERL) $(DYNALOADER) $(static_ext) ext.libs $(PERLEXPORT) $(SHRPENV) $(LDLIBPTH) quantify $(CC) $(LARGE) $(CLDFLAGS) $(CCDLFLAGS) -o quantperl perlmain$(OBJ_EXT) $(DYNALOADER) $(static_ext) $(LLIBPERL) `cat ext.libs` $(libs) # This version, if specified in Configure, does ONLY those scripts which need @@ -375,7 +435,7 @@ quantperl: $& perlmain$(OBJ_EXT) $(LIBPERL) $(DYNALOADER) $(static_ext) ext.libs # checks as well as the special code to validate that the script in question # has been invoked correctly. -suidperl: $& sperl$(OBJ_EXT) perlmain$(OBJ_EXT) $(LIBPERL) $(DYNALOADER) $(static_ext) ext.libs +suidperl: $& sperl$(OBJ_EXT) perlmain$(OBJ_EXT) $(LIBPERL) $(DYNALOADER) $(static_ext) ext.libs $(PERLEXPORT) $(SHRPENV) $(LDLIBPTH) $(CC) $(LARGE) $(CLDFLAGS) $(CCDLFLAGS) -o suidperl perlmain$(OBJ_EXT) sperl$(OBJ_EXT) $(DYNALOADER) $(static_ext) $(LLIBPERL) `cat ext.libs` $(libs) !NO!SUBS! @@ -453,7 +513,6 @@ install.html: all installhtml # normally shouldn't remake perly.[ch]. run_byacc: FORCE - @ echo 'Expect' 113 shift/reduce and 1 reduce/reduce conflict $(BYACC) -d perly.y chmod 664 perly.c sh $(shellflags) ./perly.fixer y.tab.c perly.c @@ -489,6 +548,7 @@ SYMH = perlvars.h intrpvar.h thrdvar.h # ext/ByteLoader/byterun.h: bytecode.pl # ext/ByteLoader/byterun.c: bytecode.pl # ext/B/Asmdata.pm: bytecode.pl +# global.sym: embed.pl # regnodes.h: regcomp.pl # warning.h lib/warning.pm: warning.pl # The correct versions should be already supplied with the perl kit, @@ -562,7 +622,7 @@ _cleaner: -@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.*.? core.miniperl.*.? perl.core miniperl.core t/core t/core.perl.*.? t/perl.core t/tmp???? t/c t/perl so_locations t/nonexistent1 + rm -f *.orig */*.orig *~ */*~ core core.perl.*.? core.miniperl.*.? perl.core miniperl.core t/core t/core.perl.*.? t/perl.core t/tmp???? t/c t/perl so_locations t/nonexistent1 $(LIBPERL_NONSHR) $(MINIPERL_NONSHR) rm -rf $(addedbyconf) rm -f $(FIRSTMAKEFILE) $(FIRSTMAKEFILE).old rm -f $(private) @@ -571,6 +631,7 @@ _cleaner: rm -f h2ph.man pstruct rm -rf .config rm -f testcompile compilelog + -rmdir lib/B lib/Data lib/IO/Socket lib/IO # The following lint has practically everything turned on. Unfortunately, # you have to wade through a lot of mumbo jumbo that can't be suppressed. @@ -592,10 +653,6 @@ $(FIRSTMAKEFILE): README $(MAKEDEPEND) config.h: config_h.SH config.sh $(SHELL) config_h.SH -# This is an AIXism. -perl.exp: perl_exp.SH config.sh $(SYM) $(SYMH) - $(SHELL) perl_exp.SH - # When done, touch perlmain.c so that it doesn't get remade each time. depend: makedepend sh ./makedepend MAKE=$(MAKE)