From 0f92a587e142b14d98568f204c647b7c6122a1a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= Date: Mon, 7 Feb 2011 09:20:36 +0000 Subject: [PATCH] next try; refs #22 --- openssl-act-engine/configure.in | 4 +- openssl-act-engine/src/CertificateList.cpp | 2 +- openssl-act-engine/src/engine_sct.cpp | 2 +- openssl-act-engine/src/makefile.am | 16 +- .../qt-sources-for-mingw-cross-compile.diff | 157 +++++++++--------- 5 files changed, 98 insertions(+), 83 deletions(-) diff --git a/openssl-act-engine/configure.in b/openssl-act-engine/configure.in index ebeb403..6a7d2e4 100644 --- a/openssl-act-engine/configure.in +++ b/openssl-act-engine/configure.in @@ -70,7 +70,9 @@ case ${host} in ;; esac ;; - (*mingw*) LDFLAGS+=" -L../../actlibrary/mingw32-i586/Release" + (*mingw*) + LDFLAGS+=" -L../../actlibrary/mingw32-i586/Release" + AM_CONDITIONAL(WIN32, true) ;; (i386-apple-darwin*) LDFLAGS+=" -L../../actlibrary/MacOSX-10.5-x86_64/Release" ;; diff --git a/openssl-act-engine/src/CertificateList.cpp b/openssl-act-engine/src/CertificateList.cpp index 998b2f1..b7b11b3 100644 --- a/openssl-act-engine/src/CertificateList.cpp +++ b/openssl-act-engine/src/CertificateList.cpp @@ -22,7 +22,7 @@ #include #include -#if defined win32 || defined linux +#if defined WIN32 || defined linux #define CONST_OR_NOTCONST const #else #define CONST_OR_NOTCONST diff --git a/openssl-act-engine/src/engine_sct.cpp b/openssl-act-engine/src/engine_sct.cpp index c7ff589..1e7c15a 100644 --- a/openssl-act-engine/src/engine_sct.cpp +++ b/openssl-act-engine/src/engine_sct.cpp @@ -28,7 +28,7 @@ #include -#if defined win32 || defined linux +#if defined WIN32 || defined linux #define CONST_OR_NOTCONST const #else #define CONST_OR_NOTCONST diff --git a/openssl-act-engine/src/makefile.am b/openssl-act-engine/src/makefile.am index 20344c5..e096d72 100644 --- a/openssl-act-engine/src/makefile.am +++ b/openssl-act-engine/src/makefile.am @@ -19,9 +19,21 @@ libengine_act_la_SOURCES = engine_front.cpp engine_sct.cpp \ CardObject.cpp CardKey.cpp SlotList.cpp \ CertificateList.cpp SecOpGuard.cpp libengine_act_la_LDFLAGS = -version-info @LIB_VERSION@ -libengine_act_la_LIBADD = -lact -ldl +libengine_act_la_LIBADD = -lact -ldl -lssl +if WIN32 +libengine_act_la_LIBADD += -lcrypto -lgdi32 +else +endif test_engine_SOURCES = test_engine.cpp -test_engine_LDADD = -lssl -lcrypto +test_engine_LDADD = .libs/libengine_act.a -lcrypto +if WIN32 +test_engine_LDADD += -lssl -lgdi32 +endif + +if WIN32 +libengine_act.dll: $(libengine_act_la_SOURCES:%.cpp=.libs/%.o) + $(CXX) -o $@ $^ --shared $(LDFLAGS) -lact -lcrypto -lgdi32 -lkernel32 -lcrypt32 +endif MAINTAINERCLEANFILES = makefile.in diff --git a/qt/patch/qt-sources-for-mingw-cross-compile.diff b/qt/patch/qt-sources-for-mingw-cross-compile.diff index 9896cdb..d2e49e6 100644 --- a/qt/patch/qt-sources-for-mingw-cross-compile.diff +++ b/qt/patch/qt-sources-for-mingw-cross-compile.diff @@ -1,113 +1,113 @@ -diff -ru qt-everywhere-opensource-src-4.7.1/mkspecs/win32-g++/qmake.conf qt-everywhere-opensource-src-4.7.1-mingw/mkspecs/win32-g++/qmake.conf ---- qt-everywhere-opensource-src-4.7.1/mkspecs/win32-g++/qmake.conf 2010-11-06 02:55:11.000000000 +0100 -+++ qt-everywhere-opensource-src-4.7.1-mingw/mkspecs/win32-g++/qmake.conf 2011-02-04 12:30:53.873211904 +0100 +diff -ru qt-everywhere-opensource-src-4.7.1/mkspecs/win32-g++/qmake.conf qt-everywhere-opensource-src-4.7.1-win32/mkspecs/win32-g++/qmake.conf +--- qt-everywhere-opensource-src-4.7.1/mkspecs/win32-g++/qmake.conf 2011-02-07 10:46:01.395271865 +0100 ++++ qt-everywhere-opensource-src-4.7.1-win32/mkspecs/win32-g++/qmake.conf 2011-02-07 10:52:55.911594518 +0100 @@ -7,6 +7,7 @@ - MAKEFILE_GENERATOR = MINGW - TEMPLATE = app - CONFIG += qt warn_on release link_prl copy_dir_files debug_and_release debug_and_release_target precompile_header + MAKEFILE_GENERATOR = MINGW + TEMPLATE = app + CONFIG += qt warn_on release link_prl copy_dir_files debug_and_release debug_and_release_target precompile_header +CONFIG += rtti exceptions - QT += core gui - DEFINES += UNICODE QT_LARGEFILE_SUPPORT + QT += core gui + DEFINES += UNICODE QT_LARGEFILE_SUPPORT QMAKE_COMPILER_DEFINES += __GNUC__ WIN32 @@ -14,7 +15,7 @@ QMAKE_EXT_OBJ = .o QMAKE_EXT_RES = _res.o --QMAKE_CC = gcc -+QMAKE_CC = i586-mingw32msvc-gcc - QMAKE_LEX = flex - QMAKE_LEXFLAGS = - QMAKE_YACC = byacc +-QMAKE_CC = gcc ++QMAKE_CC = i586-mingw32msvc-gcc + QMAKE_LEX = flex + QMAKE_LEXFLAGS = + QMAKE_YACC = byacc @@ -27,7 +28,7 @@ - QMAKE_CFLAGS_DEBUG = -g - QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses + QMAKE_CFLAGS_DEBUG = -g + QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses --QMAKE_CXX = g++ -+QMAKE_CXX = i586-mingw32msvc-g++ - QMAKE_CXXFLAGS = $$QMAKE_CFLAGS - QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS - QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON +-QMAKE_CXX = g++ ++QMAKE_CXX = i586-mingw32msvc-g++ + QMAKE_CXXFLAGS = $$QMAKE_CFLAGS + QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS + QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON @@ -41,7 +42,10 @@ QMAKE_CXXFLAGS_EXCEPTIONS_ON = -fexceptions -mthreads QMAKE_CXXFLAGS_EXCEPTIONS_OFF = -fno-exceptions --QMAKE_INCDIR = +-QMAKE_INCDIR = +#INCLUDEPATH += /usr/i586-mingw32msvc/include +#INCLUDEPATH += /opt/local/i586-mingw32msvc/include +QMAKE_INCDIR = /opt/local/i586-mingw32msvc/include +QMAKE_LIBDIR = /opt/local/i586-mingw32msvc/lib - QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] - QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] + QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] + QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] @@ -50,8 +54,8 @@ - QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $obj $src - QMAKE_RUN_CXX_IMP = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< + QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $obj $src + QMAKE_RUN_CXX_IMP = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< --QMAKE_LINK = g++ --QMAKE_LINK_C = gcc -+QMAKE_LINK = i586-mingw32msvc-g++ -+QMAKE_LINK_C = i586-mingw32msvc-gcc - QMAKE_LFLAGS = -enable-stdcall-fixup -Wl,-enable-auto-import -Wl,-enable-runtime-pseudo-reloc +-QMAKE_LINK = g++ +-QMAKE_LINK_C = gcc ++QMAKE_LINK = i586-mingw32msvc-g++ ++QMAKE_LINK_C = i586-mingw32msvc-gcc + QMAKE_LFLAGS = -enable-stdcall-fixup -Wl,-enable-auto-import -Wl,-enable-runtime-pseudo-reloc QMAKE_LFLAGS_EXCEPTIONS_ON = -mthreads -Wl QMAKE_LFLAGS_EXCEPTIONS_OFF = @@ -76,32 +80,32 @@ MINGW_IN_SHELL = 1 - QMAKE_DIR_SEP = / - QMAKE_QMAKE ~= s,\\\\,/, -- QMAKE_COPY = cp -- QMAKE_COPY_DIR = xcopy /s /q /y /i -+ QMAKE_COPY = cp -r -+ QMAKE_COPY_DIR = cp -r - QMAKE_MOVE = mv - QMAKE_DEL_FILE = rm -- QMAKE_MKDIR = mkdir -+ QMAKE_MKDIR = mkdir -p - QMAKE_DEL_DIR = rmdir + QMAKE_DIR_SEP = / + QMAKE_QMAKE ~= s,\\\\,/, +- QMAKE_COPY = cp +- QMAKE_COPY_DIR = xcopy /s /q /y /i ++ QMAKE_COPY = cp -r ++ QMAKE_COPY_DIR = cp -r + QMAKE_MOVE = mv + QMAKE_DEL_FILE = rm +- QMAKE_MKDIR = mkdir ++ QMAKE_MKDIR = mkdir -p + QMAKE_DEL_DIR = rmdir QMAKE_CHK_DIR_EXISTS = test -d } else { -- QMAKE_COPY = copy /y -- QMAKE_COPY_DIR = xcopy /s /q /y /i -- QMAKE_MOVE = move -- QMAKE_DEL_FILE = del -- QMAKE_MKDIR = mkdir -+ QMAKE_COPY = cp -r -+ QMAKE_COPY_DIR = cp -fr -+ QMAKE_MOVE = mv -+ QMAKE_DEL_FILE = rm -r -+ QMAKE_MKDIR = mkdir -p - QMAKE_DEL_DIR = rmdir -- QMAKE_CHK_DIR_EXISTS = if not exist -+ QMAKE_CHK_DIR_EXISTS = test -d +- QMAKE_COPY = copy /y +- QMAKE_COPY_DIR = xcopy /s /q /y /i +- QMAKE_MOVE = move +- QMAKE_DEL_FILE = del +- QMAKE_MKDIR = mkdir ++ QMAKE_COPY = cp -r ++ QMAKE_COPY_DIR = cp -fr ++ QMAKE_MOVE = mv ++ QMAKE_DEL_FILE = rm -r ++ QMAKE_MKDIR = mkdir -p + QMAKE_DEL_DIR = rmdir +- QMAKE_CHK_DIR_EXISTS = if not exist ++ QMAKE_CHK_DIR_EXISTS = test -d } --QMAKE_MOC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}moc.exe --QMAKE_UIC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}uic.exe --QMAKE_IDC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}idc.exe -+QMAKE_MOC = $$[QT_INSTALL_BINS]/moc -+QMAKE_UIC = $$[QT_INSTALL_BINS]/uic -+QMAKE_IDC = $$[QT_INSTALL_BINS]/idc +-QMAKE_MOC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}moc.exe +-QMAKE_UIC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}uic.exe +-QMAKE_IDC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}idc.exe ++QMAKE_MOC = $$[QT_INSTALL_BINS]/moc ++QMAKE_UIC = $$[QT_INSTALL_BINS]/uic ++QMAKE_IDC = $$[QT_INSTALL_BINS]/idc - QMAKE_IDL = midl --QMAKE_LIB = ar -ru --QMAKE_RC = windres -+QMAKE_LIB = i586-mingw32msvc-ar -ru -+QMAKE_RC = i586-mingw32msvc-windres - QMAKE_ZIP = zip -r -9 + QMAKE_IDL = midl +-QMAKE_LIB = ar -ru +-QMAKE_RC = windres ++QMAKE_LIB = i586-mingw32msvc-ar -ru ++QMAKE_RC = i586-mingw32msvc-windres + QMAKE_ZIP = zip -r -9 --QMAKE_STRIP = strip -+QMAKE_STRIP = i586-mingw32msvc-strip - QMAKE_STRIPFLAGS_LIB += --strip-unneeded +-QMAKE_STRIP = strip ++QMAKE_STRIP = i586-mingw32msvc-strip + QMAKE_STRIPFLAGS_LIB += --strip-unneeded load(qt_config) -diff -ru qt-everywhere-opensource-src-4.7.1/src/corelib/codecs/codecs.pri qt-everywhere-opensource-src-4.7.1-mingw/src/corelib/codecs/codecs.pri ---- qt-everywhere-opensource-src-4.7.1/src/corelib/codecs/codecs.pri 2010-11-06 02:55:18.000000000 +0100 -+++ qt-everywhere-opensource-src-4.7.1-mingw/src/corelib/codecs/codecs.pri 2011-02-01 08:42:37.180300856 +0100 +diff -ru qt-everywhere-opensource-src-4.7.1/src/corelib/codecs/codecs.pri qt-everywhere-opensource-src-4.7.1-win32/src/corelib/codecs/codecs.pri +--- qt-everywhere-opensource-src-4.7.1/src/corelib/codecs/codecs.pri 2011-02-07 10:48:52.396759040 +0100 ++++ qt-everywhere-opensource-src-4.7.1-win32/src/corelib/codecs/codecs.pri 2011-02-07 10:53:54.182322572 +0100 @@ -19,7 +19,7 @@ - codecs/qutfcodec.cpp \ - codecs/qtextcodecplugin.cpp + codecs/qutfcodec.cpp \ + codecs/qtextcodecplugin.cpp -unix { +#unix { - SOURCES += codecs/qfontlaocodec.cpp + SOURCES += codecs/qfontlaocodec.cpp contains(QT_CONFIG,iconv) { @@ -55,5 +55,5 @@ @@ -117,9 +117,10 @@ diff -ru qt-everywhere-opensource-src-4.7.1/src/corelib/codecs/codecs.pri qt-eve -} +#} symbian:LIBS += -lcharconv -diff -ru qt-everywhere-opensource-src-4.7.1/src/corelib/tools/qlocale.cpp qt-everywhere-opensource-src-4.7.1-mingw/src/corelib/tools/qlocale.cpp ---- qt-everywhere-opensource-src-4.7.1/src/corelib/tools/qlocale.cpp 2010-11-06 02:55:19.000000000 +0100 -+++ qt-everywhere-opensource-src-4.7.1-mingw/src/corelib/tools/qlocale.cpp 2011-01-31 15:34:42.765470002 +0100 +Nur in qt-everywhere-opensource-src-4.7.1-win32/src/corelib/codecs: codecs.pri~. +diff -ru qt-everywhere-opensource-src-4.7.1/src/corelib/tools/qlocale.cpp qt-everywhere-opensource-src-4.7.1-win32/src/corelib/tools/qlocale.cpp +--- qt-everywhere-opensource-src-4.7.1/src/corelib/tools/qlocale.cpp 2011-02-07 10:48:53.546970826 +0100 ++++ qt-everywhere-opensource-src-4.7.1-win32/src/corelib/tools/qlocale.cpp 2011-02-07 10:55:03.155020600 +0100 @@ -6624,18 +6624,18 @@ { // Some values of the floating-point control word can cause _qdtoa to crash with an underflow.