Commit 2e0956ba authored by Richard Levitte's avatar Richard Levitte
Browse files

Unified - have configdata.pm depend on a few more things 



Reviewed-by: default avatarAndy Polyakov <appro@openssl.org>
parent edae9834

Configurations/descrip.mms.tmpl

+1 −1
Original line number Diff line number Diff line
@@ -393,7 +393,7 @@ debug_logicals : 


# Building targets ###################################################



configdata.pm : {- sourcefile("Configurations", "descrip.mms.tmpl") -} $(SRCDIR)Configure ! $(SRCDIR)config.com

configdata.pm : {- join(" ", sourcefile("Configurations", "descrip.mms.tmpl"), sourcefile("Configurations", "common.tmpl")) -} $(SRCDIR)Configure $(SRCDIR)config.com {- join(" ", @{$config{build_infos}}) -}

        @ WRITE SYS$OUTPUT "Detected changed: $?"

        @ WRITE SYS$OUTPUT "Reconfiguring..."

        perl $(SRCDIR)Configure reconf

Configurations/unix-Makefile.tmpl

+1 −1
Original line number Diff line number Diff line
@@ -796,7 +796,7 @@ openssl.pc: 
# wasn't passed down automatically.  It's quite safe to use it like we do

# below; if it doesn't exist, the result will be empty and 'make' will pick

# up $(MAKEFLAGS) which is passed down as an environment variable.

configdata.pm: {- $config{build_file_template} -} $(SRCDIR)/Configure $(SRCDIR)/config

configdata.pm: {- $config{build_file_template} -} $(SRCDIR)/Configurations/common.tmpl $(SRCDIR)/Configure $(SRCDIR)/config {- join(" ", @{$config{build_infos}}) -}

	@echo "Detected changed: $?"

	@echo "Reconfiguring..."

	$(SRCDIR)/Configure reconf

Configure

+3 −0
Original line number Diff line number Diff line
@@ -1266,6 +1266,8 @@ if ($builder eq "unified") { 
            if (-f catfile($srcdir, "engines", $_, "build.info"));

    }



    $config{build_infos} = [ ];



    foreach (@build_infos) {

        my $sourced = catdir($srcdir, $_->[0]);

        my $buildd = catdir($blddir, $_->[0]);
@@ -1289,6 +1291,7 @@ if ($builder eq "unified") { 
        my %renames = ();

        my %sharednames = ();



        push @{$config{build_infos}}, catfile(abs2rel($sourced, $blddir), $f);

        my $template = Text::Template->new(TYPE => 'FILE',

                                           SOURCE => catfile($sourced, $f));

        die "Something went wrong with $sourced/$f: $!\n" unless $template;