diff options
| -rw-r--r-- | MANIFEST | 2 | ||||
| -rw-r--r-- | Makefile.SH | 14 | ||||
| -rw-r--r-- | ext/util/make_ext | 146 | ||||
| -rw-r--r-- | ext/util/make_ext.pl | 187 |
4 files changed, 195 insertions, 154 deletions
@@ -1400,7 +1400,7 @@ ext/Unicode/Normalize/t/proto.t Unicode::Normalize ext/Unicode/Normalize/t/split.t Unicode::Normalize ext/Unicode/Normalize/t/test.t Unicode::Normalize ext/Unicode/Normalize/t/tie.t Unicode::Normalize -ext/util/make_ext Used by Makefile to execute extension Makefiles +ext/util/make_ext.pl Used by Makefile to execute extension Makefiles ext/util/make_ext_cross Cross-compilation ext/Win32API/File/buffers.h Win32API::File extension ext/Win32API/File/cFile.h Win32API::File extension diff --git a/Makefile.SH b/Makefile.SH index 7773f099b3..c91df2cfe6 100644 --- a/Makefile.SH +++ b/Makefile.SH @@ -276,7 +276,7 @@ SHRPENV = $shrpenv # if building a shared libperl.so that might later be linked into # another application, then it might be appropriate to also build static # extensions (usually just DynaLoader) with relocatable code (e.g. -fPIC -# for GNU cc). This is handled by ext/util/make_ext. +# for GNU cc). This is handled by ext/util/make_ext.pl. STATIC = $static_target # The following is used to include the current directory in @@ -1156,16 +1156,16 @@ manicheck: FORCE # DynaLoader may be needed for extensions that use Makefile.PL. $(DYNALOADER): miniperl$(EXE_EXT) preplibrary FORCE - @$(LDLIBPTH) sh ext/util/make_ext $(STATIC) $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) + $(LDLIBPTH) $(RUN) ./miniperl$(EXE_EXT) ext/util/make_ext.pl $(STATIC) $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) d_dummy $(dynamic_ext): miniperl$(EXE_EXT) preplibrary makeppport $(DYNALOADER) FORCE - @$(LDLIBPTH) sh ext/util/make_ext dynamic $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) + $(LDLIBPTH) $(RUN) ./miniperl$(EXE_EXT) ext/util/make_ext.pl dynamic $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) s_dummy $(static_ext): miniperl$(EXE_EXT) preplibrary makeppport $(DYNALOADER) FORCE - @$(LDLIBPTH) sh ext/util/make_ext $(STATIC) $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) + $(LDLIBPTH) $(RUN) ./miniperl$(EXE_EXT) ext/util/make_ext.pl $(STATIC) $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) n_dummy $(nonxs_ext): miniperl$(EXE_EXT) preplibrary FORCE - @$(LDLIBPTH) sh ext/util/make_ext nonxs $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) + $(LDLIBPTH) $(RUN) ./miniperl$(EXE_EXT) ext/util/make_ext.pl nonxs $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) !NO!SUBS! $spitshell >>$Makefile <<EOF @@ -1225,7 +1225,7 @@ _tidy: -cd x2p; $(LDLIBPTH) $(MAKE) clean -rm -f lib/Config_git.pl git_version.h -@for x in $(DYNALOADER) $(dynamic_ext) $(static_ext) $(nonxs_ext) ; do \ - $(LDLIBPTH) sh ext/util/make_ext clean $$x MAKE=$(MAKE) ; \ + $(LDLIBPTH) $(RUN) ./miniperl$(EXE_EXT) ext/util/make_ext.pl clean $$x MAKE=$(MAKE) ; \ done _cleaner1: @@ -1234,7 +1234,7 @@ _cleaner1: -cd utils; $(LDLIBPTH) $(MAKE) $(CLEAN) -cd x2p; $(LDLIBPTH) $(MAKE) $(CLEAN) -@for x in $(DYNALOADER) $(dynamic_ext) $(static_ext) $(nonxs_ext) ; do \ - $(LDLIBPTH) sh ext/util/make_ext $(CLEAN) $$x MAKE=$(MAKE) ; \ + $(LDLIBPTH) $(RUN) ./miniperl$(EXE_EXT) ext/util/make_ext.pl $(CLEAN) $$x MAKE=$(MAKE) ; \ done -@test ! -f $(RUN) ./miniperl$(EXE_EXT) || $(LDLIBPTH) $(RUN) ./miniperl$(EXE_EXT) -Ilib mkppport --clean diff --git a/ext/util/make_ext b/ext/util/make_ext deleted file mode 100644 index 6152aa8a7c..0000000000 --- a/ext/util/make_ext +++ /dev/null @@ -1,146 +0,0 @@ -#!/bin/sh - -# This script acts as a simple interface for building extensions. -# It primarily used by the perl Makefile: -# -# d_dummy $(dynamic_ext): miniperl preplibrary FORCE -# @sh ext/util/make_ext dynamic $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) -# -# It may be deleted in a later release of perl so try to -# avoid using it for other purposes. - -target=$1; shift -extspec=$1; shift -makecmd=$1; shift # Should be something like MAKE=make -passthru="$*" # allow extra macro=value to be passed through -echo "" - -# Previously, $make was taken from config.sh. However, the user might -# instead be running a possibly incompatible make. This might happen if -# the user types "gmake" instead of a plain "make", for example. The -# correct current value of MAKE will come through from the main perl -# makefile as MAKE=/whatever/make in $makecmd. We'll be cautious in -# case third party users of this script (are there any?) don't have the -# MAKE=$(MAKE) argument, which was added after 5.004_03. -case "$makecmd" in -MAKE=*) - eval $makecmd - ;; -*) echo 'ext/util/make_ext: WARNING: Please include MAKE=$(MAKE)' - echo ' in your call to make_ext. See ext/util/make_ext for details.' - exit 1 - ;; -esac - - -case $CONFIG in -'') - if test -f config.sh; then TOP=.; - elif test -f ../config.sh; then TOP=..; - elif test -f ../../config.sh; then TOP=../..; - elif test -f ../../../config.sh; then TOP=../../..; - elif test -f ../../../../config.sh; then TOP=../../../..; - else - echo "Can't find config.sh generated by Configure"; exit 1 - fi - . $TOP/config.sh - ;; -esac - -if test "X$extspec" = X; then - echo "make_ext: no extension specified" - exit 1; -fi - -# The Perl Makefile.SH will expand all extensions to -# lib/auto/X/X.a (or lib/auto/X/Y/Y.a if nested) -# A user wishing to run make_ext might use -# X (or X/Y or X::Y if nested) - -# canonise into X/Y form (pname) -case "$extspec" in -lib*) # Remove lib/auto prefix and /*.* suffix - pname=`echo "$extspec" | sed -e 's:^lib/auto/::' -e 's:/[^/]*\.[^/]*$::' ` ;; -ext*) # Remove ext/ prefix and /pm_to_blib suffix - pname=`echo "$extspec" | sed -e 's:^ext/::' -e 's:/pm_to_blib$::' ` ;; -*::*) # Convert :: to / - pname=`echo "$extspec" | sed -e 's/::/\//g' ` ;; -*.*o) pname=`echo "$extspec" | sed -e 's/\..*o//'` ;; -*) pname="$extspec" ;; -esac -# echo "Converted $extspec to $pname" - -mname=`echo "$pname" | sed -e 's!/!::!g'` -depth=`echo "$pname" | sed -e 's![^/][^/]*!..!g'` -makefile=Makefile -makeargs='' -makeopts='' - -if test ! -d "ext/$pname"; then - echo " Skipping $extspec (directory does not exist)" - exit 0 # not an error ? -fi - -case "$osname" in -catamount) # Snowball's chance of building extensions. - echo "This is $osname, not building $mname, sorry." - exit 0 - ;; -esac - -echo " Making $mname ($target)" - -cd ext/$pname - -# check link type and do any preliminaries. Valid link types are -# 'dynamic', 'static', and 'static_pic' (the last one respects -# CCCDLFLAGS such as -fPIC -- see static_target in the main Makefile.SH) -case "$target" in -dynamic) makeargs="LINKTYPE=dynamic"; - target=all - ;; -static) makeargs="LINKTYPE=static CCCDLFLAGS=" - target=all - ;; -static_pic) makeargs="LINKTYPE=static" - target=all - ;; -nonxs) makeargs=""; - target=all - ;; - -*clean) # If Makefile has been moved to Makefile.old by a make clean - # then use Makefile.old for realclean rather than rebuild it - if test ! -f $makefile -a -f Makefile.old; then - makefile=Makefile.old - makeopts="-f $makefile" - echo "Note: Using Makefile.old" - fi - ;; - -*) # for the time being we are strict about what make_ext is used for - echo "make_ext: unknown make target '$target'"; exit 1 - ;; -'') echo "make_ext: no make target specified (eg static or dynamic)"; exit 1 - ;; -esac - -if test ! -f $makefile ; then - test -f Makefile.PL && $run ../$depth/miniperl -I../$depth/lib Makefile.PL INSTALLDIRS=perl INSTALLMAN3DIR=none PERL_CORE=1 $passthru -fi -if test ! -f $makefile ; then - echo "Warning: No Makefile!" -fi - -case "$target" in -clean) ;; -realclean) ;; -*) # Give makefile an opportunity to rewrite itself. - # reassure users that life goes on... - $MAKE config MAKE=$MAKE $passthru || echo "$MAKE config failed, continuing anyway..." - ;; -esac - -$MAKE $makeopts $target MAKE=$MAKE $makeargs $passthru || exit - -exit $? diff --git a/ext/util/make_ext.pl b/ext/util/make_ext.pl new file mode 100644 index 0000000000..f6b7b51376 --- /dev/null +++ b/ext/util/make_ext.pl @@ -0,0 +1,187 @@ +#!/bin/perl +use strict; +use warnings; + +# This script acts as a simple interface for building extensions. +# It primarily used by the perl Makefile: +# +# d_dummy $(dynamic_ext): miniperl preplibrary FORCE +# @$(RUN) ./miniperl ext/util/make_ext.pl dynamic $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) +# +# It may be deleted in a later release of perl so try to +# avoid using it for other purposes. + +my $target = shift(@ARGV); +my $extspec = shift(@ARGV); +my $makecmd = shift(@ARGV); # Should be something like MAKE=make +my $passthru = join(' ', @ARGV); # allow extra macro=value to be passed through +print "\n"; + +# Previously, $make was taken from config.sh. However, the user might +# instead be running a possibly incompatible make. This might happen if +# the user types "gmake" instead of a plain "make", for example. The +# correct current value of MAKE will come through from the main perl +# makefile as MAKE=/whatever/make in $makecmd. We'll be cautious in +# case third party users of this script (are there any?) don't have the +# MAKE=$(MAKE) argument, which was added after 5.004_03. +my $make; +if (defined($makecmd) and $makecmd =~ /^MAKE=(.*)$/) { + $make = $1; +} +else { + print "ext/util/make_ext: WARNING: Please include MAKE=\$(MAKE)\n"; + print "\tin your call to make_ext. See ext/util/make_ext for details.\n"; + exit(1); +} + +# search config.sh for inclusion +$ENV{CONFIG} = '' if not defined $ENV{CONFIG}; +if ($ENV{CONFIG} eq '') { + my $config; + foreach my $depth (0..4) { + my $file = ('../' x $depth) . 'config.sh'; + $config = $file, last if -f $file; + } + print("Can't find config.sh generated by Configure"), exit(1) + unless defined $config; + + load_config_sh($config); +} + +# fallback to config.sh's MAKE +$make ||= $ENV{make} || $ENV{MAKE}; +my $run = $ENV{run}; +$run = '' if not defined $run; +$run .= ' ' if $run ne '';; + +if (!defined($extspec) or $extspec eq '') { + print "make_ext: no extension specified\n"; + exit(1); +} + +# The Perl Makefile.SH will expand all extensions to +# lib/auto/X/X.a (or lib/auto/X/Y/Y.a if nested) +# A user wishing to run make_ext might use +# X (or X/Y or X::Y if nested) + +# canonise into X/Y form (pname) + +my $pname = $extspec; +if ($extspec =~ /^lib/) { + # Remove lib/auto prefix and /*.* suffix + $pname =~ s{^lib/auto/}{}; + $pname =~ s{[^/]*\.[^/]*$}{}; +} +elsif ($extspec =~ /^ext/) { + # Remove ext/ prefix and /pm_to_blib suffix + $pname =~ s{^ext/}{}; + $pname =~ s{/pm_to_blib$}{}; +} +elsif ($extspec =~ /::/) { + # Convert :: to / + $pname =~ s{::}{\/}g; +} +elsif ($extspec =~ /\..*o$/) { + $pname =~ s/\..*o//; +} + +my $mname = $pname; +$mname =~ s!/!::!g; +my $depth = $pname; +$depth =~ s![^/]+!..!g; +my $makefile = "Makefile"; +my $makeargs = ''; +my $makeopts = ''; + +if (not -d "ext/$pname") { + print "\tSkipping $extspec (directory does not exist)\n"; + exit(0); # not an error ? +} + +if ($ENV{osname} eq 'catamount') { + # Snowball's chance of building extensions. + print "This is $ENV{osname}, not building $mname, sorry.\n"; + exit(0); +} + +print "\tMaking $mname ($target)\n"; + +chdir("ext/$pname"); + +# check link type and do any preliminaries. Valid link types are +# 'dynamic', 'static', and 'static_pic' (the last one respects +# CCCDLFLAGS such as -fPIC -- see static_target in the main Makefile.SH) +if ($target eq 'dynamic') { + $makeargs = "LINKTYPE=dynamic"; + $target = 'all'; +} +elsif ($target eq 'static') { + $makeargs = "LINKTYPE=static CCCDLFLAGS="; + $target = 'all'; +} +elsif ($target eq 'static_pic') { + $makeargs = "LINKTYPE=static"; + $target = 'all'; +} +elsif ($target eq 'nonxs') { + $makeargs = ""; + $target = 'all'; +} +elsif ($target =~ /clean$/) { + # If Makefile has been moved to Makefile.old by a make clean + # then use Makefile.old for realclean rather than rebuild it + if (! -f $makefile and -f "Makefile.old") { + $makefile = "Makefile.old"; + $makeopts = "-f $makefile"; + print "Note: Using Makefile.old\n"; + } +} +elsif ($target eq '') { + print "make_ext: no make target specified (eg static or dynamic)\n"; + exit(1); +} +else { + # for the time being we are strict about what make_ext is used for + print "make_ext: unknown make target '$target'\n"; + exit(1); +} + + +if (not -f $makefile) { + if (-f "Makefile.PL") { + system("${run}../$depth/miniperl -I../$depth/lib Makefile.PL INSTALLDIRS=perl INSTALLMAN3DIR=none PERL_CORE=1 $passthru"); + } +} + +if (not -f $makefile) { + print "Warning: No Makefile!\n"; +} + +if ($target eq 'clean') { +} +elsif ($target eq 'realclean') { +} +else { + # Give makefile an opportunity to rewrite itself. + # reassure users that life goes on... + system( "$run$make config MAKE=$make $passthru" ) + and print "$make config failed, continuing anyway...\n"; +} + +system( + "$run$make $target MAKE=$make $makeargs $passthru" +) or exit(); + +exit($?); + +# read config.sh and add its keys to our %ENV +sub load_config_sh { + my $file = shift; + open my $fh, '<', $file or die "Could not open file '$file' as a 'config.sh': $!"; + while (<$fh>) { + chomp; + next if /^\s*#/; + $ENV{$1} = $3 if /^(?!:)([^\s=]+)=('?)(.*?)\2$/; + } + close $fh; +} |