web
/
surfer
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

next try; refs #22

Browse Source
master
Marc Wäckerlin 14 years ago
parent daa56586f9
commit 0f92a587e1
5 changed files with 98 additions and 83 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      openssl-act-engine/configure.in
  2. 2
      openssl-act-engine/src/CertificateList.cpp
  3. 2
      openssl-act-engine/src/engine_sct.cpp
  4. 16
      openssl-act-engine/src/makefile.am
  5. 157
      qt/patch/qt-sources-for-mingw-cross-compile.diff

4
openssl-act-engine/configure.in
Unescape View File

@ -70,7 +70,9 @@ case ${host} in
;; ;;
esac 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" (i386-apple-darwin*) LDFLAGS+=" -L../../actlibrary/MacOSX-10.5-x86_64/Release"
;; ;;

2
openssl-act-engine/src/CertificateList.cpp
Unescape View File

@ -22,7 +22,7 @@
#include <sstream> #include <sstream>
#include <string> #include <string>
#if defined win32 || defined linux #if defined WIN32 || defined linux
#define CONST_OR_NOTCONST const #define CONST_OR_NOTCONST const
#else #else
#define CONST_OR_NOTCONST #define CONST_OR_NOTCONST

2
openssl-act-engine/src/engine_sct.cpp
Unescape View File

@ -28,7 +28,7 @@
#include <openssl/ssl.h> #include <openssl/ssl.h>
#if defined win32 || defined linux #if defined WIN32 || defined linux
#define CONST_OR_NOTCONST const #define CONST_OR_NOTCONST const
#else #else
#define CONST_OR_NOTCONST #define CONST_OR_NOTCONST

16
openssl-act-engine/src/makefile.am
Unescape View File

@ -19,9 +19,21 @@ libengine_act_la_SOURCES = engine_front.cpp engine_sct.cpp \
CardObject.cpp CardKey.cpp SlotList.cpp \ CardObject.cpp CardKey.cpp SlotList.cpp \
CertificateList.cpp SecOpGuard.cpp CertificateList.cpp SecOpGuard.cpp
libengine_act_la_LDFLAGS = -version-info @LIB_VERSION@ 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_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 MAINTAINERCLEANFILES = makefile.in

157
qt/patch/qt-sources-for-mingw-cross-compile.diff
Unescape View File

@ -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 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 2010-11-06 02:55:11.000000000 +0100 --- 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-mingw/mkspecs/win32-g++/qmake.conf 2011-02-04 12:30:53.873211904 +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 @@ @@ -7,6 +7,7 @@
MAKEFILE_GENERATOR = MINGW MAKEFILE_GENERATOR = MINGW
TEMPLATE = app TEMPLATE = app
CONFIG += qt warn_on release link_prl copy_dir_files debug_and_release debug_and_release_target precompile_header CONFIG += qt warn_on release link_prl copy_dir_files debug_and_release debug_and_release_target precompile_header
+CONFIG += rtti exceptions +CONFIG += rtti exceptions
QT += core gui QT += core gui
DEFINES += UNICODE QT_LARGEFILE_SUPPORT DEFINES += UNICODE QT_LARGEFILE_SUPPORT
QMAKE_COMPILER_DEFINES += __GNUC__ WIN32 QMAKE_COMPILER_DEFINES += __GNUC__ WIN32
@@ -14,7 +15,7 @@ @@ -14,7 +15,7 @@
QMAKE_EXT_OBJ = .o QMAKE_EXT_OBJ = .o
QMAKE_EXT_RES = _res.o QMAKE_EXT_RES = _res.o
-QMAKE_CC = gcc -QMAKE_CC = gcc
+QMAKE_CC = i586-mingw32msvc-gcc +QMAKE_CC = i586-mingw32msvc-gcc
QMAKE_LEX = flex QMAKE_LEX = flex
QMAKE_LEXFLAGS = QMAKE_LEXFLAGS =
QMAKE_YACC = byacc QMAKE_YACC = byacc
@@ -27,7 +28,7 @@ @@ -27,7 +28,7 @@
QMAKE_CFLAGS_DEBUG = -g QMAKE_CFLAGS_DEBUG = -g
QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses
-QMAKE_CXX = g++ -QMAKE_CXX = g++
+QMAKE_CXX = i586-mingw32msvc-g++ +QMAKE_CXX = i586-mingw32msvc-g++
QMAKE_CXXFLAGS = $$QMAKE_CFLAGS QMAKE_CXXFLAGS = $$QMAKE_CFLAGS
QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS
QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON
@@ -41,7 +42,10 @@ @@ -41,7 +42,10 @@
QMAKE_CXXFLAGS_EXCEPTIONS_ON = -fexceptions -mthreads QMAKE_CXXFLAGS_EXCEPTIONS_ON = -fexceptions -mthreads
QMAKE_CXXFLAGS_EXCEPTIONS_OFF = -fno-exceptions QMAKE_CXXFLAGS_EXCEPTIONS_OFF = -fno-exceptions
-QMAKE_INCDIR = -QMAKE_INCDIR =
+#INCLUDEPATH += /usr/i586-mingw32msvc/include +#INCLUDEPATH += /usr/i586-mingw32msvc/include
+#INCLUDEPATH += /opt/local/i586-mingw32msvc/include +#INCLUDEPATH += /opt/local/i586-mingw32msvc/include
+QMAKE_INCDIR = /opt/local/i586-mingw32msvc/include +QMAKE_INCDIR = /opt/local/i586-mingw32msvc/include
+QMAKE_LIBDIR = /opt/local/i586-mingw32msvc/lib +QMAKE_LIBDIR = /opt/local/i586-mingw32msvc/lib
QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS]
QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS]
@@ -50,8 +54,8 @@ @@ -50,8 +54,8 @@
QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $obj $src QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $obj $src
QMAKE_RUN_CXX_IMP = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< QMAKE_RUN_CXX_IMP = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-QMAKE_LINK = g++ -QMAKE_LINK = g++
-QMAKE_LINK_C = gcc -QMAKE_LINK_C = gcc
+QMAKE_LINK = i586-mingw32msvc-g++ +QMAKE_LINK = i586-mingw32msvc-g++
+QMAKE_LINK_C = i586-mingw32msvc-gcc +QMAKE_LINK_C = i586-mingw32msvc-gcc
QMAKE_LFLAGS = -enable-stdcall-fixup -Wl,-enable-auto-import -Wl,-enable-runtime-pseudo-reloc QMAKE_LFLAGS = -enable-stdcall-fixup -Wl,-enable-auto-import -Wl,-enable-runtime-pseudo-reloc
QMAKE_LFLAGS_EXCEPTIONS_ON = -mthreads -Wl QMAKE_LFLAGS_EXCEPTIONS_ON = -mthreads -Wl
QMAKE_LFLAGS_EXCEPTIONS_OFF = QMAKE_LFLAGS_EXCEPTIONS_OFF =
@@ -76,32 +80,32 @@ @@ -76,32 +80,32 @@
MINGW_IN_SHELL = 1 MINGW_IN_SHELL = 1
QMAKE_DIR_SEP = / QMAKE_DIR_SEP = /
QMAKE_QMAKE ~= s,\\\\,/, QMAKE_QMAKE ~= s,\\\\,/,
- QMAKE_COPY = cp - QMAKE_COPY = cp
- QMAKE_COPY_DIR = xcopy /s /q /y /i - QMAKE_COPY_DIR = xcopy /s /q /y /i
+ QMAKE_COPY = cp -r + QMAKE_COPY = cp -r
+ QMAKE_COPY_DIR = cp -r + QMAKE_COPY_DIR = cp -r
QMAKE_MOVE = mv QMAKE_MOVE = mv
QMAKE_DEL_FILE = rm QMAKE_DEL_FILE = rm
- QMAKE_MKDIR = mkdir - QMAKE_MKDIR = mkdir
+ QMAKE_MKDIR = mkdir -p + QMAKE_MKDIR = mkdir -p
QMAKE_DEL_DIR = rmdir QMAKE_DEL_DIR = rmdir
QMAKE_CHK_DIR_EXISTS = test -d QMAKE_CHK_DIR_EXISTS = test -d
} else { } else {
- QMAKE_COPY = copy /y - QMAKE_COPY = copy /y
- QMAKE_COPY_DIR = xcopy /s /q /y /i - QMAKE_COPY_DIR = xcopy /s /q /y /i
- QMAKE_MOVE = move - QMAKE_MOVE = move
- QMAKE_DEL_FILE = del - QMAKE_DEL_FILE = del
- QMAKE_MKDIR = mkdir - QMAKE_MKDIR = mkdir
+ QMAKE_COPY = cp -r + QMAKE_COPY = cp -r
+ QMAKE_COPY_DIR = cp -fr + QMAKE_COPY_DIR = cp -fr
+ QMAKE_MOVE = mv + QMAKE_MOVE = mv
+ QMAKE_DEL_FILE = rm -r + QMAKE_DEL_FILE = rm -r
+ QMAKE_MKDIR = mkdir -p + QMAKE_MKDIR = mkdir -p
QMAKE_DEL_DIR = rmdir QMAKE_DEL_DIR = rmdir
- QMAKE_CHK_DIR_EXISTS = if not exist - QMAKE_CHK_DIR_EXISTS = if not exist
+ QMAKE_CHK_DIR_EXISTS = test -d + QMAKE_CHK_DIR_EXISTS = test -d
} }
-QMAKE_MOC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}moc.exe -QMAKE_MOC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}moc.exe
-QMAKE_UIC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}uic.exe -QMAKE_UIC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}uic.exe
-QMAKE_IDC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}idc.exe -QMAKE_IDC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}idc.exe
+QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_MOC = $$[QT_INSTALL_BINS]/moc
+QMAKE_UIC = $$[QT_INSTALL_BINS]/uic +QMAKE_UIC = $$[QT_INSTALL_BINS]/uic
+QMAKE_IDC = $$[QT_INSTALL_BINS]/idc +QMAKE_IDC = $$[QT_INSTALL_BINS]/idc
QMAKE_IDL = midl QMAKE_IDL = midl
-QMAKE_LIB = ar -ru -QMAKE_LIB = ar -ru
-QMAKE_RC = windres -QMAKE_RC = windres
+QMAKE_LIB = i586-mingw32msvc-ar -ru +QMAKE_LIB = i586-mingw32msvc-ar -ru
+QMAKE_RC = i586-mingw32msvc-windres +QMAKE_RC = i586-mingw32msvc-windres
QMAKE_ZIP = zip -r -9 QMAKE_ZIP = zip -r -9
-QMAKE_STRIP = strip -QMAKE_STRIP = strip
+QMAKE_STRIP = i586-mingw32msvc-strip +QMAKE_STRIP = i586-mingw32msvc-strip
QMAKE_STRIPFLAGS_LIB += --strip-unneeded QMAKE_STRIPFLAGS_LIB += --strip-unneeded
load(qt_config) 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 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 2010-11-06 02:55:18.000000000 +0100 --- 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-mingw/src/corelib/codecs/codecs.pri 2011-02-01 08:42:37.180300856 +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 @@ @@ -19,7 +19,7 @@
codecs/qutfcodec.cpp \ codecs/qutfcodec.cpp \
codecs/qtextcodecplugin.cpp codecs/qtextcodecplugin.cpp
-unix { -unix {
+#unix { +#unix {
SOURCES += codecs/qfontlaocodec.cpp SOURCES += codecs/qfontlaocodec.cpp
contains(QT_CONFIG,iconv) { contains(QT_CONFIG,iconv) {
@@ -55,5 +55,5 @@ @@ -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 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 Nur in qt-everywhere-opensource-src-4.7.1-win32/src/corelib/codecs: codecs.pri~.
--- qt-everywhere-opensource-src-4.7.1/src/corelib/tools/qlocale.cpp 2010-11-06 02:55:19.000000000 +0100 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-mingw/src/corelib/tools/qlocale.cpp 2011-01-31 15:34:42.765470002 +0100 --- 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 @@ @@ -6624,18 +6624,18 @@
{ {
// Some values of the floating-point control word can cause _qdtoa to crash with an underflow. // Some values of the floating-point control word can cause _qdtoa to crash with an underflow.

Write Preview
Loading…
Cancel
Save