@@ -83,6 +83,7 @@ class OpenSSLConan(ConanFile):
83
83
"no_whirlpool" : [True , False ],
84
84
"no_zlib" : [True , False ],
85
85
"openssldir" : [None , "ANY" ],
86
+ "with_ssldirs" : [True , False ],
86
87
}
87
88
default_options = {key : False for key in options .keys ()}
88
89
default_options ["fPIC" ] = True
@@ -397,7 +398,7 @@ def _configure_args(self):
397
398
])
398
399
399
400
for option_name in self .default_options .keys ():
400
- if self .options .get_safe (option_name , False ) and option_name not in ("shared" , "fPIC" , "openssldir" , "capieng_dialog" , "enable_capieng" , "zlib" , "no_fips" , "no_md2" ):
401
+ if self .options .get_safe (option_name , False ) and option_name not in ("shared" , "fPIC" , "openssldir" , "with_ssldirs" , " capieng_dialog" , "enable_capieng" , "zlib" , "no_fips" , "no_md2" ):
401
402
self .output .info (f"Activated option: { option_name } " )
402
403
args .append (option_name .replace ("_" , "-" ))
403
404
return args
@@ -482,6 +483,7 @@ def _run_make(self, targets=None, parallel=True, install=False):
482
483
command = [self ._make_program ]
483
484
if install :
484
485
command .append (f"DESTDIR={ self .package_folder } " )
486
+ command .append (f"OPENSSLDIR=/etc/ssl" )
485
487
if targets :
486
488
command .extend (targets )
487
489
if not self ._use_nmake :
@@ -513,7 +515,12 @@ def _make(self):
513
515
514
516
def _make_install (self ):
515
517
with chdir (self , self .source_folder ):
516
- self ._run_make (targets = ["install_sw" ], parallel = False , install = True )
518
+ targets = ["install_sw" ]
519
+ if self .options .with_ssldirs :
520
+ targets .append ("install_ssldirs" )
521
+ if not self .options .no_fips :
522
+ targets .append ("install_fips" )
523
+ self ._run_make (targets = targets , parallel = False , install = True )
517
524
518
525
def build (self ):
519
526
self ._make ()
@@ -672,4 +679,3 @@ def package_info(self):
672
679
673
680
# For legacy 1.x downstream consumers, remove once recipe is 2.0 only:
674
681
self .env_info .OPENSSL_MODULES = openssl_modules_dir
675
-
0 commit comments