Kaydet (Commit) 93b228f4 authored tarafından Ivo Hinkelmann's avatar Ivo Hinkelmann

CWS-TOOLING: integrate CWS mingwport24

2009-09-13 02:15:22 +0200 tono  r276097 : i#105033: mingw port: accept incomplete deflib
2009-09-12 15:14:34 +0200 tono  r276096 : i#105012: mingw port: $(PATH) should be quoted
2009-09-12 15:12:49 +0200 tono  r276095 : i#105011: mingw port: berkeleydb fix
2009-09-12 15:11:39 +0200 tono  r276094 : i#105010: mingw port: decline libdl
2009-09-12 15:10:21 +0200 tono  r276093 : i#105009: mingw port: sal/osl/w32/file_dirvol.cxx needs ctype.h
2009-09-12 15:08:27 +0200 tono  r276092 : reverting changes to revise log messages
2009-09-12 11:55:48 +0200 tono  r276090 : i#105014: mingw port: change to latest w32api and mingw runtime
2009-09-12 11:52:12 +0200 tono  r276089 : i#105013: mingw port: fix gas error in call.s in bridges
2009-09-12 11:42:04 +0200 tono  r276088 : mingw port:  should be quoted
2009-09-12 11:35:35 +0200 tono  r276087 : mingw port: berkeleydb fix
2009-09-12 11:32:34 +0200 tono  r276086 : mingw port: decline libdl
2009-09-12 11:20:50 +0200 tono  r276085 : mingw port: sal/osl/w32/file_dirvol.cxx needs ctype.h
üst e89f2746
...@@ -56,116 +56,105 @@ ATL_INCLUDE_DIR=$(PSDK_HOME)$/include$/atl$/ ...@@ -56,116 +56,105 @@ ATL_INCLUDE_DIR=$(PSDK_HOME)$/include$/atl$/
DIRECTXSDK_INCLUDE_DIR=$(DIRECTXSDK_HOME)$/include$/ DIRECTXSDK_INCLUDE_DIR=$(DIRECTXSDK_HOME)$/include$/
FILES_TO_COPY_FROM_MINGW=excpt.h \ FILES_TO_COPY_FROM_MINGW= \
tchar.h excpt.h \
tchar.h
FILES_TO_COPY_FROM_W32API=amvideo.h \
bdatypes.h \ FILES_TO_COPY_FROM_W32API= \
imm.h \ amvideo.h \
oaidl.h \ basetyps.h \
objfwd.h \ oaidl.h \
objidl.h \ objidl.h \
uxtheme.h \ specstrings.h \
winbase.h \ uxtheme.h \
wininet.h \ winbase.h \
winnt.h \ windef.h \
winver.h \ wininet.h \
wtypes.h winver.h \
wtypes.h
FILES_TO_COPY_FROM_SYS=stat.h
FILES_TO_COPY_FROM_SYS= \
FILES_TO_COPY_FROM_PSDK=adoctint.h \ stat.h
adodef.h \
adoguids.h \ FILES_TO_COPY_FROM_PSDK= \
adoint.h \ adoctint.h \
bcrypt.h \ adodef.h \
commctrl.h \ adoguids.h \
control.h \ adoint.h \
filter.h \ bcrypt.h \
gdiplusbitmap.h \ commctrl.h \
gdiplusbrush.h \ control.h \
gdiplusenums.h \ dispex.h \
gdiplusfont.h \ filter.h \
gdiplusheaders.h \ gdiplusbitmap.h \
gdiplusimageattributes.h \ gdiplusbrush.h \
gdiplusimaging.h \ gdiplusenums.h \
gdiplusmatrix.h \ gdiplusfont.h \
gdipluspath.h \ gdiplusheaders.h \
gdipluspen.h \ gdiplusimageattributes.h \
gdiplusregion.h \ gdiplusimaging.h \
gdiplusstringformat.h \ gdiplusmatrix.h \
imagehlp.h \ gdipluspath.h \
inaddr.h \ gdipluspen.h \
intsafe.h \ gdiplusregion.h \
mapinls.h \ gdiplusstringformat.h \
mapiwin.h \ imm.h \
msdasc.h \ imagehlp.h \
msi.h \ mapiwin.h \
msiquery.h \ msdasc.h \
multimon.h \ msi.h \
ncrypt.h \ msiquery.h \
ntquery.h \ multimon.h \
ocidl.h \ ntquery.h \
oledb.h \ ocidl.h \
oleidl.h \ oleauto.h \
propidl.h \ olectl.h \
propkeydef.h \ oledb.h \
propsys.h \ oleidl.h \
qedit.h \ propidl.h \
shlobj.h \ propkeydef.h \
shobjidl.h \ propsys.h \
shtypes.h \ shlobj.h \
specstrings.h \ shobjidl.h \
specstrings_adt.h \ shtypes.h \
specstrings_strict.h \ sspi.h \
sspi.h \ strmif.h \
strmif.h \ strsafe.h \
strsafe.h \ structuredquery.h \
structuredquery.h \ urlmon.h \
urlmon.h \ wincrypt.h \
wincrypt.h \ winerror.h \
wingdi.h \ wingdi.h \
winsock2.h \ wintrust.h \
winuser.h \ winuser.h \
ws2def.h \ wspiapi.h \
ws2ipdef.h \ exdispid.h \
ws2tcpip.h \ dshow.h \
wspiapi.h \ gdiplus.h \
adoid.h \ msxml.h \
amstream.h \ ncrypt.h \
austream.h \ shlguid.h \
ddstream.h \ transact.h
dispex.h \
dshow.h \
exdispid.h \
gdiplus.h \
mmstream.h \
msxml.h \
oleauto.h \
olectl.h \
qos.h \
shlguid.h \
transact.h \
winerror.h
.IF "$(DISABLE_ATL)"=="" .IF "$(DISABLE_ATL)"==""
MINGWHEADER_ATL_PATCH_TARGET=$(MISC)$/mingwheader_atl_patch MINGWHEADER_ATL_PATCH_TARGET=$(MISC)$/mingwheader_atl_patch
MINGWHEADER_ATL_COPY_TARGET=$(MISC)$/mingwheader_atl_copy MINGWHEADER_ATL_COPY_TARGET=$(MISC)$/mingwheader_atl_copy
FILES_TO_COPY_FROM_ATL=atlbase.h \ FILES_TO_COPY_FROM_ATL= \
atlcom.h \ atlbase.h \
atlconv.h \ atlcom.h \
atlctl.h \ atlconv.h \
atlwin.h \ atlctl.h \
statreg.h atlwin.h \
statreg.h
.ENDIF .ENDIF
FILES_TO_COPY_FROM_DIRECTXSDK=dxtrans.h \ FILES_TO_COPY_FROM_DIRECTXSDK= \
d3dx9.h \ d3dtypes.h \
d3d.h \ d3dx9core.h \
d3dtypes.h \ d3dx9math.h \
d3dx9math.h \ d3dx9math.inl \
d3dx9math.inl \ dxtrans.h \
d3dx9core.h d3dx9.h
$(MISC)$/mingwheader_patch_all : $(MISC)$/mingwheader_patch $(MINGWHEADER_ATL_PATCH_TARGET) $(LB)$/libmsvcrt.a $(MISC)$/mingwheader_patch_all : $(MISC)$/mingwheader_patch $(MINGWHEADER_ATL_PATCH_TARGET) $(LB)$/libmsvcrt.a
...@@ -198,16 +187,20 @@ $(MINGWHEADER_ATL_COPY_TARGET): ...@@ -198,16 +187,20 @@ $(MINGWHEADER_ATL_COPY_TARGET):
$(LB)$/libmsvcrt.a: $(LB)$/libmsvcrt.a:
.IF "$(USE_MINGW)" == "cygwin" .IF "$(USE_MINGW)" == "cygwin"
$(WRAPCMD) nm -g --defined-only $(COMPATH)$/lib/mingw/libmsvcrt.a > $(MISC)$/msvcrt.nm $(COPY) $(COMPATH)$/lib/mingw/libmsvcrt.a $(LB)$/libmsvcrt_orig.a
.ELSE .ELSE
$(WRAPCMD) nm -g --defined-only $(COMPATH)$/lib/libmsvcrt.a > $(MISC)$/msvcrt.nm $(COPY) $(COMPATH)$/lib/libmsvcrt.a $(LB)$/libmsvcrt_orig.a
.ENDIF .ENDIF
cd $(LB) && ar -x libmsvcrt_orig.a ofmt_stub.o
ar -d $(LB)$/libmsvcrt_orig.a ofmt_stub.o
nm -g --defined-only $(LB)$/libmsvcrt_orig.a > $(MISC)$/msvcrt.nm
echo EXPORTS > $(MISC)$/msvcrt.def echo EXPORTS > $(MISC)$/msvcrt.def
sed -ne 's/.* T _//p' $(MISC)$/msvcrt.nm | sort >> $(MISC)$/msvcrt.def sed -ne 's/.* T _//p' $(MISC)$/msvcrt.nm | sort >> $(MISC)$/msvcrt.def
-sed -ne 's/.* I __imp__//p' $(MISC)$/msvcrt.nm | sort | diff - $(MISC)$/msvcrt.def | \ -sed -ne 's/.* I __imp__//p' $(MISC)$/msvcrt.nm | sort | diff - $(MISC)$/msvcrt.def | \
sed -ne 's/^< \(.*\)$/\1 DATA/p' > $(MISC)$/msvcrtdata.def sed -ne 's/^< \(.*\)$/\1 DATA/p' > $(MISC)$/msvcrtdata.def
cat $(MISC)$/msvcrtdata.def >> $(MISC)$/msvcrt.def cat $(MISC)$/msvcrtdata.def >> $(MISC)$/msvcrt.def
dlltool --dllname msvcrt.dll --input-def=$(MISC)$/msvcrt.def --kill-at --output-lib=$(LB)$/libmsvcrt.a dlltool --dllname msvcrt.dll --input-def=$(MISC)$/msvcrt.def --kill-at --output-lib=$(LB)$/libmsvcrt.a
cd $(LB) && ar -rs libmsvcrt.a ofmt_stub.o
clean: clean:
-$(RM) $(MISC)$/mingw$/include$/*.h -$(RM) $(MISC)$/mingw$/include$/*.h
......
...@@ -49,7 +49,8 @@ EXTERNAL_WARNINGS_NOT_ERRORS := TRUE ...@@ -49,7 +49,8 @@ EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
XMLSEC1VERSION=1.2.6 XMLSEC1VERSION=1.2.6
TARFILE_NAME=$(PRJNAME)-$(XMLSEC1VERSION) TARFILE_NAME=$(PRJNAME)-$(XMLSEC1VERSION)
PATCH_FILES=$(TARFILE_NAME).patch PATCH_FILES=$(TARFILE_NAME).patch xmlsec1-1.2.6-mingwport24.patch
ADDITIONAL_FILES= \ ADDITIONAL_FILES= \
include$/xmlsec$/nss$/akmngr.h \ include$/xmlsec$/nss$/akmngr.h \
......
--- misc/xmlsec1-1.2.6/configure 2009-09-18 17:19:00.000000000 +0200
+++ misc/build/xmlsec1-1.2.6/configure 2009-09-18 17:18:43.000000000 +0200
@@ -21749,6 +21749,10 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
+case $host_os in
+mingw*)
+;;
+*)
echo "$as_me:$LINENO: checking for shl_load" >&5
echo $ECHO_N "checking for shl_load... $ECHO_C" >&6
if test "${ac_cv_func_shl_load+set}" = set; then
@@ -22299,7 +22303,8 @@
fi
-
+;;
+esac
if test x"$libltdl_cv_func_dlopen" = xyes || test x"$libltdl_cv_lib_dl_dlopen" = xyes
then
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment