icu/ExternalProject_icu.mk | 2 +-
liblangtag/ExternalProject_langtag.mk | 6 +++---
libxml2/ExternalProject_xml2.mk | 2 +-
libxmlsec/ExternalProject_xmlsec.mk | 6 +++---
libxslt/ExternalProject_xslt.mk | 2 +-
redland/ExternalProject_raptor.mk | 2 +-
redland/ExternalProject_rasqal.mk | 2 +-
redland/ExternalProject_redland.mk | 2 +-
vcl/Library_vclplug_gen.mk | 4 ++--
xpdf/ExternalProject_xpdf.mk | 2 +-
10 files changed, 15 insertions(+), 15 deletions(-)
New commits:
commit 08eb3c34c209184a8a7d1ea63cc97a0c5205aa7c
Author: Norbert Thiebaud <nthieb...@gmail.com>
Date: Sat Feb 23 16:04:37 2013 -0600
comma need to be escape in Makefile when in argument of $(call
Change-Id: I930aacad47780a085ef8eec7f3b7fc6600528afb
diff --git a/icu/ExternalProject_icu.mk b/icu/ExternalProject_icu.mk
index a376b4f..71d6cba 100644
--- a/icu/ExternalProject_icu.mk
+++ b/icu/ExternalProject_icu.mk
@@ -33,7 +33,7 @@ $(call gb_ExternalProject_get_state_target,icu,build) :
$(call gb_ExternalProject_run,build,\
CPPFLAGS=$(icu_CPPFLAGS) CFLAGS="-O -D_MT" CXXFLAGS="-O -D_MT" \
LIBS="$(if $(filter
YES,$(MINGW_SHARED_GXXLIB)),$(MINGW_SHARED_LIBSTDCPP))" \
- LDFLAGS="-L$(COMPATH)/lib -Wl,--enable-runtime-pseudo-reloc-v2 \
+ LDFLAGS="-L$(COMPATH)/lib
-Wl$(COMMA)--enable-runtime-pseudo-reloc-v2 \
$(if $(filter
YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \
./configure
$(if $(filter
YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \
diff --git a/liblangtag/ExternalProject_langtag.mk
b/liblangtag/ExternalProject_langtag.mk
index 2ddcbc2..24d4a8c 100644
--- a/liblangtag/ExternalProject_langtag.mk
+++ b/liblangtag/ExternalProject_langtag.mk
@@ -30,9 +30,9 @@ $(call gb_ExternalProject_get_state_target,langtag,build):
$(if $(filter
MSC,$(COM)),LIBXML2_LIBS="$(OUTDIR)/lib/libxml2.lib",LIBXML2_LIBS="-L$(OUTDIR)/lib
-lxml2"),\
$(if $(filter MACOSX,$(OS)),LIBXML2_CFLAGS="$(LIBXML_CFLAGS)"
LIBXML2_LIBS="$(LIBXML_LIBS)")) \
$(if $(filter
MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO)
\
- $(if $(filter-out LINUX FREEBSD,$(OS)),,LDFLAGS="-Wl,-z,origin
-Wl,-rpath,\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib) \
- $(if $(filter-out SOLARIS,$(OS)),,LDFLAGS="-Wl,-z,origin
-Wl,-R,\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib) \
- $(if $(filter-out
WNTGCC,$(OS)$(COM)),,LDFLAGS="-Wl,--enable-runtime-pseudo-reloc-v2") \
+ $(if $(filter-out LINUX
FREEBSD,$(OS)),,LDFLAGS="-Wl$(COMMA)-z$(COMMA)origin
-Wl$(COMMA)-rpath,\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib) \
+ $(if $(filter-out
SOLARIS,$(OS)),,LDFLAGS="-Wl$(COMMA)-z$(COMMA)origin
-Wl$(COMMA)-R$(COMMA)\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib) \
+ $(if $(filter-out
WNTGCC,$(OS)$(COM)),,LDFLAGS="-Wl$(COMMA)--enable-runtime-pseudo-reloc-v2") \
&& $(MAKE) \
)
# vim: set noet sw=4 ts=4:
diff --git a/libxml2/ExternalProject_xml2.mk b/libxml2/ExternalProject_xml2.mk
index fc68d9d..8d7f00c 100644
--- a/libxml2/ExternalProject_xml2.mk
+++ b/libxml2/ExternalProject_xml2.mk
@@ -24,7 +24,7 @@ $(call gb_ExternalProject_get_state_target,xml2,build):
$(if $(filter
YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
CC="$(CC) -mthreads $(if $(filter
YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \
LIBS="-lws2_32 $(if $(filter
YES,$(MINGW_SHARED_GXXLIB)),$(MINGW_SHARED_LIBSTDCPP))" \
- LDFLAGS="-Wl,--no-undefined
-Wl,--enable-runtime-pseudo-reloc-v2" \
+ LDFLAGS="-Wl$(COMMA)--no-undefined
-Wl$(COMMA)--enable-runtime-pseudo-reloc-v2" \
OBJDUMP=objdump \
&& $(MAKE) \
)
diff --git a/libxmlsec/ExternalProject_xmlsec.mk
b/libxmlsec/ExternalProject_xmlsec.mk
index c589e3d..14ce4ae 100644
--- a/libxmlsec/ExternalProject_xmlsec.mk
+++ b/libxmlsec/ExternalProject_xmlsec.mk
@@ -27,7 +27,7 @@ $(call gb_ExternalProject_get_state_target,xmlsec,build) :
--without-libxslt --without-openssl --without-gnutls
--disable-crypto-dl \
$(if $(filter NO,$(SYSTEM_NSS)),--disable-pkgconfig) \
CC="$(CC) -mthreads $(if $(filter
YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \
- LDFLAGS="-Wl,--no-undefined $(ILIB:;= -L)" \
+ LDFLAGS="-Wl$(COMMA)--no-undefined $(ILIB:;= -L)" \
LIBS="$(if $(filter
YES,$(MINGW_SHARED_GXXLIB)),$(MINGW_SHARED__LIBSTDCPP))" \
&& $(MAKE) \
)
@@ -54,8 +54,8 @@ $(call gb_ExternalProject_get_state_target,xmlsec,build) :
$(if $(filter NO,$(SYSTEM_NSS))$(filter
MACOSX,$(OS)),--disable-pkgconfig) \
$(if $(filter
YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(SYSBASE),CFLAGS="-I$(SYSBASE)/usr/include" \
- LDFLAGS="-L$(SYSBASE)/usr/lib $(if $(filter-out LINUX
FREEBSD,$(OS)),,-Wl,-z,origin
-Wl,-rpath,\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib),\
- $(if $(filter-out
MACOSX,$(OS)),,LDFLAGS="-Wl,-dylib_file,@executable_path/libnssutil3.dylib:$(OUTDIR)/lib/libnssutil3.dylib"))
\
+ LDFLAGS="-L$(SYSBASE)/usr/lib $(if $(filter-out LINUX
FREEBSD,$(OS)),,-Wl$(COMMA)-z$(COMMA)origin
-Wl$(COMMA)-rpath$(COMMA)\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib),\
+ $(if $(filter-out
MACOSX,$(OS)),,LDFLAGS="-Wl$(COMMA)-dylib_file$(COMMA)@executable_path/libnssutil3.dylib:$(OUTDIR)/lib/libnssutil3.dylib"))
\
&& $(MAKE) \
)
diff --git a/libxslt/ExternalProject_xslt.mk b/libxslt/ExternalProject_xslt.mk
index e468267..15247df 100644
--- a/libxslt/ExternalProject_xslt.mk
+++ b/libxslt/ExternalProject_xslt.mk
@@ -24,7 +24,7 @@ $(call gb_ExternalProject_get_state_target,xslt,build):
$(if $(filter
YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
CC="$(CC) -mthreads $(if $(filter
YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \
$(if $(filter
YES,$(MINGW_SHARED_GXXLIB)),LIBS="$(MINGW_SHARED_LIBSTDCPP)") \
- LDFLAGS="-Wl,--no-undefined
-Wl,--enable-runtime-pseudo-reloc-v2" \
+ LDFLAGS="-Wl$(COMMA)--no-undefined
-Wl$(COMMA)--enable-runtime-pseudo-reloc-v2" \
OBJDUMP=objdump \
&& chmod 777 xslt-config \
&& $(MAKE) \
diff --git a/redland/ExternalProject_raptor.mk
b/redland/ExternalProject_raptor.mk
index fdd7c09..9afe712 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,--no-undefined
-Wl,--enable-runtime-pseudo-reloc-v2 -Wl,--export-all-symbols $(subst ;,
-L,$(ILIB))" \
+ LDFLAGS="-Wl$(COMMA)--no-undefined
-Wl$(COMMA)--enable-runtime-pseudo-reloc-v2 -Wl$(COMMA)--export-all-symbols
$(subst ;$(COMMA) -L$(COMMA)$(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 c6397db..985c247 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,--no-undefined
-Wl,--enable-runtime-pseudo-reloc-v2 -Wl,--export-all-symbols $(subst ;,
-L,$(ILIB))" \
+ LDFLAGS="-Wl$(COMMA)--no-undefined
-Wl$(COMMA)--enable-runtime-pseudo-reloc-v2 -Wl$(COMMA)--export-all-symbols
$(subst ;$(COMMA) -L$(COMMA)$(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 609827b..579af82 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,--no-undefined
-Wl,--enable-runtime-pseudo-reloc-v2 -Wl,--export-all-symbols $(subst ;,
-L,$(ILIB))" \
+ LDFLAGS="-Wl$(COMMA)--no-undefined
-Wl$(COMMA)--enable-runtime-pseudo-reloc-v2 -Wl$(COMMA)--export-all-symbols
$(subst ;$(COMMA) -L$(COMMA)$(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/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk
index d864a32..edf16e0 100644
--- a/vcl/Library_vclplug_gen.mk
+++ b/vcl/Library_vclplug_gen.mk
@@ -105,7 +105,7 @@ $(eval $(call gb_Library_add_defs,vclplug_gen,\
-DVCLPLUG_GEN_IMPLEMENTATION \
))
-## handle RandR
+## handle RandR
ifneq ($(ENABLE_RANDR),)
$(eval $(call gb_Library_use_externals,vclplug_gen,\
Xrandr \
@@ -128,7 +128,7 @@ $(eval $(call gb_Library_add_libs,vclplug_gen,\
))
else
$(eval $(call gb_Library_add_libs,vclplug_gen,\
- -Wl,-Bstatic -lXinerama -Wl,-Bdynamic \
+ -Wl$(COMMA)-Bstatic -lXinerama -Wl$(COMMA)-Bdynamic \
))
endif
else # Solaris/Xsun
diff --git a/xpdf/ExternalProject_xpdf.mk b/xpdf/ExternalProject_xpdf.mk
index 31a1a0a..a81cb15 100644
--- a/xpdf/ExternalProject_xpdf.mk
+++ b/xpdf/ExternalProject_xpdf.mk
@@ -21,7 +21,7 @@ $(call gb_ExternalProject_get_state_target,xpdf,build):
$(call gb_ExternalProject_run,build,\
./configure --without-x --enable-multithreaded
--enable-exceptions \
$(if $(filter
YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
- LDFLAGS="-Wl,--enable-runtime-pseudo-reloc-v2" \
+ LDFLAGS="-Wl$(COMMA)--enable-runtime-pseudo-reloc-v2" \
LIBS="-lgdi32" \
&& $(MAKE) \
)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
