diff --git a/classes/compat/make-4.3.yaml b/classes/compat/make-4.3.yaml new file mode 100644 index 00000000..b46341dd --- /dev/null +++ b/classes/compat/make-4.3.yaml @@ -0,0 +1,10 @@ +jobServer: "pipe" + +depends: + - name: devel::make + environment: + DEVEL__MAKE_VERSION: "4.3" + DEVEL__MAKE_DIGEST: "e05fdde47c5f7ca45cb697e973894ff4f5d79e13b750ed57d7b66d8defc78e19" + use: [tools] + tools: + target-toolchain: host-compat-toolchain diff --git a/recipes/devel/make.yaml b/recipes/devel/make.yaml index adf54fd3..6d9501be 100644 --- a/recipes/devel/make.yaml +++ b/recipes/devel/make.yaml @@ -1,13 +1,13 @@ inherit: [cpackage, libtool, install, "basement::update-config"] metaEnvironment: - PKG_VERSION: "4.4.1" + PKG_VERSION: "${DEVEL__MAKE_VERSION:-4.4.1}" PKG_LICENSE: "GPL-3.0-only" checkoutSCM: scm: url url: ${GNU_MIRROR}/make/make-${PKG_VERSION}.tar.gz - digestSHA256: "dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3" + digestSHA256: "${DEVEL__MAKE_DIGEST:-dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3}" stripComponents: 1 # We do not build make with make. Instead call the manual build script that is diff --git a/recipes/libs/compat/glibc.yaml b/recipes/libs/compat/glibc.yaml index 9df3ce95..7ca1c608 100644 --- a/recipes/libs/compat/glibc.yaml +++ b/recipes/libs/compat/glibc.yaml @@ -1,4 +1,7 @@ -inherit: [make, patch, strip] +# glibc <= 2.31 fails to build with make 4.4 +# see: https://github.com/crosstool-ng/crosstool-ng/issues/1946 + +inherit: [make, patch, strip, 'compat::make-4.3'] depends: - kernel::linux-libc-headers