diff options
| author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2011-06-14 15:04:04 +0200 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2011-06-14 15:04:04 +0200 |
| commit | 4ef9af9e9507ef68882277f3abb0128e90178ddc (patch) | |
| tree | 580dbf2d99d0c3ba971a76e97417df11d855983a /librsvg | |
| parent | 3c1e5d564cfd06105ed9d119dd2a5509e6c316d2 (diff) | |
remove noise from configure on Mac, use --disable-dependency-tracking
Diffstat (limited to 'librsvg')
| -rw-r--r-- | librsvg/librsvg-2.32.1.patch | 19 | ||||
| -rwxr-xr-x | librsvg/makefile.mk | 4 |
2 files changed, 20 insertions, 3 deletions
diff --git a/librsvg/librsvg-2.32.1.patch b/librsvg/librsvg-2.32.1.patch index 0b7534d8119e..2d9fc0fc216a 100644 --- a/librsvg/librsvg-2.32.1.patch +++ b/librsvg/librsvg-2.32.1.patch @@ -40,4 +40,21 @@ LIBCROCOPKG="" test_croco=true - +@@ -13376,13 +13380,13 @@ + + + +-GLIB_PREFIX=$($PKG_CONFIG --variable=prefix glib-2.0) ++#GLIB_PREFIX=$($PKG_CONFIG --variable=prefix glib-2.0) + +-GDK_PIXBUF_PREFIX=$($PKG_CONFIG --variable=prefix gdk-pixbuf-2.0) ++#GDK_PIXBUF_PREFIX=$($PKG_CONFIG --variable=prefix gdk-pixbuf-2.0) + +-GTK_PREFIX=$($PKG_CONFIG --variable=prefix gdk-pixbuf-2.0) ++#GTK_PREFIX=$($PKG_CONFIG --variable=prefix gdk-pixbuf-2.0) + +-CAIRO_PREFIX=$($PKG_CONFIG --variable=prefix cairo) ++#CAIRO_PREFIX=$($PKG_CONFIG --variable=prefix cairo) + + + diff --git a/librsvg/makefile.mk b/librsvg/makefile.mk index 664baf6e730c..63f45e3e6f3d 100755 --- a/librsvg/makefile.mk +++ b/librsvg/makefile.mk @@ -62,7 +62,7 @@ CONFIGURE_DIR= CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) ./configure \ --prefix=$(SRC_ROOT)/$(PRJNAME)/$(MISC) CONFIGURE_FLAGS=--disable-gtk-theme --disable-tools --with-croco --with-svgz \ - --disable-pixbuf-loader \ + --disable-pixbuf-loader --disable-dependency-tracking $(eq,$(VERBOSE),$(NULL) --enable-silent-rules --disable-silent-rules) \ LIBRSVG_CFLAGS="-I$(SOLARINCDIR)/external/glib-2.0 -I$(SOLARINCDIR)/external/gdk-pixbuf-2.0 -I$(SOLARINCDIR)/external/pango-1.0 -I$(SOLARINCDIR)/cairo $(LIBXML_CFLAGS)" \ LIBRSVG_LIBS="-L$(SOLARLIBDIR) -lgdk_pixbuf-2.0 -lpango-1.0 -lpangocairo-1.0 -lgthread-2.0 -lgio-2.0 -lgmodule-2.0 -lgobject-2.0 -lglib-2.0 $(LIBXML_LIBS) -lcairo -lintl" \ GDK_PIXBUF_CFLAGS="-I$(SOLARINCDIR)/external/gdk-pixbuf-2.0" \ @@ -71,7 +71,7 @@ CONFIGURE_FLAGS=--disable-gtk-theme --disable-tools --with-croco --with-svgz \ GTHREAD_LIBS=-lgthread-2.0 \ LIBCROCO_CFLAGS="-I$(SOLARINCDIR)/external/libcroco-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" \ + 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)" CONFIGURE_FLAGS+= CPPFLAGS="$(ARCH_FLAGS) $(EXTRA_CDEFS)" |