diff options
| -rw-r--r-- | core/toolchain/toolchain.mk | 5 | ||||
| -rw-r--r-- | packages/htools/gmake/gmake.kconfig (renamed from core/kconfig/gmake.kconfig) | 12 | ||||
| -rw-r--r-- | packages/htools/gmake/gmake.mk (renamed from core/mk/gmake.mk) | 22 | ||||
| -rw-r--r-- | packages/htools/hosttools-buildopts.kconfig | 2 | ||||
| -rw-r--r-- | packages/htools/hosttools-buildopts.mk | 3 |
5 files changed, 19 insertions, 25 deletions
diff --git a/core/toolchain/toolchain.mk b/core/toolchain/toolchain.mk index f7db7d6..256560e 100644 --- a/core/toolchain/toolchain.mk +++ b/core/toolchain/toolchain.mk @@ -90,9 +90,6 @@ AUTOTOOLS_INSTALL += autoconf_host_install automake_host_install # BSD make include core/mk/bmake.mk -# GNU make -include core/mk/gmake.mk - # # Toolchain virtual package internals # @@ -110,7 +107,7 @@ TOOLCHAIN_SRC_DIR := $(TOOLCHAIN_DIR)/.embtk-toolchain TOOLCHAIN_PRE_DEPS-y := ccache_host_install $(AUTOTOOLS_INSTALL) pkgconf_host_install ifeq ($(embtk_buildhost_os_type),bsd) -TOOLCHAIN_PRE_DEPS-y += gsed_host_install gmake_install +TOOLCHAIN_PRE_DEPS-y += gsed_host_install gmake_host_install endif TOOLCHAIN_PRE_DEPS-$(CONFIG_EMBTK_TOOLCHAIN_PREDEP_GPERF_HOST) += gperf_host_install diff --git a/core/kconfig/gmake.kconfig b/packages/htools/gmake/gmake.kconfig index 7490d45..2215a14 100644 --- a/core/kconfig/gmake.kconfig +++ b/packages/htools/gmake/gmake.kconfig @@ -1,6 +1,6 @@ ################################################################################ # Embtoolkit -# Copyright(C) 2013 Abdoulaye Walsimou GAYE. +# Copyright(C) 2013-2014 Abdoulaye Walsimou GAYE. # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -23,17 +23,17 @@ # \date March 2013 ################################################################################ -config EMBTK_HAVE_GMAKE +config EMBTK_HOST_HAVE_GMAKE bool - default y + default y if EMBTK_HOST_OSTYPE=bsd help GNU make. -config EMBTK_GMAKE_VERSION_STRING +config EMBTK_GMAKE_HOST_VERSION_STRING string default "3.81" -config EMBTK_GMAKE_NEED_PATCH +config EMBTK_GMAKE_HOST_NEED_PATCH bool -config EMBTK_GMAKE_NEED_AUTORECONF +config EMBTK_GMAKE_HOST_NEED_AUTORECONF bool diff --git a/core/mk/gmake.mk b/packages/htools/gmake/gmake.mk index 2451638..eac2315 100644 --- a/core/mk/gmake.mk +++ b/packages/htools/gmake/gmake.mk @@ -1,6 +1,6 @@ ################################################################################ # Embtoolkit -# Copyright(C) 2013 Abdoulaye Walsimou GAYE. +# Copyright(C) 2013-2014 Abdoulaye Walsimou GAYE. # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -23,17 +23,11 @@ # \date March 2013 ################################################################################ -GMAKE_NAME := gmake -GMAKE_VERSION := $(call embtk_get_pkgversion,gmake) -GMAKE_SITE := http://ftp.gnu.org/gnu/make -GMAKE_PACKAGE := make-$(GMAKE_VERSION).tar.bz2 -GMAKE_SRC_DIR := $(embtk_toolsb)/make-$(GMAKE_VERSION) -GMAKE_BUILD_DIR := $(embtk_toolsb)/make-$(GMAKE_VERSION) +GMAKE_HOST_NAME := gmake +GMAKE_HOST_VERSION := $(call embtk_get_pkgversion,gmake_host) +GMAKE_HOST_SITE := http://ftp.gnu.org/gnu/make +GMAKE_HOST_PACKAGE := make-$(GMAKE_HOST_VERSION).tar.bz2 +GMAKE_HOST_SRC_DIR := $(embtk_toolsb)/make-$(GMAKE_HOST_VERSION) +GMAKE_HOST_BUILD_DIR := $(embtk_toolsb)/make-$(GMAKE_HOST_VERSION) -define embtk_install_gmake - $(call __embtk_install_hostpkg,gmake) -endef - -define embtk_postinstallonce_gmake - mv $(embtk_htools)/usr/bin/make $(embtk_htools)/usr/bin/gmake -endef +GMAKE_HOST_CONFIGURE_OPTS := --program-transform-name='s;make;gmake;' diff --git a/packages/htools/hosttools-buildopts.kconfig b/packages/htools/hosttools-buildopts.kconfig index d0e9f9f..12a0d59 100644 --- a/packages/htools/hosttools-buildopts.kconfig +++ b/packages/htools/hosttools-buildopts.kconfig @@ -120,7 +120,7 @@ source core/kconfig/bmake.kconfig # # GNU make # -source core/kconfig/gmake.kconfig +source packages/htools/gmake/gmake.kconfig # # mtd-utils diff --git a/packages/htools/hosttools-buildopts.mk b/packages/htools/hosttools-buildopts.mk index 445d68d..d82e7ed 100644 --- a/packages/htools/hosttools-buildopts.mk +++ b/packages/htools/hosttools-buildopts.mk @@ -38,6 +38,9 @@ $(call embtk_include_hostpkg,ccache_host) include packages/htools/fakeroot/vars.mk $(call embtk_include_hostpkg,fakeroot_host) +# gmake +$(call embtk_include_hostpkg,gmake_host) + # gsed $(call embtk_include_hostpkg,gsed_host) |