diff --git a/lutin_crypto.py b/lutin_crypto.py index f37d301..7f2df8e 100644 --- a/lutin_crypto.py +++ b/lutin_crypto.py @@ -811,7 +811,7 @@ def create(target, module_name): 'openssl/engines/ccgost/gost_pmeth.c', 'openssl/engines/ccgost/gost_sign.c', ]) - my_module.compile_flags('c', [ + my_module.add_flag('c', [ '-DOPENSSL_THREADS', '-D_REENTRANT', '-DDSO_DLFCN', @@ -819,15 +819,15 @@ def create(target, module_name): '-Wa,--noexecstack', '-DL_ENDIAN', ]) - if target.name != "RPI3": - my_module.compile_flags('c', [ + if "RPI3" in target.get_type(): + my_module.add_flag('c', [ '-m64', ]) - my_module.compile_flags('c', [ + my_module.add_flag('c', [ '-DOPENSSL_NO_ASM', ]) my_module.compile_version("c", 1989, gnu=True) - my_module.add_module_depend('z') + my_module.add_depend('z') my_module.add_path(os.path.join(tools.get_current_path(__file__), "openssl")) my_module.add_path(os.path.join(tools.get_current_path(__file__), "openssl", "crypto")) my_module.add_path(os.path.join(tools.get_current_path(__file__), "openssl", "crypto", "modes")) @@ -905,7 +905,7 @@ def create(target, module_name): destination_path="openssl") my_module.add_header_file([ - 'generate/' + target.name + '/opensslconf.h', + 'generate/' + target.get_name() + '/opensslconf.h', ], destination_path="openssl") # normaly generate with : /usr/bin/perl util/mkbuildinf.pl "gcc -Iopenssl/crypto -Iopenssl -Iopenssl/include -DOPENSSL_THREADS -D_REENTRANT -DDSO_DLFCN -DHAVE_DLFCN_H -Wa,--noexecstack -m64 -DL_ENDIAN -O3 -Wall -DOPENSSL_IA32_SSE2 -DOPENSSL_BN_ASM_MONT -DOPENSSL_BN_ASM_MONT5 -DOPENSSL_BN_ASM_GF2m -DSHA1_ASM -DSHA256_ASM -DSHA512_ASM -DMD5_ASM -DAES_ASM -DVPAES_ASM -DBSAES_ASM -DWHIRLPOOL_ASM -DGHASH_ASM" "linux-x86_64" >buildinf.h @@ -915,10 +915,11 @@ def create(target, module_name): ], destination_path="openssl") # TODO : Check it and do it better ... - my_module.add_export_flag('link', [ + my_module.add_flag('link', [ '-ldl', - ]) - my_module.add_module_depend([ + ], + export=True) + my_module.add_depend([ 'c', 'm', 'rpc', diff --git a/lutin_openssl-apps-asn1pars.py b/lutin_openssl-apps-asn1pars.py index 6a099dd..24518e0 100644 --- a/lutin_openssl-apps-asn1pars.py +++ b/lutin_openssl-apps-asn1pars.py @@ -38,7 +38,7 @@ def create(target, module_name): 'openssl/apps/asn1pars.c', ]) my_module.compile_version("c", 1989, gnu=True) - my_module.add_module_depend('openssl') + my_module.add_depend('openssl') my_module.add_path(os.path.join(tools.get_current_path(__file__), "openssl", "apps")) my_module.add_path(os.path.join(tools.get_current_path(__file__), "openssl/crypto")) my_module.add_path(os.path.join(tools.get_current_path(__file__), "openssl")) diff --git a/lutin_openssl-apps-crl.py b/lutin_openssl-apps-crl.py index cb77192..b7e10a0 100644 --- a/lutin_openssl-apps-crl.py +++ b/lutin_openssl-apps-crl.py @@ -39,7 +39,7 @@ def create(target, module_name): 'openssl/apps/crl.c', ]) my_module.compile_version("c", 1989, gnu=True) - my_module.add_module_depend('openssl') + my_module.add_depend('openssl') my_module.add_path(os.path.join(tools.get_current_path(__file__), "openssl", "apps")) my_module.add_path(os.path.join(tools.get_current_path(__file__), "openssl/crypto")) my_module.add_path(os.path.join(tools.get_current_path(__file__), "openssl")) diff --git a/lutin_openssl-apps-crl2p7.py b/lutin_openssl-apps-crl2p7.py index 8b80e43..9f3834c 100644 --- a/lutin_openssl-apps-crl2p7.py +++ b/lutin_openssl-apps-crl2p7.py @@ -39,7 +39,7 @@ def create(target, module_name): 'openssl/apps/crl2p7.c', ]) my_module.compile_version("c", 1989, gnu=True) - my_module.add_module_depend('openssl') + my_module.add_depend('openssl') my_module.add_path(os.path.join(tools.get_current_path(__file__), "openssl", "apps")) my_module.add_path(os.path.join(tools.get_current_path(__file__), "openssl/crypto")) my_module.add_path(os.path.join(tools.get_current_path(__file__), "openssl")) diff --git a/lutin_openssl-apps-dh.py b/lutin_openssl-apps-dh.py index 8131538..935520d 100644 --- a/lutin_openssl-apps-dh.py +++ b/lutin_openssl-apps-dh.py @@ -39,7 +39,7 @@ def create(target, module_name): 'openssl/apps/dh.c', ]) my_module.compile_version("c", 1989, gnu=True) - my_module.add_module_depend('openssl') + my_module.add_depend('openssl') my_module.add_path(os.path.join(tools.get_current_path(__file__), "openssl", "apps")) my_module.add_path(os.path.join(tools.get_current_path(__file__), "openssl/crypto")) my_module.add_path(os.path.join(tools.get_current_path(__file__), "openssl")) diff --git a/lutin_openssl-apps-dhparam.py b/lutin_openssl-apps-dhparam.py index 8f66b64..e1bde5a 100644 --- a/lutin_openssl-apps-dhparam.py +++ b/lutin_openssl-apps-dhparam.py @@ -39,7 +39,7 @@ def create(target, module_name): 'openssl/apps/dhparam.c', ]) my_module.compile_version("c", 1989, gnu=True) - my_module.add_module_depend('openssl') + my_module.add_depend('openssl') my_module.add_path(os.path.join(tools.get_current_path(__file__), "openssl", "apps")) my_module.add_path(os.path.join(tools.get_current_path(__file__), "openssl/crypto")) my_module.add_path(os.path.join(tools.get_current_path(__file__), "openssl")) diff --git a/lutin_openssl-apps-dsa.py b/lutin_openssl-apps-dsa.py index 739970d..ff0326b 100644 --- a/lutin_openssl-apps-dsa.py +++ b/lutin_openssl-apps-dsa.py @@ -39,7 +39,7 @@ def create(target, module_name): 'openssl/apps/dsa.c', ]) my_module.compile_version("c", 1989, gnu=True) - my_module.add_module_depend('openssl') + my_module.add_depend('openssl') my_module.add_path(os.path.join(tools.get_current_path(__file__), "openssl", "apps")) my_module.add_path(os.path.join(tools.get_current_path(__file__), "openssl/crypto")) my_module.add_path(os.path.join(tools.get_current_path(__file__), "openssl")) diff --git a/lutin_openssl-apps-dsaparam.py b/lutin_openssl-apps-dsaparam.py index c86346e..705a80f 100644 --- a/lutin_openssl-apps-dsaparam.py +++ b/lutin_openssl-apps-dsaparam.py @@ -39,7 +39,7 @@ def create(target, module_name): 'openssl/apps/dsaparam.c', ]) my_module.compile_version("c", 1989, gnu=True) - my_module.add_module_depend('openssl') + my_module.add_depend('openssl') my_module.add_path(os.path.join(tools.get_current_path(__file__), "openssl", "apps")) my_module.add_path(os.path.join(tools.get_current_path(__file__), "openssl/crypto")) my_module.add_path(os.path.join(tools.get_current_path(__file__), "openssl")) diff --git a/lutin_openssl-apps-ec.py b/lutin_openssl-apps-ec.py index 67f79ec..d32371b 100644 --- a/lutin_openssl-apps-ec.py +++ b/lutin_openssl-apps-ec.py @@ -39,7 +39,7 @@ def create(target, module_name): 'openssl/apps/ec.c', ]) my_module.compile_version("c", 1989, gnu=True) - my_module.add_module_depend('openssl') + my_module.add_depend('openssl') my_module.add_path(os.path.join(tools.get_current_path(__file__), "openssl", "apps")) my_module.add_path(os.path.join(tools.get_current_path(__file__), "openssl/crypto")) my_module.add_path(os.path.join(tools.get_current_path(__file__), "openssl")) diff --git a/lutin_openssl-apps-ecparam.py b/lutin_openssl-apps-ecparam.py index f3c1958..7285acb 100644 --- a/lutin_openssl-apps-ecparam.py +++ b/lutin_openssl-apps-ecparam.py @@ -39,7 +39,7 @@ def create(target, module_name): 'openssl/apps/ecparam.c', ]) my_module.compile_version("c", 1989, gnu=True) - my_module.add_module_depend('openssl') + my_module.add_depend('openssl') my_module.add_path(os.path.join(tools.get_current_path(__file__), "openssl", "apps")) my_module.add_path(os.path.join(tools.get_current_path(__file__), "openssl/crypto")) my_module.add_path(os.path.join(tools.get_current_path(__file__), "openssl")) diff --git a/lutin_openssl-apps-enc.py b/lutin_openssl-apps-enc.py index 472ab34..6342305 100644 --- a/lutin_openssl-apps-enc.py +++ b/lutin_openssl-apps-enc.py @@ -39,7 +39,7 @@ def create(target, module_name): 'openssl/apps/enc.c', ]) my_module.compile_version("c", 1989, gnu=True) - my_module.add_module_depend('openssl') + my_module.add_depend('openssl') my_module.add_path(os.path.join(tools.get_current_path(__file__), "openssl", "apps")) my_module.add_path(os.path.join(tools.get_current_path(__file__), "openssl/crypto")) my_module.add_path(os.path.join(tools.get_current_path(__file__), "openssl")) diff --git a/lutin_openssl-apps-errstr.py b/lutin_openssl-apps-errstr.py index e7e6637..eed0f67 100644 --- a/lutin_openssl-apps-errstr.py +++ b/lutin_openssl-apps-errstr.py @@ -40,7 +40,7 @@ def create(target, module_name): 'openssl/apps/errstr.c', ]) my_module.compile_version("c", 1989, gnu=True) - my_module.add_module_depend('openssl') + my_module.add_depend('openssl') my_module.add_path(os.path.join(tools.get_current_path(__file__), "openssl", "apps")) my_module.add_path(os.path.join(tools.get_current_path(__file__), "openssl/crypto")) my_module.add_path(os.path.join(tools.get_current_path(__file__), "openssl")) diff --git a/lutin_openssl-apps-gendh.py b/lutin_openssl-apps-gendh.py index e1d1098..0d52f95 100644 --- a/lutin_openssl-apps-gendh.py +++ b/lutin_openssl-apps-gendh.py @@ -39,7 +39,7 @@ def create(target, module_name): 'openssl/apps/gendh.c', ]) my_module.compile_version("c", 1989, gnu=True) - my_module.add_module_depend('openssl') + my_module.add_depend('openssl') my_module.add_path(os.path.join(tools.get_current_path(__file__), "openssl", "apps")) my_module.add_path(os.path.join(tools.get_current_path(__file__), "openssl/crypto")) my_module.add_path(os.path.join(tools.get_current_path(__file__), "openssl")) diff --git a/lutin_openssl-apps-gendsa.py b/lutin_openssl-apps-gendsa.py index 93a5ed1..fef5f62 100644 --- a/lutin_openssl-apps-gendsa.py +++ b/lutin_openssl-apps-gendsa.py @@ -39,7 +39,7 @@ def create(target, module_name): 'openssl/apps/gendsa.c', ]) my_module.compile_version("c", 1989, gnu=True) - my_module.add_module_depend('openssl') + my_module.add_depend('openssl') my_module.add_path(os.path.join(tools.get_current_path(__file__), "openssl", "apps")) my_module.add_path(os.path.join(tools.get_current_path(__file__), "openssl/crypto")) my_module.add_path(os.path.join(tools.get_current_path(__file__), "openssl")) diff --git a/lutin_openssl-apps-genrsa.py b/lutin_openssl-apps-genrsa.py index f3c33c4..01e4e3f 100644 --- a/lutin_openssl-apps-genrsa.py +++ b/lutin_openssl-apps-genrsa.py @@ -39,7 +39,7 @@ def create(target, module_name): 'openssl/apps/genrsa.c', ]) my_module.compile_version("c", 1989, gnu=True) - my_module.add_module_depend('openssl') + my_module.add_depend('openssl') my_module.add_path(os.path.join(tools.get_current_path(__file__), "openssl", "apps")) my_module.add_path(os.path.join(tools.get_current_path(__file__), "openssl/crypto")) my_module.add_path(os.path.join(tools.get_current_path(__file__), "openssl")) diff --git a/lutin_openssl-apps-passwd.py b/lutin_openssl-apps-passwd.py index 1fc801d..a438ad7 100644 --- a/lutin_openssl-apps-passwd.py +++ b/lutin_openssl-apps-passwd.py @@ -39,7 +39,7 @@ def create(target, module_name): 'openssl/apps/passwd.c', ]) my_module.compile_version("c", 1989, gnu=True) - my_module.add_module_depend('openssl') + my_module.add_depend('openssl') my_module.add_path(os.path.join(tools.get_current_path(__file__), "openssl", "apps")) my_module.add_path(os.path.join(tools.get_current_path(__file__), "openssl/crypto")) my_module.add_path(os.path.join(tools.get_current_path(__file__), "openssl")) diff --git a/lutin_openssl-apps-pkcs7.py b/lutin_openssl-apps-pkcs7.py index 6a9e828..333f403 100644 --- a/lutin_openssl-apps-pkcs7.py +++ b/lutin_openssl-apps-pkcs7.py @@ -39,7 +39,7 @@ def create(target, module_name): 'openssl/apps/pkcs7.c', ]) my_module.compile_version("c", 1989, gnu=True) - my_module.add_module_depend('openssl') + my_module.add_depend('openssl') my_module.add_path(os.path.join(tools.get_current_path(__file__), "openssl", "apps")) my_module.add_path(os.path.join(tools.get_current_path(__file__), "openssl/crypto")) my_module.add_path(os.path.join(tools.get_current_path(__file__), "openssl")) diff --git a/lutin_openssl-apps-req.py b/lutin_openssl-apps-req.py index a015d9e..c5955ff 100644 --- a/lutin_openssl-apps-req.py +++ b/lutin_openssl-apps-req.py @@ -39,7 +39,7 @@ def create(target, module_name): 'openssl/apps/req.c', ]) my_module.compile_version("c", 1989, gnu=True) - my_module.add_module_depend('openssl') + my_module.add_depend('openssl') my_module.add_path(os.path.join(tools.get_current_path(__file__), "openssl", "apps")) my_module.add_path(os.path.join(tools.get_current_path(__file__), "openssl/crypto")) my_module.add_path(os.path.join(tools.get_current_path(__file__), "openssl")) diff --git a/lutin_openssl-apps-rsa.py b/lutin_openssl-apps-rsa.py index 5e08f39..5800ad7 100644 --- a/lutin_openssl-apps-rsa.py +++ b/lutin_openssl-apps-rsa.py @@ -39,7 +39,7 @@ def create(target, module_name): 'openssl/apps/rsa.c', ]) my_module.compile_version("c", 1989, gnu=True) - my_module.add_module_depend('openssl') + my_module.add_depend('openssl') my_module.add_path(os.path.join(tools.get_current_path(__file__), "openssl", "apps")) my_module.add_path(os.path.join(tools.get_current_path(__file__), "openssl/crypto")) my_module.add_path(os.path.join(tools.get_current_path(__file__), "openssl")) diff --git a/lutin_openssl-apps-rsautl.py b/lutin_openssl-apps-rsautl.py index 9b86e68..bbe2b8b 100644 --- a/lutin_openssl-apps-rsautl.py +++ b/lutin_openssl-apps-rsautl.py @@ -39,7 +39,7 @@ def create(target, module_name): 'openssl/apps/rsautl.c', ]) my_module.compile_version("c", 1989, gnu=True) - my_module.add_module_depend('openssl') + my_module.add_depend('openssl') my_module.add_path(os.path.join(tools.get_current_path(__file__), "openssl", "apps")) my_module.add_path(os.path.join(tools.get_current_path(__file__), "openssl/crypto")) my_module.add_path(os.path.join(tools.get_current_path(__file__), "openssl")) diff --git a/lutin_openssl-apps-verify.py b/lutin_openssl-apps-verify.py index f7746ef..634a46a 100644 --- a/lutin_openssl-apps-verify.py +++ b/lutin_openssl-apps-verify.py @@ -38,7 +38,7 @@ def create(target, module_name): 'openssl/apps/verify.c', ]) my_module.compile_version("c", 1989, gnu=True) - my_module.add_module_depend('openssl') + my_module.add_depend('openssl') my_module.add_path(os.path.join(tools.get_current_path(__file__), "openssl", "apps")) my_module.add_path(os.path.join(tools.get_current_path(__file__), "openssl/crypto")) my_module.add_path(os.path.join(tools.get_current_path(__file__), "openssl")) diff --git a/lutin_openssl-apps.py b/lutin_openssl-apps.py index 43ebd40..3824dd6 100644 --- a/lutin_openssl-apps.py +++ b/lutin_openssl-apps.py @@ -63,7 +63,7 @@ def create(target, module_name): 'openssl/apps/openssl.c' """ my_module.compile_version("c", 1989, gnu=True) - my_module.add_module_depend('openssl') + my_module.add_depend('openssl') my_module.add_path(os.path.join(tools.get_current_path(__file__), "openssl", "apps")) my_module.add_path(os.path.join(tools.get_current_path(__file__), "openssl/crypto")) my_module.add_path(os.path.join(tools.get_current_path(__file__), "openssl")) diff --git a/lutin_openssl.py b/lutin_openssl.py index f8dc5f9..8888d38 100644 --- a/lutin_openssl.py +++ b/lutin_openssl.py @@ -94,11 +94,11 @@ def create(target, module_name): ], destination_path="openssl") - my_module.compile_flags('c', [ + my_module.add_flag('c', [ '-DOPENSSL_NO_ASM', ]) my_module.compile_version("c", 1989, gnu=True) - my_module.add_module_depend('crypto') + my_module.add_depend('crypto') my_module.add_path(os.path.join(tools.get_current_path(__file__), "openssl")) my_module.add_path(os.path.join(tools.get_current_path(__file__), "openssl/crypto")) my_module.add_path(os.path.join(tools.get_current_path(__file__), "openssl/ssl"))