gbuild: remove hardlink deliver
Since there's hardly any 'deliver' going on anymore... Change-Id: Id349958d299c9742382d37deab2125bc09930c14 Reviewed-on: https://gerrit.libreoffice.org/28655 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com>
This commit is contained in:
@@ -242,7 +242,6 @@ export GTK_PRINT_CFLAGS=$(gb_SPACE)@GTK_PRINT_CFLAGS@
|
|||||||
export GTK_PRINT_LIBS=$(gb_SPACE)@GTK_PRINT_LIBS@
|
export GTK_PRINT_LIBS=$(gb_SPACE)@GTK_PRINT_LIBS@
|
||||||
export USING_X11=@USING_X11@
|
export USING_X11=@USING_X11@
|
||||||
export HAMCREST_JAR=@HAMCREST_JAR@
|
export HAMCREST_JAR=@HAMCREST_JAR@
|
||||||
export HARDLINKDELIVER=@HARDLINKDELIVER@
|
|
||||||
export HAVE_GCC_AVX=@HAVE_GCC_AVX@
|
export HAVE_GCC_AVX=@HAVE_GCC_AVX@
|
||||||
export HAVE_GCC_STACK_PROTECTOR_STRONG=@HAVE_GCC_STACK_PROTECTOR_STRONG@
|
export HAVE_GCC_STACK_PROTECTOR_STRONG=@HAVE_GCC_STACK_PROTECTOR_STRONG@
|
||||||
export HAVE_GCC_BUILTIN_ATOMIC=@HAVE_GCC_BUILTIN_ATOMIC@
|
export HAVE_GCC_BUILTIN_ATOMIC=@HAVE_GCC_BUILTIN_ATOMIC@
|
||||||
|
19
configure.ac
19
configure.ac
@@ -1029,12 +1029,6 @@ AC_ARG_ENABLE(pdfimport,
|
|||||||
|
|
||||||
dnl ---------- *** ----------
|
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,
|
AC_ARG_ENABLE(mergelibs,
|
||||||
AS_HELP_STRING([--enable-mergelibs],
|
AS_HELP_STRING([--enable-mergelibs],
|
||||||
[Enables linking of big, merged, library. Experimental feature, tested
|
[Enables linking of big, merged, library. Experimental feature, tested
|
||||||
@@ -12809,19 +12803,6 @@ else
|
|||||||
fi
|
fi
|
||||||
AC_SUBST([MERGELIBS])
|
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 ===================================================================
|
||||||
dnl icerun is a wrapper that stops us spawning tens of processes
|
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
|
dnl locally - for tools that can't be executed on the compile cluster
|
||||||
|
@@ -19,16 +19,6 @@
|
|||||||
|
|
||||||
gb_Deliver_GNUCOPY := $(GNUCOPY)
|
gb_Deliver_GNUCOPY := $(GNUCOPY)
|
||||||
|
|
||||||
# if ($true) then old files will get removed from the target location before
|
|
||||||
# they are copied there. In multi-user environments, if this is needed you need
|
|
||||||
# to be the owner of the target file to be able to modify timestamps
|
|
||||||
ifeq ($(strip gb_Deliver_HARDLINK),)
|
|
||||||
gb_Deliver_CLEARONDELIVER := $(false)
|
|
||||||
else
|
|
||||||
gb_Deliver_CLEARONDELIVER := $(true)
|
|
||||||
endif
|
|
||||||
|
|
||||||
|
|
||||||
define gb_Deliver_init
|
define gb_Deliver_init
|
||||||
gb_Deliver_DELIVERABLES :=
|
gb_Deliver_DELIVERABLES :=
|
||||||
gb_Deliver_DELIVERABLES_INDEX :=
|
gb_Deliver_DELIVERABLES_INDEX :=
|
||||||
@@ -51,16 +41,14 @@ endif
|
|||||||
endef
|
endef
|
||||||
|
|
||||||
define gb_Deliver__deliver
|
define gb_Deliver__deliver
|
||||||
$(if $(gb_Deliver_CLEARONDELIVER),rm -f $(2) &&) $(if $(gb_Deliver_HARDLINK),ln,cp -P -f) $(1) $(2) && $(TOUCH) -hr $(1) $(2)
|
$(if $(gb_Deliver_CLEARONDELIVER),rm -f $(2) &&) cp -P -f $(1) $(2) && $(TOUCH) -hr $(1) $(2)
|
||||||
endef
|
endef
|
||||||
|
|
||||||
ifneq ($(strip $(gb_Deliver_GNUCOPY)),)
|
ifneq ($(strip $(gb_Deliver_GNUCOPY)),)
|
||||||
ifeq ($(strip $(gb_Deliver_HARDLINK)),)
|
|
||||||
define gb_Deliver__deliver
|
define gb_Deliver__deliver
|
||||||
$(gb_Deliver_GNUCOPY) $(if $(gb_Deliver_CLEARONDELIVER),--remove-destination) --no-dereference --force --preserve=timestamps $(1) $(2)
|
$(gb_Deliver_GNUCOPY) $(if $(gb_Deliver_CLEARONDELIVER),--remove-destination) --no-dereference --force --preserve=timestamps $(1) $(2)
|
||||||
endef
|
endef
|
||||||
endif
|
endif
|
||||||
endif
|
|
||||||
|
|
||||||
define gb_Deliver_deliver
|
define gb_Deliver_deliver
|
||||||
$(if $(1),$(call gb_Deliver__deliver,$(1),$(2)),\
|
$(if $(1),$(call gb_Deliver__deliver,$(1),$(2)),\
|
||||||
|
@@ -114,10 +114,6 @@ ENABLE_DEBUGINFO_FOR := all
|
|||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(HARDLINKDELIVER),TRUE)
|
|
||||||
gb_Deliver_HARDLINK := $(true)
|
|
||||||
endif
|
|
||||||
|
|
||||||
# note: ENABLE_CRASHDUMP turns on gb_SYMBOL
|
# note: ENABLE_CRASHDUMP turns on gb_SYMBOL
|
||||||
ifneq ($(strip $(ENABLE_SYMBOLS)$(enable_symbols)$(ENABLE_CRASHDUMP)),)
|
ifneq ($(strip $(ENABLE_SYMBOLS)$(enable_symbols)$(ENABLE_CRASHDUMP)),)
|
||||||
gb_SYMBOL := $(true)
|
gb_SYMBOL := $(true)
|
||||||
|
Reference in New Issue
Block a user