X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.SH;h=79953c77099a27b33736c7cab8ac7f49f4d4e246;hb=5cf1d1f16c1401220ecaa7b3127343c7c6c095d2;hp=cf3372a3f753f581a0dc2c8460a7c257e6fba607;hpb=43039de73e9f6e7f5c6b05087b44cc6c45f595b2;p=p5sagit%2Fp5-mst-13.2.git diff --git a/Makefile.SH b/Makefile.SH index cf3372a..79953c7 100644 --- a/Makefile.SH +++ b/Makefile.SH @@ -29,29 +29,20 @@ 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" ;; @@ -61,24 +52,34 @@ true) 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). @@ -309,6 +310,55 @@ cygwin*) ;; 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) -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! + ;; +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 +408,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 +425,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! @@ -562,7 +612,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 so_locations $(LIBPERL_NONSHR) $(MINIPERL_NONSHR) rm -rf $(addedbyconf) rm -f $(FIRSTMAKEFILE) $(FIRSTMAKEFILE).old rm -f $(private) @@ -571,6 +621,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 +643,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)