fix encryption builds

- use openssl 1.0 for semla (to not conflict with the msys/mingw based one) - cleanup some link flags for libOpenModelicaCompiler.dll
OpenModelica · May 5, 2020 · 8c42856 · 8c42856
1 parent 1a3d110
commit 8c42856
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/OMCompiler/Compiler/boot/Makefile.omdev.mingw b/OMCompiler/Compiler/boot/Makefile.omdev.mingw
@@ -21,7 +21,7 @@ endif
 TOP_DIR=../../
 OMHOME=$(OMBUILDDIR)
 ifeq ($(OMENCRYPTION),yes)
-OMENCRYPTIONLIBS=-L$(OMBUILDDIR)/lib/omc/SEMLA -ltool -lssl -lcrypto -lcrypt32 -lgdi32 -lws2_32
+OMENCRYPTIONLIBS=-L$(OMBUILDDIR)/lib/omc/SEMLA -ltool
 else
 OMENCRYPTIONLIBS=
 endif
@@ -35,7 +35,7 @@ LDFLAGS=-L./ $(LOMPARSE) $(LCOMPILERRUNTIME) -L"$(OMHOME)/lib/omc" \
 -lgfortran -ltre -lomniORB420_rt -lomnithread40_rt \
 -lzmq \
 $(OMENCRYPTIONLIBS) \
--Wl,-Bstatic -lcurl -lidn -lrtmp -lssh2 -lssl -lcrypto -lgdi32 -lwldap32 -lz -lws2_32 -lgnutls -ltasn1 -lhogweed -lgmp -lnettle -Wl,-Bdynamic -lcrypt32 -lintl -lp11-kit -lwinmm -lgdi32 \
+-Wl,-Bstatic -lcurl -lidn -lrtmp -lssh2 -lssl -lcrypto -lwldap32 -lz -lws2_32 -lgnutls -ltasn1 -lhogweed -lgmp -lnettle -Wl,-Bdynamic -lcrypt32 -lintl -lp11-kit -lwinmm -lgdi32 \
 $(EXTRA_LD_FLAGS)
 
 FMILIB = -L$(TOP_DIR)/3rdParty/FMIL/install/lib -lfmilib

diff --git a/OMCompiler/Makefile.common b/OMCompiler/Makefile.common
@@ -72,12 +72,14 @@ ifeq ($(OMENCRYPTION),yes)
 semla:
 	mkdir -p ../OMEncryption/3rdParty/SEMLA/build
 	# Build SEMLA
-	(cd ../OMEncryption/3rdParty/SEMLA/build && test -f Makefile || $(CMAKE) -DCMAKE_COLOR_MAKEFILE:Bool=OFF -DCMAKE_INSTALL_PREFIX:String=../install ../src -G $(CMAKE_TARGET))
+	(cd ../OMEncryption/3rdParty/SEMLA/build && test -f Makefile || $(CMAKE) -DCMAKE_COLOR_MAKEFILE:Bool=OFF -DUSE_OPENSSL_10_API:Bool=TRUE -DCMAKE_INSTALL_PREFIX:String=../install ../src -G $(CMAKE_TARGET))
 	(cd ../OMEncryption/3rdParty/SEMLA/build && $(CMAKE) --build .)
 	(cd ../OMEncryption/3rdParty/SEMLA/build && $(CMAKE) --build . --target install)
 	mkdir -p $(builddir_lib)/omc/SEMLA/LVE
 	cp -pPR ../OMEncryption/3rdParty/SEMLA/install/bin/* $(builddir_lib)/omc/SEMLA
-	cp -pPR ../OMEncryption/3rdParty/SEMLA/install/lib/* $(builddir_lib)/omc/SEMLA
+	cp -pPR ../OMEncryption/3rdParty/SEMLA/install/lib/libtool.a $(builddir_lib)/omc/SEMLA
+	cp -pPR ../OMEncryption/3rdParty/SEMLA/install/lib/libcrypto.a $(builddir_lib)/omc/SEMLA/libcrypto_semla.a
+	cp -pPR ../OMEncryption/3rdParty/SEMLA/install/lib/libssl.a $(builddir_lib)/omc/SEMLA/libssl_semla.a
 
 semla-clean:
 	rm -rf ../OMEncryption/3rdParty/SEMLA/build