redland/ExternalPackage_raptor.mk | 3 +++ redland/ExternalPackage_rasqal.mk | 3 +++ redland/ExternalPackage_redland.mk | 3 +++ redland/ExternalProject_raptor.mk | 2 +- redland/ExternalProject_rasqal.mk | 2 +- redland/ExternalProject_redland.mk | 2 +- 6 files changed, 12 insertions(+), 3 deletions(-)
New commits: commit 93c0baa1be2aad3d861324019ee4861ca2392fa4 Author: David Tardon <[email protected]> Date: Wed Mar 13 13:12:57 2013 +0100 deliver the right libs on mingw Change-Id: Icaf839ba851ca231de35526a002bc4a268f12519 diff --git a/redland/ExternalPackage_raptor.mk b/redland/ExternalPackage_raptor.mk index 1b5df27..05a2f05 100644 --- a/redland/ExternalPackage_raptor.mk +++ b/redland/ExternalPackage_raptor.mk @@ -18,6 +18,9 @@ $(eval $(call gb_ExternalPackage_add_file,raptor,lib/libraptor-lo.1.dylib,src/.l $(eval $(call gb_ExternalPackage_add_file,raptor,lib/libraptor.dylib,src/.libs/libraptor-lo.1.dylib)) else ifneq ($(filter IOS ANDROID,$(OS)),) $(eval $(call gb_ExternalPackage_add_file,raptor,lib/libraptor.a,src/.libs/libraptor.a)) +else ifneq ($(filter WNTGCC,$(OS)$(COM)),) +$(eval $(call gb_ExternalPackage_add_file,raptor,lib/libraptor.dll.a,src/.libs/libraptor.dll.a)) +$(eval $(call gb_ExternalPackage_add_file,raptor,bin/libraptor-1.dll,src/.libs/libraptor-1.dll)) else ifneq ($(filter WNT,$(OS)),) $(eval $(call gb_ExternalPackage_add_file,raptor,lib/libraptor.a,src/.libs/libraptor.a)) $(eval $(call gb_ExternalPackage_add_file,raptor,bin/libraptor.dll,src/.libs/libraptor.dll)) diff --git a/redland/ExternalPackage_rasqal.mk b/redland/ExternalPackage_rasqal.mk index ddb4e5b..34b83e5 100644 --- a/redland/ExternalPackage_rasqal.mk +++ b/redland/ExternalPackage_rasqal.mk @@ -18,6 +18,9 @@ $(eval $(call gb_ExternalPackage_add_file,rasqal,lib/librasqal-lo.1.dylib,src/.l $(eval $(call gb_ExternalPackage_add_file,rasqal,lib/librasqal.dylib,src/.libs/librasqal-lo.1.dylib)) else ifneq ($(filter IOS ANDROID,$(OS)),) $(eval $(call gb_ExternalPackage_add_file,rasqal,lib/librasqal.a,src/.libs/librasqal.a)) +else ifneq ($(filter WNTGCC,$(OS)$(COM)),) +$(eval $(call gb_ExternalPackage_add_file,rasqal,lib/librasqal.dll.a,src/.libs/librasqal.dll.a)) +$(eval $(call gb_ExternalPackage_add_file,rasqal,bin/librasqal-1.dll,src/.libs/librasqal-1.dll)) else ifneq ($(filter WNT,$(OS)),) $(eval $(call gb_ExternalPackage_add_file,rasqal,lib/librasqal.a,src/.libs/librasqal.a)) $(eval $(call gb_ExternalPackage_add_file,rasqal,bin/librasqal.dll,src/.libs/librasqal.dll)) diff --git a/redland/ExternalPackage_redland.mk b/redland/ExternalPackage_redland.mk index a0c8a73..eb0b4ff 100644 --- a/redland/ExternalPackage_redland.mk +++ b/redland/ExternalPackage_redland.mk @@ -16,6 +16,9 @@ $(eval $(call gb_ExternalPackage_add_file,redland,lib/librdf-lo.0.dylib,librdf/. $(eval $(call gb_ExternalPackage_add_file,redland,lib/librdf.dylib,librdf/.libs/librdf-lo.0.dylib)) else ifneq ($(filter IOS ANDROID,$(OS)),) $(eval $(call gb_ExternalPackage_add_file,redland,lib/librdf.a,librdf/.libs/librdf.a)) +else ifneq ($(filter WNTGCC,$(OS)$(COM)),) +$(eval $(call gb_ExternalPackage_add_file,redland,lib/librdf.dll.a,librdf/.libs/librdf.dll.a)) +$(eval $(call gb_ExternalPackage_add_file,redland,bin/librdf-0.dll,librdf/.libs/librdf-0.dll)) else ifneq ($(filter WNT,$(OS)),) $(eval $(call gb_ExternalPackage_add_file,redland,lib/librdf.a,librdf/.libs/librdf.a)) $(eval $(call gb_ExternalPackage_add_file,redland,bin/librdf.dll,librdf/.libs/librdf.dll)) commit f8d5745ff6097dc8fe7f44e8e783b06b1d214aa2 Author: David Tardon <[email protected]> Date: Wed Mar 13 09:46:41 2013 +0100 do not escape too much Change-Id: Ia60a2522311ac7b9dc0ad1a65a79322a736f05c5 diff --git a/redland/ExternalProject_raptor.mk b/redland/ExternalProject_raptor.mk index 9afe712..48b3c52 100644 --- a/redland/ExternalProject_raptor.mk +++ b/redland/ExternalProject_raptor.mk @@ -21,7 +21,7 @@ ifeq ($(OS),WNT) $(call gb_ExternalProject_get_state_target,raptor,build): $(call gb_ExternalProject_run,build,\ CC="$(CC) -mthreads $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \ - LDFLAGS="-Wl$(COMMA)--no-undefined -Wl$(COMMA)--enable-runtime-pseudo-reloc-v2 -Wl$(COMMA)--export-all-symbols $(subst ;$(COMMA) -L$(COMMA)$(ILIB))" \ + LDFLAGS="-Wl$(COMMA)--no-undefined -Wl$(COMMA)--enable-runtime-pseudo-reloc-v2 -Wl$(COMMA)--export-all-symbols $(subst ;, -L,$(ILIB))" \ LIBXML2LIB="$(if $(filter YES,$(SYSTEM_LIBXML)),$(LIBXML_LIBS),-lxml2)" \ XSLTLIB="$(if $(filter YES,$(SYSTEM_LIBXSLT)),$(LIBXSLT_LIBS),-lxslt)" \ OBJDUMP="$(HOST_PLATFORM)-objdump" \ diff --git a/redland/ExternalProject_rasqal.mk b/redland/ExternalProject_rasqal.mk index 985c247..e7c6fbb 100644 --- a/redland/ExternalProject_rasqal.mk +++ b/redland/ExternalProject_rasqal.mk @@ -23,7 +23,7 @@ ifeq ($(OS),WNT) $(call gb_ExternalProject_get_state_target,rasqal,build): $(call gb_ExternalProject_run,build,\ CC="$(CC) -mthreads $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \ - LDFLAGS="-Wl$(COMMA)--no-undefined -Wl$(COMMA)--enable-runtime-pseudo-reloc-v2 -Wl$(COMMA)--export-all-symbols $(subst ;$(COMMA) -L$(COMMA)$(ILIB))" \ + LDFLAGS="-Wl$(COMMA)--no-undefined -Wl$(COMMA)--enable-runtime-pseudo-reloc-v2 -Wl$(COMMA)--export-all-symbols $(subst ;, -L$,$(ILIB))" \ LIBXML2LIB="$(if $(filter YES,$(SYSTEM_LIBXML)),$(LIBXML_LIBS),-lxml2)" \ XSLTLIB="$(if $(filter YES,$(SYSTEM_LIBXSLT)),$(LIBXSLT_LIBS),-lxslt)" \ OBJDUMP="$(HOST_PLATFORM)-objdump" \ diff --git a/redland/ExternalProject_redland.mk b/redland/ExternalProject_redland.mk index 579af82..f71beba 100644 --- a/redland/ExternalProject_redland.mk +++ b/redland/ExternalProject_redland.mk @@ -26,7 +26,7 @@ ifeq ($(OS),WNT) $(call gb_ExternalProject_get_state_target,redland,build): $(call gb_ExternalProject_run,build,\ CC="$(CC) -mthreads $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \ - LDFLAGS="-Wl$(COMMA)--no-undefined -Wl$(COMMA)--enable-runtime-pseudo-reloc-v2 -Wl$(COMMA)--export-all-symbols $(subst ;$(COMMA) -L$(COMMA)$(ILIB))" \ + LDFLAGS="-Wl$(COMMA)--no-undefined -Wl$(COMMA)--enable-runtime-pseudo-reloc-v2 -Wl$(COMMA)--export-all-symbols $(subst ;, -L,$(ILIB))" \ LIBXML2LIB="$(if $(filter YES,$(SYSTEM_LIBXML)),$(LIBXML_LIBS),-lxml2)" \ XSLTLIB="$(if $(filter YES,$(SYSTEM_LIBXSLT)),$(LIBXSLT_LIBS),-lxslt)" \ OBJDUMP="$(HOST_PLATFORM)-objdump" \ _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
