[Libreoffice-commits] .: Branch 'libreoffice-4-0' - config_host.mk.in configure.ac solenv/gbuild

[Libreoffice Gerrit user]

 config_host.mk.in       |    1 +
 configure.ac            |   19 +++++++++++++++++++
 solenv/gbuild/gbuild.mk |    4 ++++
 3 files changed, 24 insertions(+)

New commits:
commit f0fd3bd8f8a13f6cbe2a27018b83eee24a694c09
Author: Tomas Chvatal <tchvatal at suse.cz>
Date:   Mon Dec 10 10:41:35 2012 +0100

    Add configure switch that allows hardlink deliver
    
    This switch just makes possible to configure in ln delivery instead of
    cp based one.
    
    The feature was already in the place, we just make it visible as
    configure option now.
    
    Change-Id: I778ef3b03e6b9a57057e66ff6307e7da46bcd935

diff --git a/config_host.mk.in b/config_host.mk.in
index 6ffd0fe..d7ede5a 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -215,6 +215,7 @@ export GUI=@GUI@
 export GUIBASE=@GUIBASE@
 export GUIBASE_FOR_BUILD=@GUIBASE_FOR_BUILD@
 export GUI_FOR_BUILD=@GUI_FOR_BUILD@
+export HARDLINKDELIVER=@HARDLINKDELIVER@
 export HAVE_CXX0X=@HAVE_CXX0X@
 export HAVE_GCC_AVX=@HAVE_GCC_AVX@
 export HAVE_GCC_BUILTIN_ATOMIC=@HAVE_GCC_BUILTIN_ATOMIC@
diff --git a/configure.ac b/configure.ac
index b028e39..9da5b39 100644
--- a/configure.ac
+++ b/configure.ac
@@ -651,6 +651,12 @@ AC_ARG_ENABLE(ext-wiki-publisher,
 
 dnl ---------- *** ----------
 
+AC_ARG_ENABLE([hardlink-deliver],
+    AS_HELP_STRING([--enable-hardlink-deliver],
+        [Put files into deliver folder as hardlinks instead of copying them
+        over. Saves space and speeds up build.])
+)
+
 AC_ARG_ENABLE(mergelibs,
     AS_HELP_STRING([--enable-mergelibs],
         [Enables linking of big, merged, library. Experimental feature tested
@@ -11986,6 +11992,19 @@ else
 fi
 AC_SUBST(MERGELIBS)
 
+# ===================================================================
+# Create hardlinks on deliver instead of copying for smaller size and speed up
+# ===================================================================
+AC_MSG_CHECKING([whether to create hardlinks for delivering files])
+HARDLINKDELIVER=
+if test "$enable_hardlink_deliver" = "yes"; then
+    HARDLINKDELIVER="TRUE"
+    AC_MSG_RESULT([yes])
+else
+    AC_MSG_RESULT([no])
+fi
+AC_SUBST(HARDLINKDELIVER)
+
 dnl ===================================================================
 dnl icerun is a wrapper that stops us spawning tens of processes
 dnl locally - for tools that can't be executed on the compile cluster
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 321d42c..173222f 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -132,6 +132,10 @@ ENABLE_DEBUGINFO_FOR := all
 endif
 endif
 
+ifeq ($(HARDLINKDELIVER),TRUE)
+gb_Deliver_HARDLINK := $(true)
+endif
+
 ifeq ($(or $(ENABLE_SYMBOLS),$(enable_symbols)),FALSE)
 gb_SYMBOL := $(false)
 else