Commit 84af1bae authored by Richard Levitte's avatar Richard Levitte
Browse files

Clean away $config{no_shared} since we have $disabled{shared} 



Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
parent 9e04edf2

Configurations/10-main.conf

+1 −1
Original line number Diff line number Diff line
@@ -1163,7 +1163,7 @@ 
#### MinGW

    "mingw" => {

        inherit_from     => [ asm("x86_asm"),

                              sub { $config{no_shared} ? () : "x86_uplink" } ],

                              sub { $disabled{shared} ? () : "x86_uplink" } ],

        cc               => "gcc",

        cflags           => "-DL_ENDIAN -DWIN32_LEAN_AND_MEAN -DUNICODE -D_UNICODE -m32 -Wall",

        debug_cflags     => "-g -O0",

Configurations/README

+1 −1
Original line number Diff line number Diff line
@@ -430,7 +430,7 @@ example, the above would have "something" used, since 1 is true. 
Together with the use of Text::Template, this can be used as

conditions based on something in the passed variables, for example:



    IF[{- $config{no_shared} -}]

    IF[{- $disabled{shared} -}]

      LIBS=libcrypto

      SOURCE[libcrypto]=...

    ELSE

Configurations/common.tmpl

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ 
 # built.

 sub dolib {

     my $lib = shift;

     if (!$config{no_shared}) {

     unless ($disabled{shared}) {

         my %ordinals =

             $unified_info{ordinals}->{$lib}

             ? (ordinals => $unified_info{ordinals}->{$lib}) : ();

Configurations/descrip.mms.tmpl

+8 −8
Original line number Diff line number Diff line
@@ -296,12 +296,12 @@ install_dev : check_INSTALLTOP 
        {- join("\n        ",

                map { "COPY/PROT=W:R $_.OLB ossl_installroot:[LIB.'arch']" }

                @{$unified_info{libraries}}) -}

        @ {- output_off() if $config{no_shared}; "" -} !

        @ {- output_off() if $disabled{shared}; "" -} !

        {- join("\n        ",

                map { "COPY/PROT=W:RE $_.EXE ossl_installroot:[LIB.'arch']" }

                map { $unified_info{sharednames}->{$_} || () }

                @{$unified_info{libraries}}) -}

        @ {- output_on() if $config{no_shared}; "" -} !

        @ {- output_on() if $disabled{shared}; "" -} !



install_runtime : check_INSTALLTOP

        @ WRITE SYS$OUTPUT "*** Installing runtime files"
@@ -363,7 +363,7 @@ vmsconfig.pm : configdata.pm 
        WRITE CONFIG "our %config = ("

        WRITE CONFIG "  target => '{- $config{target} -}',"

        WRITE CONFIG "  version => '$(MAJOR).$(MINOR)',"

        WRITE CONFIG "  no_shared => '","{- $config{no_shared} -}","',"

        WRITE CONFIG "  no_shared => '","{- $disabled{shared} -}","',"

        WRITE CONFIG "  INSTALLTOP => '$(INSTALLTOP)',"

        WRITE CONFIG "  OPENSSLDIR => '$(OPENSSLDIR)',"

        WRITE CONFIG "  pointersize => '","{- $target{pointersize} -}","',"
@@ -470,10 +470,10 @@ EOF 
      my $libn = basename($lib);

      (my $mkdef_key = $libn) =~ s/^${osslprefix_q}lib//i;

      my @deps = map {

          $config{no_shared} ? $_.".OLB"

          $disabled{shared} ? $_.".OLB"

              : $unified_info{sharednames}->{$_}.".EXE"; } @{$args{deps}};

      my $deps = join(", -\n\t\t", @deps);

      my $shlib_target = $config{no_shared} ? "" : $target{shared_target};

      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")),
@@ -522,10 +522,10 @@ EOF 
      (my $libn_nolib = $libn) =~ s/^lib//;

      my @objs = map { "$_.OBJ" } @{$args{objs}};

      my @deps = map {

          $config{no_shared} ? $_.".OLB"

          $disabled{shared} ? $_.".OLB"

              : $unified_info{sharednames}->{$_}.".EXE"; } @{$args{deps}};

      my $deps = join(", -\n\t\t", @objs, @deps);

      my $shlib_target = $config{no_shared} ? "" : $target{shared_target};

      my $shlib_target = $disabled{shared} ? "" : $target{shared_target};

      my $engine_opt = abs2rel(rel2abs(catfile($config{sourcedir},

                                               "VMS", "engine.opt")),

                               rel2abs($config{builddir}));
@@ -572,7 +572,7 @@ EOF 
      my $binn = basename($bin);

      my @objs = map { "$_.OBJ" } @{$args{objs}};

      my @deps = map {

          $config{no_shared} ? $_.".OLB"

          $disabled{shared} ? $_.".OLB"

              : $unified_info{sharednames}->{$_}.".EXE"; } @{$args{deps}};

      my $deps = join(", -\n\t\t", @objs, @deps);

      # The "[]" hack is because in .OPT files, each line inherits the

Configurations/unix-Makefile.tmpl

+8 −8
Original line number Diff line number Diff line
@@ -34,12 +34,12 @@ 
     # removed.  On some systems, they may therefore return the exact same

     # string.

     sub shlib {

         return () if $config{no_shared};

         return () if $disabled{shared};

         my $lib = shift;

         return $unified_info{sharednames}->{$lib} . $shlibext;

     }

     sub shlib_simple {

         return () if $config{no_shared};

         return () if $disabled{shared};



         my $lib = shift;

         if (windowsdll()) {
@@ -320,7 +320,7 @@ install_dev: 
		mv -f $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn.new \

		      $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn; \

	done

	@ : {- output_off() if $config{no_shared}; "" -}

	@ : {- output_off() if $disabled{shared}; "" -}

	@set -e; for s in $(SHLIB_INFO); do \

		s1=`echo "$$s" | cut -f1 -d";"`; \

		s2=`echo "$$s" | cut -f2 -d";"`; \
@@ -344,7 +344,7 @@ install_dev: 
		      $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn2; \

		: {- output_on() unless windowsdll(); "" -}; \

	done

	@ : {- output_on() if $config{no_shared}; "" -}

	@ : {- output_on() if $disabled{shared}; "" -}

	@$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/pkgconfig

	@echo "install libcrypto.pc -> $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/libcrypto.pc"

	@cp libcrypto.pc $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/pkgconfig
@@ -371,7 +371,7 @@ uninstall_dev: 
		echo "$(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn"; \

		$(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn; \

	done

	@ : {- output_off() if $config{no_shared}; "" -}

	@ : {- output_off() if $disabled{shared}; "" -}

	@set -e; for s in $(SHLIB_INFO); do \

		s1=`echo "$$s" | cut -f1 -d";"`; \

		s2=`echo "$$s" | cut -f2 -d";"`; \
@@ -389,7 +389,7 @@ uninstall_dev: 
		$(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn2; \

		: {- output_on() unless windowsdll(); "" -}; \

	done

	@ : {- output_on() if $config{no_shared}; "" -}

	@ : {- output_on() if $disabled{shared}; "" -}

	@echo "$(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/libcrypto.pc"

	@$(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/libcrypto.pc

	@echo "$(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/libssl.pc"
@@ -832,7 +832,7 @@ configdata.pm: {- $config{build_file_template} -} $(SRCDIR)/Configure $(SRCDIR)/ 
  # Helper function to figure out dependencies on libraries

  # It takes a list of library names and outputs a list of dependencies

  sub compute_lib_depends {

      if ($config{no_shared}) {

      if ($disabled{shared}) {

          return map { $_.$libext } @_;

      }
@@ -969,7 +969,7 @@ EOF 
                                    $d = "." if $d eq $f;

                                    (my $l = $f) =~ s/^lib//;

                                    " -L$d -l$l" } @{$args{deps}});

      my $shlib_target = $config{no_shared} ? "" : $target{shared_target};

      my $shlib_target = $disabled{shared} ? "" : $target{shared_target};

      return <<"EOF";

$bin$exeext: $objs $deps

	\$(RM) $bin$exeext