mirror of
https://github.com/mmueller41/genode.git
synced 2026-01-21 12:32:56 +01:00
tool chain: tool check cleanup
- look for autoconf 2.69 on Ubuntu 22.04 - remove obsolete checks - add new checks Fixes #4622
This commit is contained in:
committed by
Christian Helmuth
parent
9e33e57294
commit
48cc52be07
@@ -1 +1 @@
|
||||
6c84c45b94d27bedf4b79d37f4703594e74458eb
|
||||
0f8a39117a2b19a5706726ab31e5b3e9b5bd9c8c
|
||||
|
||||
@@ -13,14 +13,3 @@ PATCHES := $(addprefix ${DIR(binutils)}/patches/, \
|
||||
PATCH_OPT := -p1 -d ${DIR(binutils)}
|
||||
|
||||
HASH_INPUT += $(REP_DIR)/${DIR(binutils)}/patches/series
|
||||
|
||||
AUTOCONF := autoconf
|
||||
|
||||
$(call check_tool,$(AUTOCONF))
|
||||
|
||||
default: _patch
|
||||
@#
|
||||
@# Re-generate configure scripts
|
||||
@#
|
||||
$(VERBOSE)cd ${DIR(binutils)}/bfd; $(AUTOCONF)
|
||||
$(VERBOSE)touch $@
|
||||
|
||||
@@ -1 +1 @@
|
||||
bc8a730adbf377de2c449d222a0df0ba7096a4b8
|
||||
1c4e056fb1955d8e2ad3a696a169deedae8c8f64
|
||||
|
||||
@@ -14,11 +14,23 @@ PATCH_OPT := -p1 -d ${DIR(gcc)}
|
||||
|
||||
HASH_INPUT += $(REP_DIR)/${DIR(gcc)}/patches/series
|
||||
|
||||
# Required version is 2.69, but there is no versioned binary name on
|
||||
# Ubuntu right now like there has been for version 2.64.
|
||||
AUTOCONF := autoconf
|
||||
AUTOCONF_VERSION = 2.69
|
||||
|
||||
AUTOCONF_VERSION_STRING = "autoconf (GNU Autoconf) $(AUTOCONF_VERSION)"
|
||||
ifneq ($(shell autoconf -V | grep $(AUTOCONF_VERSION_STRING)),)
|
||||
AUTOCONF = autoconf
|
||||
else
|
||||
ifneq ($(shell which autoconf$(AUTOCONF_VERSION)),)
|
||||
AUTOCONF = autoconf$(AUTOCONF_VERSION)
|
||||
else
|
||||
ifneq ($(shell which autoconf-$(AUTOCONF_VERSION)),)
|
||||
AUTOCONF = autoconf-$(AUTOCONF_VERSION)
|
||||
else
|
||||
$(error Need to have 'autoconf' version $(AUTOCONF_VERSION) installed)
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
|
||||
$(call check_tool,$(AUTOCONF))
|
||||
$(call check_tool,autogen)
|
||||
|
||||
default: _patch
|
||||
|
||||
Reference in New Issue
Block a user