diff options
Diffstat (limited to 'sysutils/mstflint/files')
| -rw-r--r-- | sysutils/mstflint/files/extrat-patch-configure.ac | 16 | ||||
| -rw-r--r-- | sysutils/mstflint/files/extrat-patch-mlxarchive_Makefile.am | 17 |
2 files changed, 13 insertions, 20 deletions
diff --git a/sysutils/mstflint/files/extrat-patch-configure.ac b/sysutils/mstflint/files/extrat-patch-configure.ac index e137935eaf62..c7c70df677ab 100644 --- a/sysutils/mstflint/files/extrat-patch-configure.ac +++ b/sysutils/mstflint/files/extrat-patch-configure.ac @@ -1,6 +1,6 @@ ---- configure.ac.orig 2020-01-05 16:50:06.000000000 +0100 -+++ configure.ac 2020-01-09 00:15:46.179518000 +0100 -@@ -104,12 +104,10 @@ AC_ARG_ENABLE(fw-mgr, +--- configure.ac.orig 2022-02-21 15:07:33.000000000 +0100 ++++ configure.ac 2022-02-21 15:08:50.061537000 +0100 +@@ -114,12 +114,10 @@ AC_ARG_ENABLE(fw-mgr, [enable_fw_mgr="no"]) AC_MSG_RESULT($enable_fw_mgr) if test "x$enable_fw_mgr" = "xyes"; then @@ -13,7 +13,7 @@ fi # Adabe -@@ -133,8 +131,6 @@ if test "x$enable_adb_generic_tools" = "xyes"; then +@@ -143,8 +141,6 @@ if test "x$enable_adb_generic_tools" = "xyes"; then AC_LANG_POP([C++]) fi @@ -22,10 +22,10 @@ AM_CONDITIONAL(ENABLE_FWMGR, [test "x$enable_fw_mgr" = "xyes" ]) AC_SUBST(ENABLE_FWMGR) -@@ -352,11 +348,6 @@ AS_IF([test "x$enable_cs" = "xyes" || test "x$enable_o - AS_IF([test "x$enable_openssl" = "xyes"], [ - AC_CONFIG_FILES(mlxsign_lib/Makefile) - ]) +@@ -370,11 +366,6 @@ AS_IF([test "x$enable_openssl" = "xyes"], [ + [AC_CONFIG_FILES(mlxsign_lib/Makefile)], + [AC_MSG_ERROR([Required OpenSSL version >= $MIN_OPENSSL_VER (or use --disable-openssl)])]) + ]) - -if [ test "x$enable_openssl" = "xno" ] && \ - [ test "x$enable_fw_mgr" = "xyes" ] ; then diff --git a/sysutils/mstflint/files/extrat-patch-mlxarchive_Makefile.am b/sysutils/mstflint/files/extrat-patch-mlxarchive_Makefile.am index e797e8d9ee5d..2a953c64007d 100644 --- a/sysutils/mstflint/files/extrat-patch-mlxarchive_Makefile.am +++ b/sysutils/mstflint/files/extrat-patch-mlxarchive_Makefile.am @@ -1,6 +1,6 @@ ---- mlxarchive/Makefile.am.orig 2020-01-05 16:50:06.000000000 +0100 -+++ mlxarchive/Makefile.am 2020-01-09 14:15:21.405697000 +0100 -@@ -20,8 +20,6 @@ DEV_MGT_DIR = $(USER_DIR)/dev_mgt +--- mlxarchive/Makefile.am.orig 2021-11-30 12:55:03.000000000 +0100 ++++ mlxarchive/Makefile.am 2022-02-21 15:13:48.562527000 +0100 +@@ -40,8 +40,6 @@ DEV_MGT_DIR = $(USER_DIR)/dev_mgt TOOLS_CRYPTO_DIR = $(USER_DIR)/tools_crypto CMDIF_DIR = $(USER_DIR)/cmdif @@ -9,16 +9,9 @@ INCLUDES = $(JSON_CFLAGS) -I. \ -I$(USER_DIR) -I$(USER_DIR)/libmfa \ -I$(MTCR_DIR) -I$(USER_DIR)/include/mtcr_ul \ -@@ -64,13 +62,13 @@ mstarchive_LDADD = libmstarchive.a\ - $(USER_DIR)/xz_utils/libxz_utils.a\ - $(USER_DIR)/ext_libs/minixz/libminixz.a\ - $(USER_DIR)/xz_utils/libxz_utils.a \ -- $(CURL_LIBS)\ - -lboost_regex -lboost_filesystem -lboost_system \ - -llzma -lm $(LIBSTD_CPP) ${LDL} - +@@ -91,6 +89,7 @@ mstarchive_LDADD = libmstarchive.a\ if ENABLE_OPENSSL - mstarchive_LDADD += $(top_srcdir)/mlxsign_lib/libmlxsign.a -lcrypto + mstarchive_LDADD += $(top_srcdir)/mlxsign_lib/libmlxsign.a -lcrypto -lssl else +AM_CXXFLAGS += -DNO_OPEN_SSL endif |