Fix issue with make install and compilation error with flag --enable-…

…qat_for_openssl_102 Change-Id: I9b1393e85b10bc9e3bbd7d7ced9581fba5cf108c Signed-off-by: Steve Linsell <stevenx.linsell@intel.com>
intel · Jul 25, 2017 · 35a430b · 35a430b
1 parent 17a1808
commit 35a430b
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 10 deletions.
diff --git a/.tools/Makefile.am b/.tools/Makefile.am
@@ -103,12 +103,23 @@ libqat_la_LDFLAGS = $(QAT_SHARED_LIB_DEPS_LD) \
 					$(QAT_SHARED_LIB_DEPS_DRIVER) \
 					$(QAT_SHARED_LIB_DEPS_QAE_MEM)
 
+if QAT_OPENSSL_102
+ ENGINE_LIB = $(with_openssl_install_dir)/lib/engines/libqat.so
+else
+ ENGINE_LIB = $(with_openssl_install_dir)/lib/engines-1.1/qat.so
+endif
+
 mostlyclean-generic:
 	-rm -f *.obj lib tags core .pure .nfs* \
 	*.old *.bak fluff *.so *.sl *.dll
 
-	-rm -f $(with_openssl_install_dir)/lib/engines-1.1/qat.so
+	-rm -f $(ENGINE_LIB)
 
+if QAT_OPENSSL_102
+MAKE = rm -rf e_qat_err* && perl $(with_openssl_dir)/util/mkerr.pl -conf e_qat.ec \
+       -rebuild -reindex -nostatic -write $(libqat_la_SOURCES) && make
+
+else
 if QAT_OPENSSL_MASTER
 MAKE = perl $(with_openssl_dir)/util/mkerr.pl -conf e_qat.ec \
        -rebuild -reindex $(libqat_la_SOURCES) && make
@@ -117,7 +128,7 @@ else
 MAKE = perl $(with_openssl_dir)/util/mkerr.pl -conf e_qat.ec \
        -rebuild -reindex -nostatic -write $(libqat_la_SOURCES) && make
 endif
+endif
 
 install-data-am:
-	-cp -f $(prefix)/lib/libqat.so \
-	$(with_openssl_install_dir)/lib/engines-1.1/qat.so
+	-cp -f $(prefix)/lib/libqat.so $(ENGINE_LIB)
diff --git a/.tools/Makefile.in b/.tools/Makefile.in
@@ -391,11 +391,16 @@ libqat_la_LDFLAGS = $(QAT_SHARED_LIB_DEPS_LD) \
 					$(QAT_SHARED_LIB_DEPS_DRIVER) \
 					$(QAT_SHARED_LIB_DEPS_QAE_MEM)
 
-@QAT_OPENSSL_MASTER_FALSE@MAKE = perl $(with_openssl_dir)/util/mkerr.pl -conf e_qat.ec \
-@QAT_OPENSSL_MASTER_FALSE@       -rebuild -reindex -nostatic -write $(libqat_la_SOURCES) && make
+@QAT_OPENSSL_102_FALSE@ENGINE_LIB = $(with_openssl_install_dir)/lib/engines-1.1/qat.so
+@QAT_OPENSSL_102_TRUE@ENGINE_LIB = $(with_openssl_install_dir)/lib/engines/libqat.so
+@QAT_OPENSSL_102_FALSE@@QAT_OPENSSL_MASTER_FALSE@MAKE = perl $(with_openssl_dir)/util/mkerr.pl -conf e_qat.ec \
+@QAT_OPENSSL_102_FALSE@@QAT_OPENSSL_MASTER_FALSE@       -rebuild -reindex -nostatic -write $(libqat_la_SOURCES) && make
 
-@QAT_OPENSSL_MASTER_TRUE@MAKE = perl $(with_openssl_dir)/util/mkerr.pl -conf e_qat.ec \
-@QAT_OPENSSL_MASTER_TRUE@       -rebuild -reindex $(libqat_la_SOURCES) && make
+@QAT_OPENSSL_102_FALSE@@QAT_OPENSSL_MASTER_TRUE@MAKE = perl $(with_openssl_dir)/util/mkerr.pl -conf e_qat.ec \
+@QAT_OPENSSL_102_FALSE@@QAT_OPENSSL_MASTER_TRUE@       -rebuild -reindex $(libqat_la_SOURCES) && make
+
+@QAT_OPENSSL_102_TRUE@MAKE = rm -rf e_qat_err* && perl $(with_openssl_dir)/util/mkerr.pl -conf e_qat.ec \
+@QAT_OPENSSL_102_TRUE@       -rebuild -reindex -nostatic -write $(libqat_la_SOURCES) && make
 
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-am
@@ -892,11 +897,10 @@ mostlyclean-generic:
 	-rm -f *.obj lib tags core .pure .nfs* \
 	*.old *.bak fluff *.so *.sl *.dll
 
-	-rm -f $(with_openssl_install_dir)/lib/engines-1.1/qat.so
+	-rm -f $(ENGINE_LIB)
 
 install-data-am:
-	-cp -f $(prefix)/lib/libqat.so \
-	$(with_openssl_install_dir)/lib/engines-1.1/qat.so
+	-cp -f $(prefix)/lib/libqat.so $(ENGINE_LIB)
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

diff --git a/qat_aux.c b/qat_aux.c
@@ -57,6 +57,8 @@
 
 #include "qat_aux.h"
 
+int qatPerformOpRetries = 0;
+
 ASYNC_JOB *ASYNC_get_current_job(void)
 {
     return NULL;