diff options
author | Ivo Hinkelmann <ihi@openoffice.org> | 2011-03-30 18:52:07 +0200 |
---|---|---|
committer | Ivo Hinkelmann <ihi@openoffice.org> | 2011-03-30 18:52:07 +0200 |
commit | f2f949c056dddfbd078fe7cf7c58dcc3acf8a41d (patch) | |
tree | 0c0bad564c152a021973be1425bce3c53b0af666 | |
parent | 27721a18d60baeec19f75faf7cea6aa302ba925a (diff) |
masterfix DEV300: #i10000# build fixes
Notes
split repo tag: libs-extern-sys_ooo/DEV300_m105
-rw-r--r-- | gettext/makefile.mk | 2 | ||||
-rw-r--r-- | gettext/prj/build.lst | 2 | ||||
-rw-r--r-- | jpeg/jpeg-8c.patch | 10 | ||||
-rwxr-xr-x | librsvg/makefile.mk | 2 | ||||
-rw-r--r-- | pango/pango-1.28.3-win32.patch | 2 | ||||
-rw-r--r-- | pango/prj/build.lst | 2 |
6 files changed, 10 insertions, 10 deletions
diff --git a/gettext/makefile.mk b/gettext/makefile.mk index 91255f1c0694..5569a31ff6c1 100644 --- a/gettext/makefile.mk +++ b/gettext/makefile.mk @@ -52,7 +52,7 @@ PATCH_FILES= .IF "$(OS)"=="MACOSX" CONFIGURE_DIR= -CONFIGURE_ACTION=.$/configure --prefix=$(SRC_ROOT)$/$(PRJNAME)$/$(MISC) CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS)" +CONFIGURE_ACTION=.$/configure --prefix=$(SRC_ROOT)$/$(PRJNAME)$/$(MISC) CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS)" CXXFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS)" CONFIGURE_FLAGS=$(eq,$(OS),MACOSX CPPFLAGS="$(EXTRA_CDEFS)" $(NULL)) --disable-curses --without-emacs --without-git --disable-java BUILD_ACTION=$(GNUMAKE) diff --git a/gettext/prj/build.lst b/gettext/prj/build.lst index 10d25eb8461f..cf38e63c826f 100644 --- a/gettext/prj/build.lst +++ b/gettext/prj/build.lst @@ -1,3 +1,3 @@ -gt gettext : soltools NULL +gt gettext : sal soltools NULL gt gettext usr1 - all gt_mkout NULL gt gettext nmake - all gt_gettext NULL diff --git a/jpeg/jpeg-8c.patch b/jpeg/jpeg-8c.patch index a131f72fad0d..77c1ff592c7a 100644 --- a/jpeg/jpeg-8c.patch +++ b/jpeg/jpeg-8c.patch @@ -1,6 +1,6 @@ ---- misc/jpeg-8c/jconfig.h 2011-03-24 21:20:52.542761397 +0100 -+++ misc/build/jpeg-8c/jconfig.h 2011-03-24 21:15:20.712761156 +0100 -@@ -1 +1,58 @@ +--- misc/jpeg-8c/jconfig.h 2011-03-30 11:20:06.266329889 +0200 ++++ misc/build/jpeg-8c/jconfig.h 2011-03-30 11:02:01.926080079 +0200 +@@ -1 +1,60 @@ -dummy +/* jconfig.h. Generated from jconfig.cfg by configure. */ +/* jconfig.cfg --- source file edited by configure script */ @@ -35,6 +35,8 @@ +/* #undef RIGHT_SHIFT_IS_UNSIGNED */ +#ifdef WNT +#define INLINE __inline ++#elif defined SOLARIS ++#define INLINE +#else +#define INLINE inline +#endif @@ -60,7 +62,6 @@ +/* #undef PROGRESS_REPORT */ + +#endif /* JPEG_CJPEG_DJPEG */ -Nur in misc/build/jpeg-8c: jconfig.h.dummy. --- misc/jpeg-8c/jmorecfg.h 2009-11-20 09:01:24.000000000 +0100 +++ misc/build/jpeg-8c/jmorecfg.h 2011-03-24 21:29:02.073761750 +0100 @@ -21,7 +21,7 @@ @@ -171,4 +172,3 @@ Nur in misc/build/jpeg-8c: jconfig.h.dummy. +LIB1OBJFILES=$(SLOFILES) + +.INCLUDE : target.mk -Nur in misc/build/jpeg-8c: makefile.mk.dummy. diff --git a/librsvg/makefile.mk b/librsvg/makefile.mk index f9c07cfd20fa..5744dc73d6ff 100755 --- a/librsvg/makefile.mk +++ b/librsvg/makefile.mk @@ -69,7 +69,7 @@ CONFIGURE_FLAGS=--disable-gtk-theme --disable-tools --with-croco --with-svgz \ GTHREAD_CFLAGS=-I$(SOLARINCDIR)$/external/$glib-2.0 \ GTHREAD_LIBS=-lgthread-2.0 \ LIBCROCO_CFLAGS="-I$(SOLARINCDIR)$/external$/libcroco-0.6" \ - LIBCROCO_LIBS=-lcroco-0.6 + LIBCROCO_LIBS=-lcroco-0.6 \ CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) -I$(SOLARINCDIR)$/external -I$(SOLARINCDIR)$/external$/glib-2.0 -I$(SOLARINCDIR)$/external$/gdk-pixbuf-2.0 -I$(SOLARINCDIR)$/external$/pango-1.0 -I$(SOLARINCDIR)$/cairo" \ LDFLAGS="$(CONFIGURE_LDFLAGS)" diff --git a/pango/pango-1.28.3-win32.patch b/pango/pango-1.28.3-win32.patch index 78dd7bbbffe0..35ad6666b318 100644 --- a/pango/pango-1.28.3-win32.patch +++ b/pango/pango-1.28.3-win32.patch @@ -49,7 +49,7 @@ + $(OUTDIR)\lib\gobject-2.0.lib \ + $(OUTDIR)\lib\gmodule-2.0.lib +CAIRO_LIB = $(OUTDIR)\lib\cairo.lib -+USP10_LIB = $(OUTDIR)\lib\USP10.lib ++USP10_LIB = USP10.lib + +!INCLUDE $(PRJ_TOP)\make.msc diff --git a/pango/prj/build.lst b/pango/prj/build.lst index 419eebb04ca6..692ab2c2e592 100644 --- a/pango/prj/build.lst +++ b/pango/prj/build.lst @@ -1,3 +1,3 @@ -pg pango : gettext glib soltools NULL +pg pango : gettext glib soltools cairo NULL pg pango usr1 - all pg_mkout NULL pg pango nmake - all pg_pango NULL |