9
9
(our $osslprefix_q = platform->osslprefix()) =~ s/\$/\\\$/;
10
10
11
11
our $sover_dirname = platform->shlib_version_as_filename();
12
- our $osslver = sprintf "%02d%02d ", split(/\./, $config{version});
12
+ our $osslver = sprintf "%02d", split(/\./, $config{version});
13
13
14
14
our $sourcedir = $config{sourcedir};
15
15
our $builddir = $config{builddir};
110
110
@cnf_defines,
111
111
'OPENSSLDIR="""$(OPENSSLDIR_C)"""',
112
112
'ENGINESDIR="""$(ENGINESDIR_C)"""',
113
- 'MODULESDIR="""$(MODULESDIR_C)"""',
114
- #'$(DEFINES)'
113
+ 'MODULESDIR="""$(MODULESDIR_C)"""'
115
114
)
115
+ . '$(DEFINES)'
116
116
. "'extradefines'";
117
117
our $lib_asflags =
118
118
join(' ', $target{lib_asflags} || (), @{$config{lib_asflags}},
144
144
join(',', @{$target{dso_defines}}, @{$target{module_defines}},
145
145
@{$config{dso_defines}}, @{$config{module_defines}},
146
146
@cnf_defines,
147
- #'$(DEFINES)'
148
147
)
148
+ . '$(DEFINES)'
149
149
. "'extradefines'";
150
150
our $dso_asflags =
151
151
join(' ', $target{dso_asflags} || (), $target{module_asflags} || (),
180
180
join(',', @{$target{bin_defines}},
181
181
@{$config{bin_defines}},
182
182
@cnf_defines,
183
- #'$(DEFINES)'
184
183
)
184
+ . '$(DEFINES)'
185
185
. "'extradefines'";
186
186
our $bin_asflags =
187
187
join(' ', $target{bin_asflags} || (),
@@ -267,6 +267,7 @@ VERBOSE=$(V)
267
267
VERBOSE_FAILURE=$(VF)
268
268
269
269
VERSION={- "$config{full_version}" -}
270
+ VERSION_NUMBER={- "$config{version}" -}
270
271
MAJOR={- $config{major} -}
271
272
MINOR={- $config{minor} -}
272
273
SHLIB_VERSION_NUMBER={- $config{shlib_version} -}
@@ -355,7 +356,7 @@ OPENSSLDIR_C={- platform->osslprefix() -}DATAROOT:[000000]
355
356
# Where installed ENGINE modules reside, for C
356
357
ENGINESDIR_C={- platform->osslprefix() -}ENGINES{- $sover_dirname.$target{pointer_size} -}:
357
358
# Where modules reside, for C
358
- MODULESDIR_C={- platform->osslprefix() -}MODULES{- $sover_dirname.$ target{pointer_size} -}:
359
+ MODULESDIR_C={- platform->osslprefix() -}MODULES{- $target{pointer_size} -}:
359
360
360
361
##### User defined commands and flags ################################
361
362
@@ -428,7 +429,9 @@ NODEBUG=@
428
429
$(NODEBUG) ! them, so we create it instead. This is an unfortunate
429
430
$(NODEBUG) ! necessity.
430
431
$(NODEBUG) !
431
- $(NODEBUG) DEFINE openssl "{- sourcedir('include/openssl') -}
432
+ $(NODEBUG) openssl_inc1 = F$PARSE("[.include.openssl]","A.;",,,"syntax_only") - "A.;"
433
+ $(NODEBUG) openssl_inc2 = F$PARSE("sourcetop:[include.openssl]","A.;",,,"SYNTAX_ONLY") - "A.;"
434
+ $(NODEBUG) DEFINE openssl 'openssl_inc1','openssl_inc2'
432
435
$(NODEBUG) !
433
436
$(NODEBUG) ! Figure out the architecture
434
437
$(NODEBUG) !
@@ -441,9 +444,10 @@ NODEBUG=@
441
444
442
445
.LAST :
443
446
$(NODEBUG) {- join("\n\t\$(NODEBUG) ", map { "DEASSIGN ".uc($_) } @shlibs) || "!" -}
447
+ $(NODEBUG) DEASSIGN openssl
444
448
$(NODEBUG) DEASSIGN ossl_dataroot
445
449
$(NODEBUG) DEASSIGN ossl_installroot
446
- $(NODEBUG) DEASSIGN openssl
450
+ $(NODEBUG) DEASSIGN ossl_sourceroot
447
451
.DEFAULT :
448
452
@ ! MMS cannot handle no actions...
449
453
@@ -569,16 +573,18 @@ uninstall_docs : uninstall_html_docs
569
573
{- output_off() if $disabled{fips}; "" -}
570
574
install_fips : build_sw $(INSTALL_FIPSMODULECONF)
571
575
@ WRITE SYS$OUTPUT "*** Installing FIPS module"
576
+ - CREATE/DIR ossl_installroot:[MODULES{- $target{pointer_size} -}.'arch']
577
+ - CREATE/DIR/PROT=(S:RWED,O:RWE,G:RE,W:RE) OSSL_DATAROOT:[000000]
572
578
COPY/PROT=W:RE $(INSTALL_FIPSMODULES) -
573
- ossl_installroot:[MODULES{- $sover_dirname.$ target{pointer_size} -}.'arch']$(FIPSMODULENAME)
579
+ ossl_installroot:[MODULES{- $target{pointer_size} -}.'arch']$(FIPSMODULENAME)
574
580
@ WRITE SYS$OUTPUT "*** Installing FIPS module configuration"
575
581
COPY/PROT=W:RE $(INSTALL_FIPSMODULECONF) OSSL_DATAROOT:[000000]
576
582
577
583
uninstall_fips :
578
584
@ WRITE SYS$OUTPUT "*** Uninstalling FIPS module configuration"
579
585
DELETE OSSL_DATAROOT:[000000]fipsmodule.cnf;*
580
586
@ WRITE SYS$OUTPUT "*** Uninstalling FIPS module"
581
- DELETE ossl_installroot:[MODULES{- $sover_dirname.$ target{pointer_size} -}.'arch']$(FIPSMODULENAME);*
587
+ DELETE ossl_installroot:[MODULES{- $target{pointer_size} -}.'arch']$(FIPSMODULENAME);*
582
588
{- output_on() if $disabled{fips}; "" -}
583
589
584
590
install_ssldirs : check_INSTALLTOP
@@ -607,7 +613,9 @@ install_dev : check_INSTALLTOP install_runtime_libs
607
613
@ WRITE SYS$OUTPUT "*** Installing development files"
608
614
@ ! Install header files
609
615
- CREATE/DIR ossl_installroot:[include.openssl]
610
- COPY/PROT=W:R openssl:*.h ossl_installroot:[include.openssl]
616
+ COPY/PROT=W:R ossl_sourceroot:[include.openssl]*.h -
617
+ ossl_installroot:[include.openssl]
618
+ COPY/PROT=W:R [.include.openssl]*.h ossl_installroot:[include.openssl]
611
619
@ ! Install static (development) libraries
612
620
- CREATE/DIR ossl_installroot:[LIB.'arch']
613
621
{- join("\n ",
@@ -626,9 +634,9 @@ install_engines : check_INSTALLTOP install_runtime_libs build_modules
626
634
install_modules : check_INSTALLTOP install_runtime_libs build_modules
627
635
@ {- output_off() unless scalar @install_modules; "" -} !
628
636
@ WRITE SYS$OUTPUT "*** Installing modules"
629
- - CREATE/DIR ossl_installroot:[MODULES{- $sover_dirname.$ target{pointer_size} -}.'arch']
637
+ - CREATE/DIR ossl_installroot:[MODULES{- $target{pointer_size} -}.'arch']
630
638
{- join("\n ",
631
- map { "COPY/PROT=W:RE $_.EXE ossl_installroot:[MODULES$sover_dirname$ target{pointer_size}.'arch']" }
639
+ map { "COPY/PROT=W:RE $_.EXE ossl_installroot:[MODULES$target{pointer_size}.'arch']" }
632
640
@install_modules) -}
633
641
@ {- output_on() unless scalar @install_modules; "" -} !
634
642
904
912
#
905
913
my $target = platform->def($args{src});
906
914
my $mkdef = sourcefile('util', 'mkdef.pl');
907
- my $ord_ver = $args{intent} eq 'lib' ? ' --version $(VERSION )' : '';
915
+ my $ord_ver = $args{intent} eq 'lib' ? ' --version $(VERSION_NUMBER )' : '';
908
916
my $ord_name =
909
917
$args{generator}->[1] || basename($args{product}, '.EXE');
910
918
my $case_insensitive =
0 commit comments