[Libreoffice-commits] .: gdk-pixbuf/makefile.mk libgsf/makefile.mk librsvg/makefile.mk pango/makefile.mk

[Christian Lohmaier]

 gdk-pixbuf/makefile.mk |    5 +++++
 libgsf/makefile.mk     |   19 +++++++++----------
 librsvg/makefile.mk    |    4 ++++
 pango/makefile.mk      |    7 +++++--
 4 files changed, 23 insertions(+), 12 deletions(-)

New commits:
commit a7c02ed28a8ff20ada18ba82f97b0d67f604d5d8
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Sat Mar 24 02:10:51 2012 +0100

    help XCode 2.5 resolve @loader_path/libfoo.dylib

diff --git a/gdk-pixbuf/makefile.mk b/gdk-pixbuf/makefile.mk
index 3beb162..c2709ec 100644
--- a/gdk-pixbuf/makefile.mk
+++ b/gdk-pixbuf/makefile.mk
@@ -50,6 +50,11 @@ TARFILE_MD5=a7d6c5f2fe2d481149ed3ba807b5c043
 .IF "$(OS)"=="MACOSX"
 
 PATCH_FILES=gdk-pixbuf-2.23.0.patch
+
+LOADER_PATTERN:=-Wl,-dylib_file, at loader_path/REPLACEME:$(SOLARLIBDIR)/REPLACEME
+LOADER_LIBS:=glib-2.0.0 gmodule-2.0.0 gobject-2.0.0 gthread-2.0.0
+EXTRA_LINKFLAGS+=$(foreach,lib,$(LOADER_LIBS) $(subst,REPLACEME,lib$(lib).dylib $(LOADER_PATTERN)))
+
 CONFIGURE_DIR=
 CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) \
                 BASE_DEPENDENCIES_CFLAGS="-I$(SOLARINCDIR)/external -I$(SOLARINCDIR)/external/glib-2.0" \
diff --git a/libgsf/makefile.mk b/libgsf/makefile.mk
index 095d059..684ea56 100644
--- a/libgsf/makefile.mk
+++ b/libgsf/makefile.mk
@@ -48,8 +48,6 @@ LIBGSFVERSION=1.14.19
 TARFILE_NAME=$(PRJNAME)-$(LIBGSFVERSION)
 TARFILE_MD5=3a84ac2da37cae5bf7ce616228c6fbde
 
-.IF "$(OS)"=="MACOSX" || "$(OS)"=="WNT"
-
 .IF "$(OS)" == "WNT"
 PATCH_FILES=libgsf-1.14.19.windows.patch
 
@@ -60,15 +58,21 @@ ADDITIONAL_FILES=\
     gsf/makefile.mk \
     gsf/gsf-config.h
 
-.ELSE
+.ENDIF
+
+.IF "$(OS)"=="MACOSX"
 PATCH_FILES=libgsf-1.14.19.patch
 
+LOADER_PATTERN:=-Wl,-dylib_file, at loader_path/REPLACEME:$(SOLARLIBDIR)/REPLACEME
+LOADER_LIBS:=glib-2.0.0 gmodule-2.0.0 gobject-2.0.0 gthread-2.0.0
+EXTRA_LINKFLAGS+=$(foreach,lib,$(LOADER_LIBS) $(subst,REPLACEME,lib$(lib).dylib $(LOADER_PATTERN)))
+
 CONFIGURE_DIR=
 CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) \
                  ./configure \
                  --prefix=/@.__________________________________________________$(EXTRPATH) \
                  CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) $(LIBXML_CFLAGS) -I$(SOLARINCDIR)/external -I$(SOLARINCDIR)/external/glib-2.0" \
-                 LDFLAGS="-L$(SOLARLIBDIR) $(eq,$(OS),MACOSX $(EXTRA_LINKFLAGS) $(NULL))" \
+                 LDFLAGS="-L$(SOLARLIBDIR) $(EXTRA_LINKFLAGS)" \
                  --without-python \
                  --without-bonobo \
                  --with-bz2 \
@@ -84,7 +88,7 @@ CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) \
                  GDK_PIXBUF_LIBS="-lgdk_pixbuf-2.0"
                  
                  
-CONFIGURE_FLAGS=$(eq,$(OS),MACOSX CPPFLAGS="$(EXTRA_CDEFS)" $(NULL))
+CONFIGURE_FLAGS=CPPFLAGS="$(EXTRA_CDEFS)"
 
 .IF "$(CROSS_COMPILING)"=="YES"
 CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
@@ -94,9 +98,6 @@ BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) \
              $(GNUMAKE)
 BUILD_DIR=$(CONFIGURE_DIR)
 
-.ENDIF
-
-.IF "$(OS)"=="MACOSX"
 OUT2LIB+=gsf/.libs/libgsf-1.114.dylib
 .ENDIF
 
@@ -149,8 +150,6 @@ OUT2INC+=gsf/gsf-input-http.h
 OUT2INC+=gsf/gsf-outfile-zip.h
 OUT2INC+=gsf/gsf.h
 
-.ENDIF
-
 # --- Targets ------------------------------------------------------
 
 .INCLUDE : set_ext.mk
diff --git a/librsvg/makefile.mk b/librsvg/makefile.mk
index 2383167..fea2c8f 100644
--- a/librsvg/makefile.mk
+++ b/librsvg/makefile.mk
@@ -53,6 +53,10 @@ TARFILE_MD5=d7a242ca43e33e1b63d3073f9d46a6a8
 
 PATCH_FILES=librsvg-2.32.1.patch
 
+LOADER_PATTERN:=-Wl,-dylib_file, at loader_path/REPLACEME:$(SOLARLIBDIR)/REPLACEME
+LOADER_LIBS:=cairo.2 gio-2.0.0 glib-2.0.0 gmodule-2.0.0 gobject-2.0.0 gthread-2.0.0 intl.8 pango-1.0.0
+EXTRA_LINKFLAGS+=$(foreach,lib,$(LOADER_LIBS) $(subst,REPLACEME,lib$(lib).dylib $(LOADER_PATTERN)))
+
 .IF "$(LIBXML_LIBS)" == ""
 LIBXML_LIBS=-lxml2
 .ENDIF
diff --git a/pango/makefile.mk b/pango/makefile.mk
index ec18260..2fb2db8 100644
--- a/pango/makefile.mk
+++ b/pango/makefile.mk
@@ -53,13 +53,16 @@ TARFILE_MD5=22ad1c8d3fda7e73b0798035f3dd96bc
 
 PATCH_FILES=pango-1.28.3.patch
 
-CONFIGURE_LDFLAGS="-L$(SOLARLIBDIR)"
+LOADER_PATTERN:=-Wl,-dylib_file, at loader_path/REPLACEME:$(SOLARLIBDIR)/REPLACEME
+LOADER_LIBS:=glib-2.0.0 gthread-2.0.0
+EXTRA_LINKFLAGS+=$(foreach,lib,$(LOADER_LIBS) $(subst,REPLACEME,lib$(lib).dylib $(LOADER_PATTERN)))
+
 CONFIGURE_DIR=
 CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) \
                  ./configure --prefix=/@.__________________________________________________$(EXTRPATH) --disable-dependency-tracking --disable-doc-cross-references \
                  CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) $(EXTRA_CDEFS) -I$(SOLARINCDIR) -I$(SOLARINCDIR)/external -I$(SOLARINCDIR)/external/glib-2.0" \
                  CXXFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) $(EXTRA_CDEFS) -I$(SOLARINCDIR) -I$(SOLARINCDIR)/external -I$(SOLARINCDIR)/external/glib-2.0" \
-                 LDFLAGS="$(CONFIGURE_LDFLAGS)" \
+                 LDFLAGS="-L$(SOLARLIBDIR) $(EXTRA_LINKFLAGS)" \
                  CAIRO_CFLAGS="-I$(SOLARINCDIR) -I$(SOLARINCDIR)/cairo" \
                  CAIRO_LIBS="-lcairo" \
                  GLIB_CFLAGS="-I$(SOLARINCDIR)/external/glib-2.0" \