[Libreoffice-commits] core.git: liblangtag/ExternalProject_langtag.mk

2013-05-03 Thread Christian Lohmaier 
 liblangtag/ExternalProject_langtag.mk |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 35cd784f0635186910ddd35e25f47a2ed79d29ab
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date:   Fri May 3 15:54:03 2013 +0200

disable ccache on windows/msc when building liblangtag

liblangtag uses quoted strings in defines, like -DFOO=\value\ and
ccache (at least the one available from the windows build dependencies
wiki page) gets confused and doesn't parse the arguments correctly to
the actual compiler, resulting in the error
cl : Command line error D8003 : missing source filename

Change-Id: I456b98b8956a25ff9acd3ab776c0c6f149a08ac7
Reviewed-on: https://gerrit.libreoffice.org/3760
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com

diff --git a/liblangtag/ExternalProject_langtag.mk 
b/liblangtag/ExternalProject_langtag.mk
index 757c6775..9e344b9 100644
--- a/liblangtag/ExternalProject_langtag.mk
+++ b/liblangtag/ExternalProject_langtag.mk
@@ -19,6 +19,9 @@ $(eval $(call gb_ExternalProject_register_targets,langtag,\
build \
 ))
 
+# disable ccache on windows, as it doesn't cope with the quoted defines
+# liblangtag uses (-DBUILDDIR=\$(abs_top_builddir)\ and similar).
+# Results in cl : Command line error D8003 : missing source filename
 $(call gb_ExternalProject_get_state_target,langtag,build):
$(call gb_ExternalProject_run,build,\
./configure --disable-modules --disable-test 
--disable-introspection --disable-shared --enable-static --with-pic \
@@ -32,6 +35,6 @@ $(call gb_ExternalProject_get_state_target,langtag,build):
$(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) \
+$(if $(filter WNTMSC,$(OS)$(COM)),REAL_CC=$(shell cygpath 
-w $(lastword $(CC $(MAKE) \
)
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: liblangtag/ExternalProject_langtag.mk

2013-03-14 Thread Stephan Bergmann 
 liblangtag/ExternalProject_langtag.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c03448ddbb11d96e0c9985ddfaa4f2c5d6cd426e
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Mar 14 11:33:56 2013 +0100

Make liblangtag build for --without-system-libxml again, at least on Linux

...after 83d61d9f1b0c95de2cd1199d3f60be70dfa92bec move liblangtag to
gcc-wrapper.

Change-Id: I5c9321bf4cafb5e6c1a078162ce3cc5f73540ce5

diff --git a/liblangtag/ExternalProject_langtag.mk 
b/liblangtag/ExternalProject_langtag.mk
index 6f6923c..22e35c6 100644
--- a/liblangtag/ExternalProject_langtag.mk
+++ b/liblangtag/ExternalProject_langtag.mk
@@ -24,7 +24,7 @@ $(call gb_ExternalProject_get_state_target,langtag,build):
./configure --disable-modules --disable-test 
--disable-introspection --disable-shared --enable-static --with-pic \
$(if $(filter 
TRUE,$(HAVE_GCC_BUILTIN_ATOMIC)),lt_cv_has_atomic=yes,lt_cv_has_atomic=no) \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)) \
-   $(if $(filter NO,$(SYSTEM_LIBXML)),LIBXML2_CFLAGS=-I$(call 
gb_UnpackedTarball_get_dir,xml2)/include LIBXML2_LIBS= ,\
+   $(if $(filter NO,$(SYSTEM_LIBXML)),LIBXML2_CFLAGS=-I$(call 
gb_UnpackedTarball_get_dir,xml2)/include 
LIBXML2_LIBS=-L$(gb_Helper_OUTDIRLIBDIR) -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$(COMMA)-z$(COMMA)origin 
-Wl$(COMMA)-rpath,\\\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: liblangtag/ExternalProject_langtag.mk libxmlsec/ExternalProject_xmlsec.mk libxslt/ExternalProject_xslt.mk redland/ExternalProject_raptor.mk redland/ExternalProject_rasq

2013-02-21 Thread Michael Stahl 
 liblangtag/ExternalProject_langtag.mk |4 ++--
 libxmlsec/ExternalProject_xmlsec.mk   |2 +-
 libxslt/ExternalProject_xslt.mk   |5 +++--
 redland/ExternalProject_raptor.mk |4 ++--
 redland/ExternalProject_rasqal.mk |6 +++---
 redland/ExternalProject_redland.mk|8 
 6 files changed, 15 insertions(+), 14 deletions(-)

New commits:
commit 0e72992d7492f36716e73068f9f93d9f25da9b02
Author: Michael Stahl mst...@redhat.com
Date:   Fri Feb 22 00:52:40 2013 +0100

libxslt, redland: properly quote rpath $ORIGIN

... so it can be passed from make to shell to configure to generated
Makefile to libtool to invoked gcc without loss of valuable dollars.

It is an open question to which extent this commit should be credited to
the designers of sh, autoconf, libtool, make, and/or Solaris ld.

Change-Id: I0709a49d7025dbfda4d9c0e7202ea932ec85e0cb

diff --git a/liblangtag/ExternalProject_langtag.mk 
b/liblangtag/ExternalProject_langtag.mk
index 81ec9a2..8f6f801 100644
--- a/liblangtag/ExternalProject_langtag.mk
+++ b/liblangtag/ExternalProject_langtag.mk
@@ -30,8 +30,8 @@ $(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 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) \
 $(MAKE) \
 touch $@
diff --git a/libxmlsec/ExternalProject_xmlsec.mk 
b/libxmlsec/ExternalProject_xmlsec.mk
index f603954..a0b182b 100644
--- a/libxmlsec/ExternalProject_xmlsec.mk
+++ b/libxmlsec/ExternalProject_xmlsec.mk
@@ -54,7 +54,7 @@ $(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'),\
+   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))
 \
 $(MAKE) \
 touch $@
diff --git a/libxslt/ExternalProject_xslt.mk b/libxslt/ExternalProject_xslt.mk
index b6aac21..b64eb93 100644
--- a/libxslt/ExternalProject_xslt.mk
+++ b/libxslt/ExternalProject_xslt.mk
@@ -43,8 +43,8 @@ $(call gb_ExternalProject_get_state_target,xslt,build):
 ./configure --without-crypto --without-python \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)) \
$(if $(filter 
MACOSX,$(OS)),--prefix=/@.__OOO)
 \
-   LDFLAGS=$(if $(filter LINUX FREEBSD,$(OS)),-Wl$(COMMA)-z$(COMMA)origin 
-Wl$(COMMA)-rpath$(COMMA)'ORIGIN:ORIGIN/../ure-link/lib' 
-Wl$(COMMA)-noinhibit-exec) \
-   $(if $(SYSBASE),$(if $(filter SOLARIS LINUX,$(OS)),-L$(SYSBASE)/lib 
-L$(SYSBASE)/usr/lib -lpthread -ldl)) \
+   LDFLAGS=$(if $(filter LINUX FREEBSD,$(OS)),-Wl$(COMMA)-z$(COMMA)origin 
-Wl$(COMMA)-rpath$(COMMA)\\\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib 
-Wl$(COMMA)-noinhibit-exec) \
+   $(if $(SYSBASE),$(if $(filter SOLARIS 
LINUX,$(OS)),-L$(SYSBASE)/lib -L$(SYSBASE)/usr/lib -lpthread -ldl)) \
$(if $(SYSBASE),CPPFLAGS=-I$(SYSBASE)/usr/include) \
$(if $(filter TRUE,$(DISABLE_DYNLOADING)), \
$(if $(filter IOS,$(OS)),LIBS=-liconv) \
@@ -54,4 +54,5 @@ $(call gb_ExternalProject_get_state_target,xslt,build):
 $(MAKE) \
 touch $@
 endif
+
 # vim: set noet sw=4 ts=4:
diff --git a/redland/ExternalProject_raptor.mk 
b/redland/ExternalProject_raptor.mk
index b67467c..7a778ff 100644
--- a/redland/ExternalProject_raptor.mk
+++ b/redland/ExternalProject_raptor.mk
@@ -40,8 +40,8 @@ $(call gb_ExternalProject_get_state_target,raptor,build):
CFLAGS=$(if $(debug),-g,-O) $(if $(filter 
TRUE,$(DISABLE_DYNLOADING)),-fvisibility=hidden) \
$(if $(filter