config_host.mk.in | 1 - configure.ac | 3 +-- solenv/gbuild/ComponentTarget.mk | 26 +++++--------------------- solenv/gbuild/UnpackedTarball.mk | 2 +- 4 files changed, 7 insertions(+), 25 deletions(-)
New commits: commit 224369b351884e8315368cfc99620c42eb97ee15 Author: Noel Grandin <n...@peralex.com> AuthorDate: Tue Feb 15 11:08:15 2022 +0200 Commit: Noel Grandin <noel.gran...@collabora.co.uk> CommitDate: Tue Feb 15 11:19:43 2022 +0100 revert component name changes to makefile This reverts commit 2483cd198b51bd5d0819cbebf40f211b2ef1236d Author: Jan-Marek Glogowski <glo...@fbihome.de> Date: Fri Feb 11 19:40:36 2022 +0100 Correctly depend on source component file and commit 17ec55c48082254e1f55bcfa00808e45a50a9801 Author: Jan-Marek Glogowski <glo...@fbihome.de> Date: Thu Jan 20 10:06:54 2022 +0100 Fail on non-optional, but filtered component names because they cause failures on Windows builds that look like: warning: failed to load external entity "C:/cygwin/home/tdf/lode/jenkins/workspace/gerrit_windows@2/workdir/ComponentTarget/binaryurp/source/binaryurp.component" cannot process C:/cygwin/home/tdf/lode/jenkins/workspace/gerrit_windows@2/workdir/ComponentTarget/binaryurp/source/binaryurp.component Change-Id: Ia34cdabd76b47a6a4686ebd0f96ceb774d3236f2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129956 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/config_host.mk.in b/config_host.mk.in index 3aee8c0f84bb..dee4375023fc 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -124,7 +124,6 @@ export DCONF_CFLAGS=@DCONF_CFLAGS@ export DCONF_LIBS=@DCONF_LIBS@ export DEFAULT_BRAND_IMAGES=@DEFAULT_BRAND_IMAGES@ export DICT_SYSTEM_DIR=@DICT_SYSTEM_DIR@ -export DIFF=@DIFF@ export DISABLE_CVE_TESTS=@DISABLE_CVE_TESTS@ export DISABLE_DYNLOADING=@DISABLE_DYNLOADING@ export DISABLE_PYTHON=@DISABLE_PYTHON@ diff --git a/configure.ac b/configure.ac index f48477c64168..6acb3107cea3 100644 --- a/configure.ac +++ b/configure.ac @@ -11384,7 +11384,6 @@ AC_SUBST([UNIQ]) dnl *************************************** dnl Checking for patch dnl *************************************** - AC_PATH_PROG(PATCH, patch) if test -z "$PATCH"; then AC_MSG_ERROR(["patch" not found in \$PATH, install it]) @@ -11415,7 +11414,6 @@ fi if test "$GNUMAKE_WIN_NATIVE" = "TRUE" ; then GNUPATCH=`cygpath -m $GNUPATCH` fi -AC_SUBST(GNUPATCH) dnl We also need to check for --with-gnu-cp @@ -11459,6 +11457,7 @@ else esac fi +AC_SUBST(GNUPATCH) AC_SUBST(GNUCP) AC_SUBST(x_GNUCP) diff --git a/solenv/gbuild/ComponentTarget.mk b/solenv/gbuild/ComponentTarget.mk index 3ba9cdb00d6b..d317f1b05ae7 100644 --- a/solenv/gbuild/ComponentTarget.mk +++ b/solenv/gbuild/ComponentTarget.mk @@ -49,7 +49,6 @@ endef $(call gb_ComponentTarget_get_clean_target,%) : $(call gb_Output_announce,$*,$(false),CMP,1) rm -f $(call gb_ComponentTarget_get_target,$*) \ - $(call gb_ComponentTarget_get_target,$*).allfiltered \ $(call gb_ComponentTarget_get_target,$*).filtered \ $(call gb_ComponentTarget_get_target,$*).optionals \ @@ -62,21 +61,12 @@ $(call gb_ComponentTarget_get_target,%).optionals : \ | $(call gb_ComponentTarget_get_target,%).dir \ $(call gb_ExternalExecutable_get_dependencies,xsltproc) $(call gb_ExternalExecutable_get_command,xsltproc) --nonet \ - $(gb_ComponentTarget_XSLT_DUMP_OPTIONALS) $(COMPONENTSOURCE) 2>&1 | LC_ALL=C $(SORT) > $@ + $(gb_ComponentTarget_XSLT_DUMP_OPTIONALS) $(COMPONENTSOURCE) > $@ 2>&1 # %.filtered : list of all optional implementations we don't build .PRECIOUS: $(call gb_ComponentTarget_get_target,%).filtered $(call gb_ComponentTarget_get_target,%).filtered : $(call gb_ComponentTarget_get_target,%).optionals - cat $< $(COMPONENTIMPL) | sed -e '/^#/d' -e '/^[ ]*$$/d' | LC_ALL=C $(SORT) | $(UNIQ) -u > $@ - -# %.allfiltered : contains all possible filtered components, which must match %.optionals -.PRECIOUS: $(call gb_ComponentTarget_get_target,%).allfiltered -$(call gb_ComponentTarget_get_target,%).allfiltered : $(call gb_ComponentTarget_get_target,%).optionals - $(if $(ALLFILTEREDIMPL), \ - cat $(ALLFILTEREDIMPL) | sed -e '/^#/d' -e '/^[ ]*$$/d' | LC_ALL=C $(SORT) -u > $@.tmp, \ - touch $@.tmp) - $(DIFF) -u $< $@.tmp - mv $@.tmp $@ + cat $< $(COMPONENTIMPL) | sed -e '/^#\|^\s*$$/d' | sort | uniq -u > $@ # when a library is renamed, the component file needs to be rebuilt to match. # hence simply depend on Repository{,Fixes}.mk since the command runs quickly. @@ -84,7 +74,6 @@ $(call gb_ComponentTarget_get_target,%) : \ $(SRCDIR)/Repository.mk \ $(SRCDIR)/RepositoryFixes.mk \ $(gb_ComponentTarget_XSLT_CREATE_COMPONENT) \ - $(call gb_ComponentTarget_get_target,%).allfiltered \ $(call gb_ComponentTarget_get_target,%).filtered \ | $(call gb_ExternalExecutable_get_dependencies,xsltproc) $(call gb_Output_announce,$*,$(true),CMP,1) @@ -92,19 +81,14 @@ $(call gb_ComponentTarget_get_target,%) : \ $(call gb_ComponentTarget__command,$@) $(call gb_Trace_EndRange,$*,CMP) -gb_ComponentTarget__init_source = $(call gb_ComponentTarget_get_source,$(patsubst CppunitTest/%,%,$(1))) -gb_ComponentTarget__init_allfiltered = $(wildcard $(call gb_ComponentTarget__init_source,$(1)).*) - define gb_ComponentTarget_ComponentTarget $(call gb_ComponentTarget_get_target,$(1)) : COMPONENTPREFIX := $(2) $(call gb_ComponentTarget_get_target,$(1)) : LIBFILENAME := $(3) -$(call gb_ComponentTarget_get_target,$(1)) : COMPONENTSOURCE := $(call gb_ComponentTarget__init_source,$(1)) +$(call gb_ComponentTarget_get_target,$(1)) : COMPONENTSOURCE := $(call gb_ComponentTarget_get_source,$(patsubst CppunitTest/%,%,$(1))) $(call gb_ComponentTarget_get_target,$(1)) : COMPONENTIMPL := -$(call gb_ComponentTarget_get_target,$(1)) : ALLFILTEREDIMPL := $(call gb_ComponentTarget__init_allfiltered,$(1)) -$(call gb_ComponentTarget_get_target,$(1)) : $(call gb_ComponentTarget__init_source,$(1)) -$(call gb_ComponentTarget_get_target,$(1)).optionals : $(call gb_ComponentTarget__init_source,$(1)) -$(call gb_ComponentTarget_get_target,$(1)).allfiltered : $(call gb_ComponentTarget__init_allfiltered,$(1)) +$(call gb_ComponentTarget_get_target,$(1)) : $(call gb_ComponentTarget_get_source,$(patsubst CppunitTest/%,%,$(1))) +$(call gb_ComponentTarget_get_target,$(1)).optionals : $(call gb_ComponentTarget_get_source,$(patsubst CppunitTest/%,%,$(1))) $(call gb_Helper_make_userfriendly_targets,$(1),ComponentTarget,$(call gb_ComponentTarget_get_target,$(1))) diff --git a/solenv/gbuild/UnpackedTarball.mk b/solenv/gbuild/UnpackedTarball.mk index 7355f010de98..fb574f6a95f1 100644 --- a/solenv/gbuild/UnpackedTarball.mk +++ b/solenv/gbuild/UnpackedTarball.mk @@ -444,7 +444,7 @@ endef ( \ patch_file=$$(pwd)/$*.new.patch.1; \ cd $(call gb_UnpackedTarball_get_dir,) ; \ - $(DIFF) -ur $*.org $* > $$patch_file; \ + diff -ur $*.org $* > $$patch_file; \ echo "Patch $$patch_file generated" ; \ ); \ else \