diff options
| author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2022-12-10 13:56:13 +0100 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2022-12-19 11:24:58 +0000 |
| commit | 110b4c4a88b392778831a392b5a4638e93afa9d3 (patch) | |
| tree | 3ac2c154306500959ecd9c64056be7e23aa6d015 /solenv/gbuild | |
| parent | fc5ea6640d97f17036c7e7bb9b2ab9e6e137f97b (diff) | |
bump minimum make version to 4.0 (for $(file …) function)
This already was a requirement for Windows for a few years now, and make
4.0 was released nearly 9 years ago, and it has been used in LO's build
system since it has been added 11 years ago while it was only available
in prerelease versions of make, providing an alternative workaround for
systems that didn't have make built from cvs… I guess it is finally time
to get rid of those workarounds and just require make 4.0 for everyone.
NOTE: reading files with the $(file …) function was only added with
version 4.2 of GNU make, and just using it without contents was added in
4.1, so those usages aren't supported
Change-Id: Ia1c2c86cfdbbd81f349bb9f7188299e16bdd155f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143910
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
(cherry picked from commit 57c5d044dc16f488788584851e8b9cc0cf98e8e0)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144058
Diffstat (limited to 'solenv/gbuild')
| -rw-r--r-- | solenv/gbuild/Tempfile.mk | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/solenv/gbuild/Tempfile.mk b/solenv/gbuild/Tempfile.mk index ee0593db8b1b..a88f0133963b 100644 --- a/solenv/gbuild/Tempfile.mk +++ b/solenv/gbuild/Tempfile.mk @@ -17,29 +17,8 @@ # the License at http://www.apache.org/licenses/LICENSE-2.0 . # -ifneq ($(HAVE_GNUMAKE_FILE_FUNC),) define gb_var2file $(file >$(1),$(3))$(1) endef -else -# Write string to temporary file by chopping into pieces that -# fit the commandline -# parameters: filename, maxitems (for one write), string -# returns: filename -define gb_var2file -$(strip $(1) -$(eval gb_var2file_helpervar := $$(shell printf "%s" "" > $(1) ))\ -$(eval gb_var2file_curblock := $(firstword $(3)))\ -$(foreach item,$(wordlist 2,99999,$(3)),$(eval gb_var2file_curblock += $(item) - ifeq ($$(words $$(gb_var2file_curblock)),$(2)) - gb_var2file_helpervar := $$(shell printf "%s" "$$(gb_var2file_curblock)" >> $(1) ) - gb_var2file_curblock := - endif - ))\ - $(eval gb_var2file_helpervar := $(shell printf "%s\n" "$(gb_var2file_curblock)" >> $(1) ) - gb_var2file_curblock := - )) -endef -endif # vim: set noet sw=4 ts=4: |