libcroco/makefile.mk | 11 +++++++++-- libxml2/prj/d.lst | 2 ++ libxslt/prj/d.lst | 5 +++++ solenv/bin/macosx-change-install-names.pl | 1 + 4 files changed, 17 insertions(+), 2 deletions(-)
New commits: commit ad08d139e09adf78227a20c3f67d6cea56e52cae Author: Stephan Bergmann <sberg...@redhat.com> Date: Thu Feb 23 16:26:23 2012 +0100 Tentative libcroco fix for Mac OS X --without-system-libxml diff --git a/libcroco/makefile.mk b/libcroco/makefile.mk index d405f95..28c588b 100644 --- a/libcroco/makefile.mk +++ b/libcroco/makefile.mk @@ -51,14 +51,21 @@ PATCH_FILES= CONFIGURE_DIR= .IF "$(OS)"=="MACOSX" +.IF "$(SYSTEM_LIBXML)" == "YES" +my_libxml2_cflags=$(LIBXML_CFLAGS) +my_libxml2_libs=$(LIBXML_LIBS) +.ELSE +my_libxml2_cflags=-I$(SOLARINCDIR)/external/libxml +my_libxml2_libs=-L$(SOLARLIBDIR) -lxml2 +.ENDIF CONFIGURE_ACTION=./configure --prefix=$(SRC_ROOT)/$(PRJNAME)/$(MISC) \ CPPFLAGS="$(EXTRA_CDEFS)" \ CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) -I$(SOLARINCDIR)/external -I$(SOLARINCDIR)/external/glib-2.0" \ LDFLAGS="-L$(SOLARLIBDIR) $(EXTRA_LINKFLAGS) -Wl,-dylib_file,@loader_path/libgmodule-2.0.0.dylib:$(SOLARLIBDIR)/libgmodule-2.0.0.dylib" \ GLIB2_CFLAGS="-I$(SOLARINCDIR)/external/glib-2.0" \ GLIB2_LIBS="-lgio-2.0 -lgobject-2.0 -lgthread-2.0 -lglib-2.0 -lintl" \ - LIBXML2_CFLAGS="$(LIBXML_CFLAGS)" \ - LIBXML2_LIBS="$(LIBXML_LIBS)" + LIBXML2_CFLAGS='$(my_libxml2_cflags)' \ + LIBXML2_LIBS='$(my_libxml2_libs)' .IF "$(CROSS_COMPILING)"=="YES" CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) commit e3e4ac30c82893ccac1a3de1919401363a8117c3 Author: Stephan Bergmann <sberg...@redhat.com> Date: Thu Feb 23 12:43:25 2012 +0100 Add shl/LOADER/URELIB to make --without-sytem-libxml work on Mac OS X I doubt that the "LOADER" token is needed at all, but will investigate that later. diff --git a/solenv/bin/macosx-change-install-names.pl b/solenv/bin/macosx-change-install-names.pl index 57f4e79..290a488 100644 --- a/solenv/bin/macosx-change-install-names.pl +++ b/solenv/bin/macosx-change-install-names.pl @@ -42,6 +42,7 @@ sub action($$$) 'shl/OOO/URELIB' => '@loader_path/../ure-link/lib', 'shl/OOO/OOO' => '@loader_path', 'shl/LOADER/LOADER' => '@loader_path', + 'shl/LOADER/URELIB' => '@loader_path/../ure-link/lib', 'shl/OXT/URELIB' => '@executable_path/urelibs', 'shl/NONE/URELIB' => '@__VIA_LIBRARY_PATH__', 'shl/OOO/NONE' => '@__VIA_LIBRARY_PATH__', commit ec66f8076d8e4a7bef8384914e29988724fabd3d Author: Petr Mladek <pmla...@suse.cz> Date: Thu Feb 23 11:10:53 2012 +0100 set back rpath to ure/lib for libxml on MAC The library is installed in ure/lib. Thanks Stefan Bergman for the pointer. diff --git a/libxml2/makefile.mk b/libxml2/makefile.mk index d39b8a5..1d125c1 100644 --- a/libxml2/makefile.mk +++ b/libxml2/makefile.mk @@ -137,7 +137,7 @@ CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) OUTDIR2INC=include$/libxml .IF "$(OS)"=="MACOSX" -EXTRPATH=LOADER +EXTRPATH=URELIB OUT2LIB+=.libs$/libxml2.*.dylib OUT2BIN+=.libs$/xmllint OUT2BIN+=xml2-config commit 3528f212934f92e66b55edf7dfd59ed448b54027 Author: Norbert Thiebaud <nthieb...@gmail.com> Date: Wed Feb 22 15:58:19 2012 -0600 support using for libxml2 internal on MacOSX diff --git a/libxml2/makefile.mk b/libxml2/makefile.mk index 1d125c1..d39b8a5 100644 --- a/libxml2/makefile.mk +++ b/libxml2/makefile.mk @@ -137,7 +137,7 @@ CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) OUTDIR2INC=include$/libxml .IF "$(OS)"=="MACOSX" -EXTRPATH=URELIB +EXTRPATH=LOADER OUT2LIB+=.libs$/libxml2.*.dylib OUT2BIN+=.libs$/xmllint OUT2BIN+=xml2-config diff --git a/libxml2/prj/d.lst b/libxml2/prj/d.lst index 6e7bbb4..d5e98d4 100644 --- a/libxml2/prj/d.lst +++ b/libxml2/prj/d.lst @@ -2,6 +2,8 @@ mkdir: %_DEST%\inc\external\libxml ..\%__SRC%\inc\libxml\*.h %_DEST%\inc\external\libxml\*.h ..\%__SRC%\lib\libxml2.so.2 %_DEST%\lib\libxml2.so.2 symlink: %_DEST%\lib\libxml2.so.2 %_DEST%\lib\libxml2.so +..\%__SRC%\lib\libxml2.2.dylib %_DEST%\lib\libxml2.2.dylib +symlink: %_DEST%\lib\libxml2.2.dylib %_DEST%\lib\libxml2.dylib ..\%__SRC%\lib\libxml2.so %_DEST%\lib\libxml2.so ..\%__SRC%\lib\*.lib %_DEST%\lib ..\%__SRC%\lib\libxml2.dll.a %_DEST%\lib\libxml2.dll.a diff --git a/libxslt/prj/d.lst b/libxslt/prj/d.lst index 0627cc1..f3613b0 100644 --- a/libxslt/prj/d.lst +++ b/libxslt/prj/d.lst @@ -1,10 +1,15 @@ mkdir: %_DEST%\inc\external\libxslt ..\%__SRC%\inc\*.h %_DEST%\inc\external\libxslt\*.h +..\%__SRC%\lib\libxslt.1.dylib %_DEST%\lib\libxslt.1.dylib +symlink: %_DEST%\lib\libxslt.1.dylib %_DEST%\lib\libxslt.dylib +...\%__SRC%\lib\libexslt.so %_DEST%\lib\libexslt.so ..\%__SRC%\lib\libxslt.so.1 %_DEST%\lib\libxslt.so.1 symlink: %_DEST%\lib\libxslt.so.1 %_DEST%\lib\libxslt.so ..\%__SRC%\lib\libxslt.so %_DEST%\lib\libxslt.so ..\%__SRC%\lib\libexslt.so.0 %_DEST%\lib\libexslt.so.0 symlink: %_DEST%\lib\libexslt.so.0 %_DEST%\lib\libexslt.so +..\%__SRC%\lib\libexslt.0.dylib %_DEST%\lib\libexslt.0.dylib +symlink: %_DEST%\lib\libexslt.0.dylib %_DEST%\lib\libexslt.dylib ..\%__SRC%\lib\libexslt.so %_DEST%\lib\libexslt.so ..\%__SRC%\lib\libxslt*.* %_DEST%\lib\libxslt*.* ..\%__SRC%\lib\lib*.dll.a %_DEST%\lib\*.a _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits