diff options
author | Vladimir Glazounov <vg@openoffice.org> | 2008-10-01 07:05:18 +0000 |
---|---|---|
committer | Vladimir Glazounov <vg@openoffice.org> | 2008-10-01 07:05:18 +0000 |
commit | e834e63cac531eed700604cb897b53acc3cf9f71 (patch) | |
tree | d7d743bfcfe263cc990b36810491b7d717d01916 /cairo | |
parent | #i10000# #i93984# Get build fixes from ooo300m8masterfix. (diff) | |
download | core-e834e63cac531eed700604cb897b53acc3cf9f71.tar.gz core-e834e63cac531eed700604cb897b53acc3cf9f71.zip |
CWS-TOOLING: integrate CWS mingwport15
Diffstat (limited to 'cairo')
-rw-r--r-- | cairo/cairo-1.6.4.patch | 148 | ||||
-rw-r--r-- | cairo/cairo/makefile.mk | 23 | ||||
-rw-r--r-- | cairo/pixman/makefile.mk | 5 | ||||
-rw-r--r-- | cairo/prj/d.lst | 2 |
4 files changed, 168 insertions, 10 deletions
diff --git a/cairo/cairo-1.6.4.patch b/cairo/cairo-1.6.4.patch new file mode 100644 index 000000000000..b67d96f56283 --- /dev/null +++ b/cairo/cairo-1.6.4.patch @@ -0,0 +1,148 @@ +--- misc/cairo-1.6.4/configure.orig 2008-04-12 06:33:44.000000000 +0900 ++++ misc/build/cairo-1.6.4/configure 2008-07-19 14:58:12.144500000 +0900 +@@ -4728,7 +4728,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' + ;; + +@@ -4737,7 +4737,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)?' +@@ -21031,19 +21031,39 @@ + + LIBS="$LIBS $LIBM" + +-{ echo "$as_me:$LINENO: checking for compress in -lz" >&5 +-echo $ECHO_N "checking for compress in -lz... $ECHO_C" >&6; } +-if test "${ac_cv_lib_z_compress+set}" = set; then ++save_libs="$LIBS" ++LIBS="$LIBS $ZLIB3RDLIB" ++ ++for ac_func in $COMPRESS ++do ++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` ++{ echo "$as_me:$LINENO: checking for $ac_func" >&5 ++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } ++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-lz $LIBS" +-cat >conftest.$ac_ext <<_ACEOF ++ cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ ++/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. ++ For example, HP-UX 11i <limits.h> declares gettimeofday. */ ++#define $ac_func innocuous_$ac_func ++ ++/* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char $ac_func (); below. ++ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since ++ <limits.h> exists even on freestanding compilers. */ ++ ++#ifdef __STDC__ ++# include <limits.h> ++#else ++# include <assert.h> ++#endif ++ ++#undef $ac_func + + /* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC +@@ -21051,11 +21071,18 @@ + #ifdef __cplusplus + extern "C" + #endif +-char compress (); ++char $ac_func (); ++/* The GNU C library defines this for functions which it implements ++ to always fail with ENOSYS. Some functions are actually named ++ something starting with __ and the normal name is an alias. */ ++#if defined __stub_$ac_func || defined __stub___$ac_func ++choke me ++#endif ++ + int + main () + { +-return compress (); ++return $ac_func (); + ; + return 0; + } +@@ -21078,22 +21105,25 @@ + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then +- ac_cv_lib_z_compress=yes ++ eval "$as_ac_var=yes" + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_cv_lib_z_compress=no ++ eval "$as_ac_var=no" + fi + + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +-LIBS=$ac_check_lib_save_LIBS + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_lib_z_compress" >&5 +-echo "${ECHO_T}$ac_cv_lib_z_compress" >&6; } +-if test $ac_cv_lib_z_compress = yes; then +- if test "${ac_cv_header_zlib_h+set}" = set; then ++ac_res=`eval echo '${'$as_ac_var'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++if test `eval echo '${'$as_ac_var'}'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++_ACEOF ++ if test "${ac_cv_header_zlib_h+set}" = set; then + { echo "$as_me:$LINENO: checking for zlib.h" >&5 + echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6; } + if test "${ac_cv_header_zlib_h+set}" = set; then +@@ -21233,7 +21263,9 @@ + else + have_libz="no (requires zlib http://www.gzip.org/zlib/)" + fi ++done + ++LIBS="$save_libs" + + + +@@ -28683,7 +28715,7 @@ + + # The ps backend requires zlib. + use_ps=$have_libz +- ps_NONPKGCONFIG_LIBS=-lz ++ ps_NONPKGCONFIG_LIBS=$ZLIB3RDLIB + + cairo_cv_backend_ps_use=$use_ps + cairo_cv_backend_ps_cache_version=4 +@@ -28877,7 +28909,7 @@ + + # The pdf backend requires zlib. + use_pdf=$have_libz +- pdf_NONPKGCONFIG_LIBS=-lz ++ pdf_NONPKGCONFIG_LIBS=$ZLIB3RDLIB + + cairo_cv_backend_pdf_use=$use_pdf + cairo_cv_backend_pdf_cache_version=4 diff --git a/cairo/cairo/makefile.mk b/cairo/cairo/makefile.mk index 1b0712fa0b8b..45526345152a 100644 --- a/cairo/cairo/makefile.mk +++ b/cairo/cairo/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.4 $ +# $Revision: 1.1.2.4 $ # # This file is part of OpenOffice.org. # @@ -57,7 +57,7 @@ all: CAIROVERSION=1.6.4 TARFILE_NAME=$(PRJNAME)-$(CAIROVERSION) -#PATCH_FILE_NAME=$(TARFILE_NAME).patch +PATCH_FILE_NAME=..$/$(TARFILE_NAME).patch cairo_CFLAGS=-I$(SOLARINC) cairo_LDFLAGS=-L$(SOLARLIB) @@ -66,12 +66,23 @@ cairo_LDFLAGS=-L$(SOLARLIB) pixman_CFLAGS=-I$(SRC_ROOT)$/$(PRJNAME)$/$(INPATH)$/inc pixman_LIBS=-L$(SRC_ROOT)$/$(PRJNAME)$/$(INPATH)$/lib -lpixman-1 +cairo_CPPFLAGS= +.IF "$(SYSTEM_ZLIB)"!="YES" +cairo_CPPFLAGS+=-I$(SOLARINCDIR)$/external$/zlib +cairo_COMPRESS=z_compress +.ELSE +cairo_COMPRESS=compress +.ENDIF +cairo_CPPFLAGS+=$(INCLUDE) + .IF "$(OS)"=="WNT" # --------- Windows ------------------------------------------------- .IF "$(COM)"=="GCC" +cairo_CPPFLAGS+=-nostdinc + CONFIGURE_DIR= -CONFIGURE_ACTION=.$/configure -CONFIGURE_FLAGS=--enable-static=no --build=i586-pc-mingw32 --host=i586-pc-mingw32 CFLAGS="$(cairo_CFLAGS) -D_MT" LDFLAGS="$(cairo_LDFLAGS) pixman_CFLAGS="$(pixman_CFLAGS)" pixman_LIBS="$(pixman_LIBS)" -no-undefined -L$(ILIB:s/;/ -L/)" LIBS="-lmingwthrd" ZLIB3RDLIB=$(ZLIB3RDLIB) OBJDUMP="$(WRAPCMD) objdump" +CONFIGURE_ACTION=cp $(SRC_ROOT)$/$(PRJNAME)$/cairo$/dummy_pkg_config . && .$/configure +CONFIGURE_FLAGS=--disable-xlib --disable-freetype --disable-pthread --disable-svg --disable-png --enable-gtk-doc=no --enable-test-surfaces=no --enable-static=no --build=i586-pc-mingw32 --host=i586-pc-mingw32 PKG_CONFIG=./dummy_pkg_config CFLAGS=-D_MT CPPFLAGS="$(cairo_CPPFLAGS)" LDFLAGS="$(cairo_LDFLAGS) -no-undefined -L$(ILIB:s/;/ -L/)" LIBS=-lmingwthrd pixman_CFLAGS="$(pixman_CFLAGS)" pixman_LIBS="$(pixman_LIBS)" ZLIB3RDLIB=$(ZLIB3RDLIB) COMPRESS=$(cairo_COMPRESS) OBJDUMP="$(WRAPCMD) objdump" BUILD_ACTION=$(GNUMAKE) BUILD_FLAGS+= -j$(EXTMAXPROCESS) BUILD_DIR=$(CONFIGURE_DIR) @@ -95,7 +106,7 @@ OUT2INC+=src$/cairo-win32.h # ----------- Native Mac OS X (Aqua/Quartz) -------------------------------- CONFIGURE_DIR= CONFIGURE_ACTION=cp $(SRC_ROOT)$/$(PRJNAME)$/cairo$/dummy_pkg_config . && .$/configure -CONFIGURE_FLAGS=--enable-static=no --disable-xlib --disable-freetype --disable-svg --disable-png --enable-quartz --enable-quartz-font --enable-gtk-doc=no --enable-test-surfaces=no PKG_CONFIG=./dummy_pkg_config CFLAGS="$(cairo_CFLAGS)" LDFLAGS="$(cairo_LDFLAGS)" pixman_CFLAGS="$(pixman_CFLAGS)" pixman_LIBS="$(pixman_LIBS)" ZLIB3RDLIB=$(ZLIB3RDLIB) +CONFIGURE_FLAGS=--enable-static=no --disable-xlib --disable-freetype --disable-svg --disable-png --enable-quartz --enable-quartz-font --enable-gtk-doc=no --enable-test-surfaces=no PKG_CONFIG=./dummy_pkg_config CFLAGS="$(cairo_CFLAGS)" CPPFLAGS="$(cairo_CPPFLAGS)" LDFLAGS="$(cairo_LDFLAGS)" pixman_CFLAGS="$(pixman_CFLAGS)" pixman_LIBS="$(pixman_LIBS)" ZLIB3RDLIB=$(ZLIB3RDLIB) COMPRESS=$(cairo_COMPRESS) BUILD_ACTION=$(GNUMAKE) BUILD_FLAGS+= -j$(EXTMAXPROCESS) BUILD_DIR=$(CONFIGURE_DIR) @@ -127,7 +138,7 @@ cairo_CFLAGS+=-xc99=none CONFIGURE_DIR= CONFIGURE_ACTION=.$/configure -CONFIGURE_FLAGS=--enable-xlib --enable-freetype --disable-svg --disable-png --enable-gtk-doc=no --enable-test-surfaces=no --enable-static=no CFLAGS="$(cairo_CFLAGS)" LDFLAGS="$(cairo_LDFLAGS)" pixman_CFLAGS="$(pixman_CFLAGS)" pixman_LIBS="$(pixman_LIBS)" ZLIB3RDLIB=$(ZLIB3RDLIB) +CONFIGURE_FLAGS=--enable-xlib --enable-freetype --disable-svg --disable-png --enable-gtk-doc=no --enable-test-surfaces=no --enable-static=no CFLAGS="$(cairo_CFLAGS)" CPPFLAGS="$(cairo_CPPFLAGS)" LDFLAGS="$(cairo_LDFLAGS)" pixman_CFLAGS="$(pixman_CFLAGS)" pixman_LIBS="$(pixman_LIBS)" ZLIB3RDLIB=$(ZLIB3RDLIB) COMPRESS=$(cairo_COMPRESS) .IF "$(OS)"=="MACOSX" # X11 on Mac OS X CONFIGURE_ACTION=cp $(SRC_ROOT)$/$(PRJNAME)$/cairo$/dummy_pkg_config . && .$/configure CONFIGURE_FLAGS+=--disable-quartz --disable-quartz-font PKG_CONFIG=./dummy_pkg_config diff --git a/cairo/pixman/makefile.mk b/cairo/pixman/makefile.mk index 2f799d883ced..a6d5fef55c8d 100644 --- a/cairo/pixman/makefile.mk +++ b/cairo/pixman/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.2 $ +# $Revision: 1.1.2.2 $ # # This file is part of OpenOffice.org. # @@ -134,8 +134,7 @@ OUT2INC=pixman$/pixman-version.h \ OUT2LIB+=pixman$/.libs$/libpixman-1.a .ELIF "$(OS)"=="WNT" .IF "$(COM)"=="GCC" -OUT2BIN+=pixman$/.libs$/*.a -OUT2BIN+=pixman$/.libs$/*.dll +OUT2LIB+=pixman$/.libs$/*.a .ELSE OUT2LIB+=win32$/bin.msvc$/*.lib OUT2BIN+=win32$/bin.msvc$/*.dll diff --git a/cairo/prj/d.lst b/cairo/prj/d.lst index fb4711e549d4..54f827fed0ad 100644 --- a/cairo/prj/d.lst +++ b/cairo/prj/d.lst @@ -12,4 +12,4 @@ mkdir: %_DEST%\inc%_EXT%\pixman-1 ..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT%\*.lib ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll ..\%__SRC%\lib\*.dll %_DEST%\bin%_EXT%\*.dll -..\%__SRC%\bin\*.dll.* %_DEST%\bin%_EXT%\*.dll.* +..\%__SRC%\bin\*.dll.a %_DEST%\lib%_EXT%\*.a |