From c30ae0c43180cf994ea09cc283f0d2d7f1b4b259 Mon Sep 17 00:00:00 2001 From: Vladimir Glazounov Date: Wed, 1 Oct 2008 07:05:18 +0000 Subject: CWS-TOOLING: integrate CWS mingwport15 --- cppunit/source/win32/makefile.mk | 4 +- external/cairo/makefile.mk | 7 +- external/mingwheaders/makefile.mk | 4 +- external/mingwheaders/mingw_headers.patch | 158 ++++++++++++++---------------- redland/prj/d.lst | 1 + redland/raptor-1.4.17.patch | 36 ++++++- redland/raptor/makefile.mk | 14 ++- redland/rasqal-0.9.15.patch | 20 +++- redland/rasqal/makefile.mk | 14 ++- redland/redland-1.0.7.patch | 65 ++++++++++-- redland/redland/makefile.mk | 14 ++- 11 files changed, 208 insertions(+), 129 deletions(-) diff --git a/cppunit/source/win32/makefile.mk b/cppunit/source/win32/makefile.mk index d7e5eb53ee16..59f67b9e2765 100644 --- a/cppunit/source/win32/makefile.mk +++ b/cppunit/source/win32/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.2 $ +# $Revision: 1.2.2.1 $ # # This file is part of OpenOffice.org. # @@ -52,7 +52,7 @@ LIB1OBJFILES= \ .IF "$(GUI)"=="WNT" .IF "$(COM)"=="GCC" -LIB2ARCHIV=$(LB)$/lib$(TARGET)$(DLLPOSTFIX).a +LIB1ARCHIV=$(LB)$/lib$(TARGET)$(DLLPOSTFIX).a .ENDIF .ENDIF diff --git a/external/cairo/makefile.mk b/external/cairo/makefile.mk index ff8373027657..28815aa12fdd 100644 --- a/external/cairo/makefile.mk +++ b/external/cairo/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.3 $ +# $Revision: 1.3.16.1 $ # # This file is part of OpenOffice.org. # @@ -50,6 +50,11 @@ dummy: dummy: @echo "Nothing to do (Cairo not enabled)." +.ELIF "$(BUILD_CAIRO)" != "" + +dummy: + @echo "Not using prebuilt binaries, cairo will be built from source." + .ELIF "$(OS)" != "MACOSX" && "$(GUI)" != "WNT" dummy: diff --git a/external/mingwheaders/makefile.mk b/external/mingwheaders/makefile.mk index 8edf89c558fc..00dfd7dab6a5 100644 --- a/external/mingwheaders/makefile.mk +++ b/external/mingwheaders/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.8 $ +# $Revision: 1.8.10.1 $ # # This file is part of OpenOffice.org. # @@ -68,7 +68,6 @@ FILES_TO_COPY_FROM_W32API=amvideo.h \ winbase.h \ wininet.h \ winnt.h \ - winuser.h \ winver.h \ wtypes.h @@ -126,6 +125,7 @@ FILES_TO_COPY_FROM_PSDK=adoctint.h \ wincrypt.h \ wingdi.h \ winsock2.h \ + winuser.h \ ws2def.h \ ws2ipdef.h \ ws2tcpip.h \ diff --git a/external/mingwheaders/mingw_headers.patch b/external/mingwheaders/mingw_headers.patch index d3bc1e5cbb3a..96a3ccc73d71 100644 --- a/external/mingwheaders/mingw_headers.patch +++ b/external/mingwheaders/mingw_headers.patch @@ -496,90 +496,6 @@ #ifndef VOID #define VOID void ---- include/winuser.h.orig 2006-11-19 08:08:37.000000000 +0900 -+++ include/winuser.h 2007-01-20 00:22:52.765625000 +0900 -@@ -950,12 +950,14 @@ - #define SM_SLOWMACHINE 73 - #define SM_MIDEASTENABLED 74 - #define SM_MOUSEWHEELPRESENT 75 -+#if (WINVER >= 0x0500) - #define SM_XVIRTUALSCREEN 76 - #define SM_YVIRTUALSCREEN 77 - #define SM_CXVIRTUALSCREEN 78 - #define SM_CYVIRTUALSCREEN 79 - #define SM_CMONITORS 80 - #define SM_SAMEDISPLAYFORMAT 81 -+#endif - #define SM_IMMENABLED 82 - #define SM_CXFOCUSBORDER 83 - #define SM_CYFOCUSBORDER 84 -@@ -2473,7 +2475,9 @@ - typedef BOOL(CALLBACK *DRAWSTATEPROC)(HDC,LPARAM,WPARAM,int,int); - typedef BOOL(CALLBACK *WNDENUMPROC)(HWND,LPARAM); - typedef BOOL(CALLBACK *ENUMWINDOWSPROC)(HWND,LPARAM); -+#if (WINVER >= 0x0500) - typedef BOOL(CALLBACK* MONITORENUMPROC)(HMONITOR,HDC,LPRECT,LPARAM); -+#endif - typedef BOOL(CALLBACK *NAMEENUMPROCA)(LPSTR,LPARAM); - typedef BOOL(CALLBACK *NAMEENUMPROCW)(LPWSTR,LPARAM); - typedef NAMEENUMPROCA DESKTOPENUMPROCA; -@@ -3149,6 +3153,7 @@ - UINT cbSize; - DWORD dwTime; - } LASTINPUTINFO,*PLASTINPUTINFO; -+#if (WINVER >= 0x0500) - typedef struct tagMONITORINFO { - DWORD cbSize; - RECT rcMonitor; -@@ -3181,6 +3186,7 @@ - WCHAR szDevice[CCHDEVICENAME]; - } MONITORINFOEXW,*LPMONITORINFOEXW; - #endif /* __cplusplus */ -+#endif - typedef struct tagKBDLLHOOKSTRUCT { - DWORD vkCode; - DWORD scanCode; -@@ -3549,7 +3555,9 @@ - WINUSERAPI BOOL WINAPI EnumDesktopsA(HWINSTA,DESKTOPENUMPROCA,LPARAM); - WINUSERAPI BOOL WINAPI EnumDesktopsW(HWINSTA,DESKTOPENUMPROCW,LPARAM); - WINUSERAPI BOOL WINAPI EnumDesktopWindows(HDESK,ENUMWINDOWSPROC,LPARAM); -+#if (WINVER >= 0x0500) - WINUSERAPI BOOL WINAPI EnumDisplayMonitors(HDC,LPCRECT,MONITORENUMPROC,LPARAM); -+#endif - #ifndef NOGDI - WINUSERAPI BOOL WINAPI EnumDisplaySettingsA(LPCSTR,DWORD,PDEVMODEA); - WINUSERAPI BOOL WINAPI EnumDisplaySettingsW(LPCWSTR,DWORD,PDEVMODEW); -@@ -3741,8 +3749,10 @@ - WINUSERAPI BOOL WINAPI GetTitleBarInfo(HWND,PTITLEBARINFO); - #endif - WINUSERAPI BOOL WINAPI GetWindowInfo(HWND,PWINDOWINFO); -+#if (WINVER >= 0x0500) - WINUSERAPI BOOL WINAPI GetMonitorInfoA(HMONITOR,LPMONITORINFO); - WINUSERAPI BOOL WINAPI GetMonitorInfoW(HMONITOR,LPMONITORINFO); -+#endif - WINUSERAPI UINT WINAPI GetWindowModuleFileNameA(HWND,LPSTR,UINT); - WINUSERAPI UINT WINAPI GetWindowModuleFileNameW(HWND,LPWSTR,UINT); - WINUSERAPI BOOL WINAPI GrayStringA(HDC,HBRUSH,GRAYSTRINGPROC,LPARAM,int,int,int,int,int); -@@ -4093,7 +4103,9 @@ - typedef CBT_CREATEWNDW CBT_CREATEWND, *LPCBT_CREATEWND; - typedef MDICREATESTRUCTW MDICREATESTRUCT,*LPMDICREATESTRUCT; - typedef MULTIKEYHELPW MULTIKEYHELP,*PMULTIKEYHELP,*LPMULTIKEYHELP; -+#if (WINVER >= 0x0500) - typedef MONITORINFOEXW MONITORINFOEX, *LPMONITORINFOEX; -+#endif - #define AppendMenu AppendMenuW - #define BroadcastSystemMessage BroadcastSystemMessageW - #define BroadcastSystemMessageEx BroadcastSystemMessageExW -@@ -4258,7 +4270,9 @@ - typedef CBT_CREATEWNDA CBT_CREATEWND, *LPCBT_CREATEWND; - typedef MDICREATESTRUCTA MDICREATESTRUCT,*LPMDICREATESTRUCT; - typedef MULTIKEYHELPA MULTIKEYHELP,*PMULTIKEYHELP,*LPMULTIKEYHELP; -+#if (WINVER >= 0x0500) - typedef MONITORINFOEXA MONITORINFOEX, *LPMONITORINFOEX; -+#endif - #define AppendMenu AppendMenuA - #define BroadcastSystemMessage BroadcastSystemMessageA - #define BroadcastSystemMessageEx BroadcastSystemMessageExA --- include/winver.h.orig 2006-03-26 09:21:36.000000000 +0900 +++ include/winver.h 2006-03-26 09:21:42.000000000 +0900 @@ -101,10 +101,10 @@ @@ -2410,7 +2326,7 @@ --- include/specstrings.h.orig 2008-01-18 22:17:38.000000000 +0900 +++ include/specstrings.h 2008-03-26 22:08:28.484125000 +0900 -@@ -6,7 +6,105 @@ +@@ -6,7 +6,106 @@ #if _MSC_VER #pragma once #endif @@ -2475,6 +2391,7 @@ +#define __inout_bcount_full(x) +#define __inout_bcount_opt(x) +#define __inout_bcount_part(x,y) ++#define __inout_bcount_part_opt(x,y) +#define __inout_ecount(x) +#define __inout_ecount_opt(x) +#define __inout_opt @@ -2924,6 +2841,77 @@ +#endif /* _WINSOCK2_H */ +--- include/winuser.h.orig 2008-07-19 14:56:51.278750000 +0900 ++++ include/winuser.h 2008-07-20 08:20:08.111750000 +0900 +@@ -11,6 +11,15 @@ + #ifndef _WINUSER_ + #define _WINUSER_ + ++#define __in ++#define __out ++#ifdef __cplusplus ++#define __inline inline ++#else ++#define __inline static ++#endif ++DECLARE_HANDLE(HHOOK); ++typedef CONST GUID *LPCGUID; + + + #pragma once +@@ -39,7 +48,7 @@ + #define WINVER 0x0500 /* version 5.0 */ + #endif /* !WINVER */ + +-#include ++#include <../include/stdarg.h> + + #ifndef NOUSER + +@@ -215,6 +224,8 @@ + #pragma warning(disable:4995) + #endif + ++WINUSERAPI UINT WINAPI WinExec(LPCSTR,UINT); ++ + WINUSERAPI + int + WINAPI +@@ -10717,7 +10728,7 @@ + #define CDS_RESET 0x40000000 + #define CDS_NORESET 0x10000000 + +-#include ++//#include + + /* Return values for ChangeDisplaySettings */ + #define DISP_CHANGE_SUCCESSFUL 0 +@@ -12571,16 +12582,20 @@ + + + +-#if !defined(RC_INVOKED) /* RC complains about long symbols in #ifs */ +-#if defined(ISOLATION_AWARE_ENABLED) && (ISOLATION_AWARE_ENABLED != 0) +-#include "winuser.inl" +-#endif /* ISOLATION_AWARE_ENABLED */ +-#endif /* RC */ ++//#if !defined(RC_INVOKED) /* RC complains about long symbols in #ifs */ ++//#if defined(ISOLATION_AWARE_ENABLED) && (ISOLATION_AWARE_ENABLED != 0) ++//#include "winuser.inl" ++//#endif /* ISOLATION_AWARE_ENABLED */ ++//#endif /* RC */ + + #ifdef __cplusplus + } + #endif /* __cplusplus */ + ++#undef __in ++#undef __out ++#undef __inline ++ + #endif /* !_WINUSER_ */ + + --- include/ws2ipdef.h.orig 2008-01-18 22:17:44.000000000 +0900 +++ include/ws2ipdef.h 2008-03-27 20:23:19.096125000 +0900 @@ -1,3 +1,6 @@ diff --git a/redland/prj/d.lst b/redland/prj/d.lst index 681b83717500..a5cfec758ae8 100644 --- a/redland/prj/d.lst +++ b/redland/prj/d.lst @@ -3,5 +3,6 @@ ..\%__SRC%\lib\lib*.so.* %_DEST%\lib%_EXT% ..\%__SRC%\lib\lib*.dylib %_DEST%\lib%_EXT% ..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT% +..\%__SRC%\lib\lib*.dll.a %_DEST%\lib%_EXT%\lib*.a ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT% ..\redlandversion.mk %_DEST%\inc%_EXT%\redlandversion.mk diff --git a/redland/raptor-1.4.17.patch b/redland/raptor-1.4.17.patch index cb0bd22355c2..44bce4b18749 100644 --- a/redland/raptor-1.4.17.patch +++ b/redland/raptor-1.4.17.patch @@ -30,7 +30,7 @@ +# +# $RCSfile: raptor-1.4.17.patch,v $ +# -+# $Revision: 1.3 $ ++# $Revision: 1.2.6.2 $ +# +# This file is part of OpenOffice.org. +# @@ -185,7 +185,7 @@ if test "$echo_libtool_libs" = "yes"; then echo @libdir@/@RAPTOR_LIBTOOLLIBS@ --- misc/raptor-1.4.17/src/win32_raptor_config.h Tue Oct 2 06:12:55 2007 -+++ misc/build/raptor-1.4.17/src/win32_raptor_config.h Mon Jun 16 15:55:38 2008 ++++ misc/build/raptor-1.4.17/src/win32_raptor_config.h 2008-07-06 10:27:03.553625000 +0900 @@ -38,6 +38,8 @@ #define HAVE_STDLIB_H 1 @@ -235,7 +235,17 @@ #define snprintf _snprintf #define access _access #define stricmp _stricmp -@@ -125,7 +137,8 @@ +@@ -114,7 +126,9 @@ + + #define RAPTOR_PARSER_GUESS 1 + #define RAPTOR_PARSER_GRDDL 1 ++#ifndef __MINGW32__ /* conflicts with normal configure result */ + #define RAPTOR_PARSER_N3 1 ++#endif + #define RAPTOR_PARSER_TURTLE 1 + #define RAPTOR_PARSER_NTRIPLES 1 + #define RAPTOR_PARSER_RDFXML 1 +@@ -125,7 +139,8 @@ #define RAPTOR_SERIALIZER_RDFXML_ABBREV 1 #define RAPTOR_SERIALIZER_NTRIPLES 1 @@ -271,3 +281,23 @@ ;; irix | nonstopux) +--- misc/raptor-1.4.17/configure 2008-03-17 16:37:20.000000000 +0900 ++++ misc/build/raptor-1.4.17/configure 2008-07-06 09:05:29.974875000 +0900 +@@ -4317,7 +4317,7 @@ + + cygwin*) + # func_win32_libid is a shell function defined in ltmain.sh +- lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' ++ lt_cv_deplibs_check_method='file_magic ^x86 archive|^x86 DLL' + lt_cv_file_magic_cmd='func_win32_libid' + ;; + +@@ -4326,7 +4326,7 @@ + # func_win32_libid shell function, so use a weaker test based on 'objdump', + # unless we find 'file', for example because we are cross-compiling. + if ( file / ) >/dev/null 2>&1; then +- lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' ++ lt_cv_deplibs_check_method='file_magic ^x86 archive|^x86 DLL' + lt_cv_file_magic_cmd='func_win32_libid' + else + lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk index 6c082f10d246..8c929a9c2e14 100644 --- a/redland/raptor/makefile.mk +++ b/redland/raptor/makefile.mk @@ -59,14 +59,12 @@ ADDITIONAL_FILES=src/makefile.mk .IF "$(OS)"=="WNT" .IF "$(COM)"=="GCC" -#CONFIGURE_DIR= -#CONFIGURE_ACTION=.$/configure -#CONFIGURE_FLAGS=--enable-ipv6=no --without-python --enable-static=no --without-debug --build=i586-pc-mingw32 --host=i586-pc-mingw32 lt_cv_cc_dll_switch="-shared" CFLAGS=-D_MT LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc -L$(ILIB:s/;/ -L/)" LIBS="-lws2_32 -lmingwthrd" OBJDUMP="$(WRAPCMD) objdump" -#BUILD_ACTION=$(GNUMAKE) -#BUILD_DIR=$(CONFIGURE_DIR) -all: - @echo "FIXME: somebody port me to mingw please..." - exit 1 +CONFIGURE_DIR= +CONFIGURE_ACTION=.$/configure +CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-openssl-digests --with-xml-parser=libxml --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml --build=i586-pc-mingw32 --host=i586-pc-mingw32 lt_cv_cc_dll_switch="-shared" CFLAGS=-D_MT CPPFLAGS="-nostdinc $(INCLUDE)" LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc,--export-all-symbols -L$(ILIB:s/;/ -L/)" LIBS=-lmingwthrd OBJDUMP="$(WRAPCMD) objdump" LIBXML2LIB=$(LIBXML2LIB) ZLIB3RDLIB=$(ZLIB3RDLIB) XSLTLIB="$(XSLTLIB)" +BUILD_ACTION=$(GNUMAKE) +BUILD_FLAGS+= -j$(EXTMAXPROCESS) +BUILD_DIR=$(CONFIGURE_DIR) .ELSE # there is no wntmsci build environment in the tarball; we use custom dmakefile BUILD_ACTION=dmake diff --git a/redland/rasqal-0.9.15.patch b/redland/rasqal-0.9.15.patch index 08283e290015..0abb72874dc9 100644 --- a/redland/rasqal-0.9.15.patch +++ b/redland/rasqal-0.9.15.patch @@ -30,7 +30,7 @@ +# +# $RCSfile: rasqal-0.9.15.patch,v $ +# -+# $Revision: 1.3 $ ++# $Revision: 1.2.6.2 $ +# +# This file is part of OpenOffice.org. +# @@ -200,8 +200,20 @@ #define RASQAL_DEBUG 1 #endif --- misc/rasqal-0.9.15/ltmain.sh 2006-03-12 03:49:04.000000000 +0900 -+++ misc/build/rasqal-0.9.15/ltmain.sh 2008-07-08 12:00:00.000000000 +0900 -@@ -3195,9 +3195,9 @@ ++++ misc/build/rasqal-0.9.15/ltmain.sh 2008-07-06 14:30:56.975375000 +0900 +@@ -1518,6 +1518,11 @@ + [\\/]* | [A-Za-z]:[\\/]*) ;; + *) + absdir=`cd "$dir" && pwd` ++ case $host_os in ++ mingw*) ++ absdir=`cygpath -m $absdir` ++ ;; ++ esac + if test -z "$absdir"; then + $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2 + absdir="$dir" +@@ -3195,9 +3200,9 @@ revision="$number_revision" ;; freebsd-aout|freebsd-elf|sunos) @@ -214,7 +226,7 @@ ;; irix|nonstopux) current=`expr $number_major + $number_minor - 1` -@@ -3275,8 +3275,8 @@ +@@ -3275,8 +3280,8 @@ ;; freebsd-elf) diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk index 8f4ec9738cb7..ddf6a5153ae8 100644 --- a/redland/rasqal/makefile.mk +++ b/redland/rasqal/makefile.mk @@ -59,14 +59,12 @@ ADDITIONAL_FILES=src/makefile.mk .IF "$(OS)"=="WNT" .IF "$(COM)"=="GCC" -#CONFIGURE_DIR= -#CONFIGURE_ACTION=.$/configure -#CONFIGURE_FLAGS=--enable-ipv6=no --without-python --enable-static=no --without-debug --build=i586-pc-mingw32 --host=i586-pc-mingw32 lt_cv_cc_dll_switch="-shared" CFLAGS=-D_MT LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc -L$(ILIB:s/;/ -L/)" LIBS="-lws2_32 -lmingwthrd" OBJDUMP="$(WRAPCMD) objdump" -#BUILD_ACTION=$(GNUMAKE) -#BUILD_DIR=$(CONFIGURE_DIR) -all: - @echo "FIXME: somebody port me to mingw please..." - exit 1 +CONFIGURE_DIR= +CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH" +CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-openssl-digests --with-xml-parser=libxml --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --disable-pcre --with-decimal=none --with-www=xml --build=i586-pc-mingw32 --host=i586-pc-mingw32 lt_cv_cc_dll_switch="-shared" CFLAGS=-D_MT CPPFLAGS="-nostdinc $(INCLUDE)" LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc,--export-all-symbols -L$(ILIB:s/;/ -L/)" LIBS=-lmingwthrd OBJDUMP="$(WRAPCMD) objdump" LIBXML2LIB=$(LIBXML2LIB) ZLIB3RDLIB=$(ZLIB3RDLIB) XSLTLIB="$(XSLTLIB)" +BUILD_ACTION=$(GNUMAKE) +BUILD_FLAGS+= -j$(EXTMAXPROCESS) +BUILD_DIR=$(CONFIGURE_DIR) .ELSE # there is no wntmsci build environment in the tarball; we use custom dmakefile BUILD_ACTION=dmake diff --git a/redland/redland-1.0.7.patch b/redland/redland-1.0.7.patch index 26ffa3d10699..dca6383d855e 100644 --- a/redland/redland-1.0.7.patch +++ b/redland/redland-1.0.7.patch @@ -30,7 +30,7 @@ +# +# $RCSfile: redland-1.0.7.patch,v $ +# -+# $Revision: 1.3 $ ++# $Revision: 1.2.6.2 $ +# +# This file is part of OpenOffice.org. +# @@ -512,7 +512,7 @@ #ifdef WITH_THREADS world = uri->world; --- misc/redland-1.0.7/librdf/win32_rdf_config.h Sun May 6 19:14:36 2007 -+++ misc/build/redland-1.0.7/librdf/win32_rdf_config.h Mon Jun 16 15:55:52 2008 ++++ misc/build/redland-1.0.7/librdf/win32_rdf_config.h Sat Jul 12 08:56:20 2008 @@ -45,7 +45,8 @@ #define HAVE_STRICMP 1 @@ -590,7 +590,7 @@ /* Define to 1 if you have the header file. */ #define HAVE_MEMORY_H 1 -@@ -161,22 +162,27 @@ +@@ -161,25 +162,33 @@ #define HAVE_MKTEMP 1 /* MySQL libraries are present */ @@ -619,7 +619,13 @@ /* Define to 1 if you have the header file. */ /* #undef HAVE_PTHREAD_H */ -@@ -248,7 +254,7 @@ ++#ifdef __MINGW32__ ++#undef HAVE_PTHREAD_H */ ++#endif + + /* Define to 1 if you have the header file. */ + #define HAVE_STDINT_H 1 +@@ -248,7 +257,7 @@ #define SIZEOF_UNSIGNED_LONG_LONG 8 /* SQLite API version */ @@ -628,7 +634,7 @@ /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 -@@ -256,14 +262,17 @@ +@@ -256,14 +265,17 @@ /* Building file storage */ #define STORAGE_FILE 1 @@ -685,8 +691,20 @@ +LGPL is applied is otherwise unspecified. + --- misc/redland-1.0.7/ltmain.sh 2007-11-28 06:23:09.000000000 +0900 -+++ misc/build/redland-1.0.7/ltmain.sh 2008-07-08 11:59:22.000000000 +0900 -@@ -3237,9 +3237,9 @@ ++++ misc/build/redland-1.0.7/ltmain.sh 2008-07-06 15:44:48.725250000 +0900 +@@ -1557,6 +1557,11 @@ + [\\/]* | [A-Za-z]:[\\/]*) ;; + *) + absdir=`cd "$dir" && pwd` ++ case $host_os in ++ mingw*) ++ absdir=`cygpath -m $absdir` ++ ;; ++ esac + if test -z "$absdir"; then + $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2 + absdir="$dir" +@@ -3237,9 +3242,9 @@ revision="$number_revision" ;; freebsd-aout|freebsd-elf|sunos) @@ -699,7 +717,7 @@ ;; irix|nonstopux) current=`expr $number_major + $number_minor` -@@ -3319,8 +3319,8 @@ +@@ -3319,8 +3324,8 @@ ;; freebsd-elf) @@ -710,3 +728,34 @@ ;; irix | nonstopux) +--- misc/redland-1.0.7/configure 2007-12-17 16:58:16.000000000 +0900 ++++ misc/build/redland-1.0.7/configure 2008-07-06 15:12:01.397125000 +0900 +@@ -4544,7 +4544,7 @@ + + cygwin*) + # func_win32_libid is a shell function defined in ltmain.sh +- lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' ++ lt_cv_deplibs_check_method='file_magic ^x86 archive|^x86 DLL' + lt_cv_file_magic_cmd='func_win32_libid' + ;; + +@@ -4553,7 +4553,7 @@ + # func_win32_libid shell function, so use a weaker test based on 'objdump', + # unless we find 'file', for example because we are cross-compiling. + if ( file / ) >/dev/null 2>&1; then +- lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' ++ lt_cv_deplibs_check_method='file_magic ^x86 archive|^x86 DLL' + lt_cv_file_magic_cmd='func_win32_libid' + else + lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' +--- misc/redland-1.0.7/utils/rdfproc.c 2007-10-23 23:55:06.000000000 +0900 ++++ misc/build/redland-1.0.7/utils/rdfproc.c 2008-07-06 17:44:47.615875000 +0900 +@@ -30,7 +30,7 @@ + #endif + + #ifdef WIN32 +-#include ++#include + #endif + + #include diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk index 7dd2ae30e12b..af3b906d7804 100644 --- a/redland/redland/makefile.mk +++ b/redland/redland/makefile.mk @@ -59,14 +59,12 @@ ADDITIONAL_FILES=librdf/makefile.mk .IF "$(OS)"=="WNT" .IF "$(COM)"=="GCC" -#CONFIGURE_DIR= -#CONFIGURE_ACTION=.$/configure -#CONFIGURE_FLAGS=--enable-ipv6=no --without-python --enable-static=no --without-debug --build=i586-pc-mingw32 --host=i586-pc-mingw32 lt_cv_cc_dll_switch="-shared" CFLAGS=-D_MT LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc -L$(ILIB:s/;/ -L/)" LIBS="-lws2_32 -lmingwthrd" OBJDUMP="$(WRAPCMD) objdump" -#BUILD_ACTION=$(GNUMAKE) -#BUILD_DIR=$(CONFIGURE_DIR) -all: - @echo "FIXME: somebody port me to mingw please..." - exit 1 +CONFIGURE_DIR= +CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH" +CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-openssl-digests --with-xml-parser=libxml --with-raptor=system --with-rasqual=system --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml --build=i586-pc-mingw32 --host=i586-pc-mingw32 lt_cv_cc_dll_switch="-shared" CFLAGS=-D_MT CPPFLAGS="-nostdinc $(INCLUDE)" LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc,--export-all-symbols -L$(ILIB:s/;/ -L/)" LIBS=-lmingwthrd OBJDUMP="$(WRAPCMD) objdump" LIBXML2LIB=$(LIBXML2LIB) ZLIB3RDLIB=$(ZLIB3RDLIB) XSLTLIB="$(XSLTLIB)" +BUILD_ACTION=$(GNUMAKE) +BUILD_FLAGS+= -j$(EXTMAXPROCESS) +BUILD_DIR=$(CONFIGURE_DIR) .ELSE # there is no wntmsci build environment in the tarball; we use custom dmakefile BUILD_ACTION=dmake -- cgit