our @install_shlibs =
map { $unified_info{sharednames}->{$_} || () }
grep(!/\.a$/, @{$unified_info{install}->{libraries}});
- our @generated = ( ( map { (my $x = $_) =~ s|\.S$|\.s|; $x }
+ our @generated = ( ( map { (my $x = $_) =~ s|\.[sS]$|\.asm|; $x }
grep { defined $unified_info{generate}->{$_} }
map { @{$unified_info{sources}->{$_}} }
grep { /\.o$/ } keys %{$unified_info{sources}} ),
# Where installed engines reside, for C
ENGINESDIR_C={- $osslprefix -}ENGINES{- $sover_dirname.$target{pointer_size} -}:
-CC= {- $target{cc} -}
-CFLAGS= /DEFINE=({- join(",", @{$target{defines}}, @{$config{defines}},"OPENSSLDIR=\"\"\"\$(OPENSSLDIR_C)\"\"\"","ENGINESDIR=\"\"\"\$(ENGINESDIR_C)\"\"\"") -}) {- $target{cflags} -} {- $config{cflags} -}
-CFLAGS_Q=$(CFLAGS)
-DEPFLAG= /DEFINE=({- join(",", @{$config{depdefines}}) -})
-LDFLAGS= {- $target{lflags} -}
-EX_LIBS= {- $target{ex_libs} ? ",".$target{ex_libs} : "" -}{- $config{ex_libs} ? ",".$config{ex_libs} : "" -}
-LIB_CFLAGS={- $target{lib_cflags} // "" -}
-DSO_CFLAGS={- $target{dso_cflags} // "" -}
-BIN_CFLAGS={- $target{bin_cflags} // "" -}
-NO_INST_LIB_CFLAGS={- $target{no_inst_lib_cflags} // '$(LIB_CFLAGS)' -}
-NO_INST_DSO_CFLAGS={- $target{no_inst_dso_cflags} // '$(DSO_CFLAGS)' -}
-NO_INST_BIN_CFLAGS={- $target{no_inst_bin_cflags} // '$(BIN_CFLAGS)' -}
+CC= {- $config{cc} -}
+CPP= {- $config{cpp} -}
+DEFINES={- our $defines = join(",",
+ '__dummy', # To make comma processing easier
+ @{$config{defines}}) -}
+INCLUDES={- our $includes = join(',', @{$config{includes}}) -}
+CPPFLAGS='qual_includes'{- our $cppflags = join('', @{$config{cppflags}}) -}
+CPPFLAGS_Q={- (my $x = $cppflags) =~ s|"|""|g;
+ (my $d = $defines) =~ s|"|""|g;
+ $x .= "/INCLUDE=($includes)" if $includes;
+ $x .= "/DEFINE=($d)";
+ $x; -}
+CFLAGS={- join('', @{$config{cflags}}) -}
+LDFLAGS= {- join('', @{$config{lflags}}) -}
+EX_LIBS= {- join('', map { ','.$_ } @{$config{ex_libs}}) -}
+
+LIB_DEFINES=$(DEFINES){- join("", (map { ",$_" }
+ @{$target{shared_defines}},
+ 'OPENSSLDIR="""$(OPENSSLDIR_C)"""',
+ 'ENGINESDIR="""$(ENGINESDIR_C)"""')) -}
+LIB_CPPFLAGS=$(CPPFLAGS)/DEFINE=($(LIB_DEFINES))
+LIB_CFLAGS=$(CFLAGS){- $target{lib_cflags} // "" -}
+DSO_DEFINES=$(DEFINES){- join("", (map { ",$_" } @{$target{dso_defines}})) -}
+DSO_CPPFLAGS=$(CPPFLAGS)/DEFINE=($(DSO_DEFINES))
+DSO_CFLAGS=$(CFLAGS){- $target{dso_cflags} // "" -}
+BIN_DEFINES=$(DEFINES){- join("", (map { ",$_" } @{$target{bin_defines}})) -}
+BIN_CPPFLAGS=$(CPPFLAGS)/DEFINE=($(BIN_DEFINES))
+BIN_CFLAGS=$(CFLAGS){- $target{bin_cflags} // "" -}
+NO_INST_LIB_CFLAGS=$(CFLAGS){- $target{no_inst_lib_cflags}
+ // $target{lib_cflags}
+ // "" -}
+NO_INST_DSO_CFLAGS=$(CFLAGS){- $target{no_inst_dso_cflags}
+ // $target{dso_cflags}
+ // "" -}
+NO_INST_BIN_CFLAGS=$(CFLAGS){- $target{no_inst_bin_cflags}
+ // $target{bin_cflags}
+ // "" -}
PERL={- $config{perl} -}
-# We let the C compiler driver to take care of .s files. This is done in
-# order to be excused from maintaining a separate set of architecture
-# dependent assembler flags. E.g. if you throw -mcpu=ultrasparc at SPARC
-# gcc, then the driver will automatically translate it to -xarch=v8plus
-# and pass it down to assembler.
-AS={- $target{as} -}
-ASFLAG={- $target{asflags} -}
+AS={- $config{as} -}
+ASFLAGS={- join(' ', @{$config{asflags}}) -}
+ASOUTFLAG={- $target{asoutflag} -}$(OSSL_EMPTY)
+PERLASM_SCHEME={- $target{perlasm_scheme} -}
# .FIRST and .LAST are special targets with MMS and MMK.
# The defines in there are for C. includes that look like
# Building targets ###################################################
configdata.pm : $(SRCDIR)Configure $(SRCDIR)config.com {- join(" ", @{$config{build_file_templates}}, @{$config{build_infos}}, @{$config{conf_files}}) -}
- @ WRITE SYS$OUTPUT "Reconfiguring..."
- perl $(SRCDIR)Configure reconf
+ perl configdata.pm -r
@ WRITE SYS$OUTPUT "*************************************************"
@ WRITE SYS$OUTPUT "*** ***"
@ WRITE SYS$OUTPUT "*** Please run the same mms command again ***"
@ WRITE SYS$OUTPUT "*************************************************"
@ PIPE ( EXIT %X10000000 )
+reconfigure reconf :
+ perl configdata.pm -r
+
{-
use File::Basename;
use File::Spec::Functions qw/abs2rel rel2abs catfile catdir/;
: $unified_info{sharednames}->{$_}.".EXE" } @_;
}
+ # Helper function to deal with inclusion directory specs.
+ # We have to deal with two things:
+ # 1. comma separation and no possibility of trailing comma
+ # 2. no inclusion directories given at all
+ # 3. long compiler command lines
+ # To resolve 1, we need to iterate through the sources of inclusion
+ # directories, and only add a comma when needed.
+ # To resolve 2, we need to have a variable that will hold the whole
+ # inclusion qualifier, or be the empty string if there are no inclusion
+ # directories. That's the symbol 'qual_includes' that's used in CPPFLAGS
+ # To resolve 3, we creata a logical name TMP_INCLUDES: to hold the list
+ # of inclusion directories.
+ #
+ # This function returns a list of two lists, one being the collection of
+ # commands to execute before the compiler is called, and the other being
+ # the collection of commands to execute after. It takes as arguments the
+ # collection of strings to include as directory specs.
+ sub includes {
+ my @stuff = ( @_ );
+ my @before = (
+ 'qual_includes :=',
+ );
+ my @after = (
+ 'DELETE/SYMBOL/LOCAL qual_includes',
+ );
+
+ if (scalar @stuff > 0) {
+ push @before, 'tmp_includes := '.shift(@stuff);
+ while (@stuff) {
+ push @before, 'tmp_add := '.shift(@stuff);
+ push @before, 'IF tmp_includes .NES. "" .AND. tmp_add .NES. "" THEN tmp_includes = tmp_includes + ","';
+ push @before, 'tmp_includes = tmp_includes + tmp_add';
+ }
+ push @before, "IF tmp_includes .NES. \"\" THEN DEFINE tmp_includes 'tmp_includes'";
+ push @before, 'IF tmp_includes .NES. "" THEN qual_includes := /INCLUDE=(tmp_includes:)';
+ push @before, 'DELETE/SYMBOL/LOCAL tmp_includes';
+ push @before, 'DELETE/SYMBOL/LOCAL tmp_add';
+ push @after, 'DEASSIGN tmp_includes:'
+ }
+ return ([ @before ], [ @after ]);
+ }
+
sub generatesrc {
my %args = @_;
+ (my $target = $args{src}) =~ s/\.[sS]$/.asm/;
my $generator = join(" ", @{$args{generator}});
my $generator_incs = join("", map { ' "-I'.$_.'"' } @{$args{generator_incs}});
my $deps = join(", -\n\t\t", @{$args{generator_deps}}, @{$args{deps}});
- if ($args{src} !~ /\.[sS]$/) {
+ if ($target !~ /\.asm$/) {
if ($args{generator}->[0] =~ m|^.*\.in$|) {
my $dofile = abs2rel(rel2abs(catfile($config{sourcedir},
"util", "dofile.pl")),
rel2abs($config{builddir}));
return <<"EOF";
-$args{src} : $args{generator}->[0] $deps
+$target : $args{generator}->[0] $deps
\$(PERL) "-I\$(BLDDIR)" "-Mconfigdata" $dofile \\
- "-o$target{build_file}" $generator > \$@
+ "-o$target{build_file}" $generator > \$\@
EOF
} else {
return <<"EOF";
-$args{src} : $args{generator}->[0] $deps
- \$(PERL)$generator_incs $generator > \$@
+$target : $args{generator}->[0] $deps
+ \$(PERL)$generator_incs $generator > \$\@
EOF
}
} else {
- die "No method to generate assembler source present.\n";
+ if ($args{generator}->[0] =~ /\.pl$/) {
+ $generator = '$(PERL)'.$generator_incs.' '.$generator;
+ } elsif ($args{generator}->[0] =~ /\.S$/) {
+ $generator = undef;
+ } else {
+ die "Generator type for $src unknown: $generator\n";
+ }
+
+ my $cppflags = { lib => '$(LIB_CPPFLAGS)',
+ dso => '$(DSO_CPPFLAGS)',
+ bin => '$(BIN_CPPFLAGS)' } -> {$args{intent}};
+ my @incs_cmds = includes({ lib => '$(LIB_INCLUDES)',
+ dso => '$(DSO_INCLUDES)',
+ bin => '$(BIN_INCLUDES)' } -> {$args{intent}},
+ '$(INCLUDES)',
+ @{$args{incs}});
+ my $incs_on = join("\n\t\@ ", @{$incs_cmds[0]}) || '!';
+ my $incs_off = join("\n\t\@ ", @{$incs_cmds[1]}) || '!';
+ if (defined($generator)) {
+ # If the target is named foo.S in build.info, we want to
+ # end up generating foo.s in two steps.
+ if ($args{src} =~ /\.S$/) {
+ return <<"EOF";
+$target : $args{generator}->[0] $deps
+ $generator \$\@-S
+ \@ $incs_on
+ PIPE \$(CPP) $cppflags \$\@-S | -
+ \$(PERL) -ne "/^#(\\s*line)?\\s*[0-9]+\\s+""/ or print" > \$\@-i
+ \@ $incs_off
+ RENAME \$\@-i \$\@
+ DELETE \$\@-S
+EOF
+ }
+ # Otherwise....
+ return <<"EOF";
+$target : $args{generator}->[0] $deps
+ $generator \$\@
+EOF
+ }
+ return <<"EOF";
+$target : $args{generator}->[0] $deps
+ \@ $incs_on
+ SHOW SYMBOL qual_includes
+ PIPE \$(CPP) $cppflags $args{generator}->[0] | -
+ \$(PERL) "-ne" "/^#(\\s*line)?\\s*[0-9]+\\s+""/ or print" > \$\@
+ \@ $incs_off
+EOF
}
}
sub src2obj {
my %args = @_;
+ my @srcs = map { (my $x = $_) =~ s/\.s$/.asm/; $x
+ } ( @{$args{srcs}} );
(my $obj = $args{obj}) =~ s|\.o$||;
- my $deps = join(", -\n\t\t", @{$args{srcs}}, @{$args{deps}});
+ my $deps = join(", -\n\t\t", @srcs, @{$args{deps}});
# Because VMS C isn't very good at combining a /INCLUDE path with
# #includes having a relative directory (like '#include "../foo.h"),
my $objd = abs2rel(rel2abs(dirname($obj)), rel2abs($forward));
my $objn = basename($obj);
my $srcs =
- join(", ",
- map { abs2rel(rel2abs($_), rel2abs($forward)) } @{$args{srcs}});
- my $ecflags;
+ join(", ", map { abs2rel(rel2abs($_), rel2abs($forward)) } @srcs);
+ my $before = $unified_info{before}->{$obj.".OBJ"} || "\@ !";
+ my $after = $unified_info{after}->{$obj.".OBJ"} || "\@ !";
+
+ if ($srcs[0] =~ /\.asm$/) {
+ return <<"EOF";
+$obj.OBJ : $deps
+ ${before}
+ SET DEFAULT $forward
+ \$(AS) \$(ASFLAGS) \$(ASOUTFLAG)${objd}${objn}.OBJ $srcs
+ SET DEFAULT $backward
+EOF
+ }
+
+ my $cflags;
if ($args{installed}) {
- $ecflags = { lib => '$(LIB_CFLAGS)',
- dso => '$(DSO_CFLAGS)',
- bin => '$(BIN_CFLAGS)' } -> {$args{intent}};
+ $cflags = { lib => '$(LIB_CFLAGS)',
+ dso => '$(DSO_CFLAGS)',
+ bin => '$(BIN_CFLAGS)' } -> {$args{intent}};
} else {
- $ecflags = { lib => '$(NO_INST_LIB_CFLAGS)',
- dso => '$(NO_INST_DSO_CFLAGS)',
- bin => '$(NO_INST_BIN_CFLAGS)' } -> {$args{intent}};
- }
- my $incs_on = "\@ !";
- my $incs_off = "\@ !";
- my $incs = "";
- my @incs = ();
- push @incs, @{$args{incs}} if @{$args{incs}};
- unless ($disabled{zlib}) {
- # GNV$ZLIB_INCLUDE is the standard logical name for later zlib
- # incarnations.
- push @incs, ($withargs{zlib_include} || 'GNV$ZLIB_INCLUDE:');
- }
- if (@incs) {
- $incs_on =
- "DEFINE tmp_includes "
- .join(",-\n\t\t\t", map {
- file_name_is_absolute($_)
- ? $_ : catdir($backward,$_)
- } @incs);
- $incs_off = "DEASSIGN tmp_includes";
- $incs = " /INCLUDE=(tmp_includes:)";
+ $cflags = { lib => '$(NO_INST_LIB_CFLAGS)',
+ dso => '$(NO_INST_DSO_CFLAGS)',
+ bin => '$(NO_INST_BIN_CFLAGS)' } -> {$args{intent}};
}
- my $before = $unified_info{before}->{$obj.".OBJ"} || "\@ !";
- my $after = $unified_info{after}->{$obj.".OBJ"} || "\@ !";
+ $cflags .= { lib => '$(LIB_CPPFLAGS)',
+ dso => '$(DSO_CPPFLAGS)',
+ bin => '$(BIN_CPPFLAGS)' } -> {$args{intent}};
+
+ my @incs_cmds = includes({ lib => '$(LIB_INCLUDES)',
+ dso => '$(DSO_INCLUDES)',
+ bin => '$(BIN_INCLUDES)' } -> {$args{intent}},
+ '$(INCLUDES)',
+ map {
+ file_name_is_absolute($_)
+ ? $_ : catdir($backward,$_)
+ } @{$args{incs}});
+ my $incs_on = join("\n\t\@ ", @{$incs_cmds[0]}) || '!';
+ my $incs_off = join("\n\t\@ ", @{$incs_cmds[1]}) || '!';
my $depbuild = $disabled{makedepend} ? ""
: " /MMS=(FILE=${objd}${objn}.tmp-D,TARGET=$obj.OBJ)";
- return <<"EOF";
+ return <<"EOF"
$obj.OBJ : $deps
${before}
SET DEFAULT $forward
- $incs_on
- \$(CC) \$(CFLAGS)${ecflags}${incs}${depbuild} /OBJECT=${objd}${objn}.OBJ /REPOSITORY=$backward $srcs
- $incs_off
+ \@ $incs_on
+ \$(CC) ${cflags}${depbuild} /OBJECT=${objd}${objn}.OBJ /REPOSITORY=$backward $srcs
+ \@ $incs_off
SET DEFAULT $backward
${after}
+ - PURGE $obj.OBJ
+EOF
+ . ($disabled{makedepend} ? "" : <<"EOF"
\@ PIPE ( \$(PERL) -e "use File::Compare qw/compare_text/; my \$x = compare_text(""$obj.D"",""$obj.tmp-D""); exit(0x10000000 + (\$x == 0));" || -
RENAME $obj.tmp-D $obj.d )
\@ IF F\$SEARCH("$obj.tmp-D") .NES. "" THEN DELETE $obj.tmp-D;*
- - PURGE $obj.OBJ
EOF
+ );
}
sub libobj2shlib {
my %args = @_;
my $shlib = $args{shlib};
my $libd = dirname($lib);
my $libn = basename($lib);
- (my $mkdef_key = $libn) =~ s/^${osslprefix_q}lib([^0-9]*)\d*/$1/i;
+ my @objs = map { (my $x = $_) =~ s|\.o$|.OBJ|; $x }
+ grep { $_ =~ m|\.o$| }
+ @{$args{objs}};
my @defs = grep { $_ =~ /\.opt$/ } @{$args{objs}};
my @deps = compute_lib_depends(@{$args{deps}});
die "More than one symbol vector" if scalar @defs > 1;
my $deps = join(", -\n\t\t", @defs, @deps);
my $shlib_target = $disabled{shared} ? "" : $target{shared_target};
- my $ordinalsfile = defined($args{ordinals}) ? $args{ordinals}->[1] : "";
- my $engine_opt = abs2rel(rel2abs(catfile($config{sourcedir},
- "VMS", "engine.opt")),
- rel2abs($config{builddir}));
- my $mkdef_pl = abs2rel(rel2abs(catfile($config{sourcedir},
- "util", "mkdef.pl")),
- rel2abs($config{builddir}));
- my $shared_def = join(",", map { "$_/OPT" } @defs);
my $translatesyms_pl = abs2rel(rel2abs(catfile($config{sourcedir},
"VMS", "translatesyms.pl")),
rel2abs($config{builddir}));
# previous line's file spec as default, so if no directory spec
# is present in the current line and the previous line has one that
# doesn't apply, you're in for a surprise.
- my $write_opt =
+ my $write_opt1 =
+ join(",-\"\n\t", map { my $x = $_ =~ /\[/ ? $_ : "[]".$_;
+ "WRITE OPT_FILE \"$x" } @objs).
+ "\"";
+ my $write_opt2 =
join("\n\t", map { my $x = $_ =~ /\[/ ? $_ : "[]".$_;
$x =~ s|(\.EXE)|$1/SHARE|;
$x =~ s|(\.OLB)|$1/LIB|;
return <<"EOF"
$shlib.EXE : $lib.OLB $deps
\$(PERL) $translatesyms_pl \$(BLDDIR)CXX\$DEMANGLER_DB. < $defs[0] > $defs[0]-translated
- LINK \$(LDFLAGS)/SHARE=\$\@ $defs[0]-translated/OPT,$lib.OLB/LIBRARY
- \$(EX_LIBS)
- DELETE $defs[0]-translated;*
+ OPEN/WRITE/SHARE=READ OPT_FILE $lib-components.OPT
+ $write_opt1
+ $write_opt2
+ CLOSE OPT_FILE
+ LINK \$(LDFLAGS)/SHARE=\$\@ $defs[0]-translated/OPT,-
+ $lib-components.OPT/OPT \$(EX_LIBS)
+ DELETE $defs[0]-translated;*,$lib-components.OPT;*
PURGE $shlib.EXE,$shlib.MAP
EOF
. ($config{target} =~ m|alpha| ? "" : <<"EOF"
projects / openssl.git / blobdiff