diff options
| -rw-r--r-- | meta/conf/distro/include/default-providers.inc | 3 | ||||
| -rw-r--r-- | meta/recipes-devtools/make/make.inc | 2 | ||||
| -rw-r--r-- | meta/recipes-devtools/remake/remake_4.1+dbg-1.1.bb | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc index ba85c78906..5801b67f35 100644 --- a/meta/conf/distro/include/default-providers.inc +++ b/meta/conf/distro/include/default-providers.inc @@ -15,6 +15,8 @@ PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-utils-native" PREFERRED_PROVIDER_virtual/libx11 ?= "libx11" PREFERRED_PROVIDER_virtual/base-utils ?= "busybox" PREFERRED_PROVIDER_xf86-video-intel ?= "xf86-video-intel" +PREFERRED_PROVIDER_virtual/make ?= "make" +PREFERRED_PROVIDER_virtual/make-native ?= "make-native" # # Default virtual runtime providers @@ -43,7 +45,6 @@ PREFERRED_PROVIDER_opkg-native ?= "opkg-native" PREFERRED_PROVIDER_nativesdk-opkg ?= "nativesdk-opkg" PREFERRED_PROVIDER_console-tools ?= "kbd" PREFERRED_PROVIDER_gzip-native ?= "pigz-native" -PREFERRED_PROVIDER_make ?= "make" PREFERRED_PROVIDER_udev ?= "${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','eudev',d)}" # There are issues with runtime packages and PREFERRED_PROVIDER, see YOCTO #5044 for details # on this rather strange entry. diff --git a/meta/recipes-devtools/make/make.inc b/meta/recipes-devtools/make/make.inc index 57ea605b97..849b74299c 100644 --- a/meta/recipes-devtools/make/make.inc +++ b/meta/recipes-devtools/make/make.inc @@ -8,3 +8,5 @@ SECTION = "devel" SRC_URI = "${GNU_MIRROR}/make/make-${PV}.tar.bz2" inherit autotools gettext pkgconfig texinfo + +PROVIDES = "virtual/make" diff --git a/meta/recipes-devtools/remake/remake_4.1+dbg-1.1.bb b/meta/recipes-devtools/remake/remake_4.1+dbg-1.1.bb index 30f29e04ea..8eab7e3a0d 100644 --- a/meta/recipes-devtools/remake/remake_4.1+dbg-1.1.bb +++ b/meta/recipes-devtools/remake/remake_4.1+dbg-1.1.bb @@ -15,7 +15,7 @@ DEPENDS += "readline guile" # By default only "gettext-minimal-native" is added # when inherit gettext. DEPENDS_class-native += "gettext-native" -PROVIDES += "make" +PROVIDES += "virtual/make" do_configure_prepend() { # remove the default LINGUAS since we are not going to generate languages |