aboutsummaryrefslogtreecommitdiff
path: root/package/pkg-autotools.mk
diff options
context:
space:
mode:
authorGravatar Thomas De Schampheleire <patrickdepinguin@gmail.com>2014-02-05 10:44:03 +0100
committerGravatar Peter Korsgaard <peter@korsgaard.com>2014-02-05 12:10:35 +0100
commit26aef889f1df32d5a15cd70f6b1e316ebb830cb7 (patch)
tree9baed5f64e8c19f89bd2f723353f2fa5b54b9486 /package/pkg-autotools.mk
parentac57c640c6e2d605f25d150bdede17f6f94edd76 (diff)
downloadbuildroot-26aef889f1df32d5a15cd70f6b1e316ebb830cb7.tar.gz
buildroot-26aef889f1df32d5a15cd70f6b1e316ebb830cb7.tar.bz2
infra: remove unused 4th parameter to package infrastructures (pkgparentdir)
The fourth parameter to inner-generic-package is no longer used. Removing this parameters requires renaming all usages of $(5) to $(4), and updating the calls to inner-generic-package (and equivalent for the other package infrastructures). Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/pkg-autotools.mk')
-rw-r--r--package/pkg-autotools.mk13
1 files changed, 6 insertions, 7 deletions
diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk
index 0ddfc6be06..cfbdc27161 100644
--- a/package/pkg-autotools.mk
+++ b/package/pkg-autotools.mk
@@ -48,8 +48,7 @@ endef
# for host packages
# argument 3 is the uppercase package name, without the HOST_ prefix
# for host packages
-# argument 4 is the package directory prefix
-# argument 5 is the type (target or host)
+# argument 4 is the type (target or host)
################################################################################
define inner-autotools-package
@@ -94,7 +93,7 @@ $(2)_INSTALL_TARGET_OPT ?= DESTDIR=$$(TARGET_DIR) install
# packages.
#
ifndef $(2)_CONFIGURE_CMDS
-ifeq ($(5),target)
+ifeq ($(4),target)
# Configure package for target
define $(2)_CONFIGURE_CMDS
@@ -220,7 +219,7 @@ endif
# file.
#
ifndef $(2)_BUILD_CMDS
-ifeq ($(5),target)
+ifeq ($(4),target)
define $(2)_BUILD_CMDS
$$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPT) -C $$($$(PKG)_SRCDIR)
endef
@@ -267,7 +266,7 @@ endif
# Call the generic package infrastructure to generate the necessary
# make targets
-$(call inner-generic-package,$(1),$(2),$(3),$(4),$(5))
+$(call inner-generic-package,$(1),$(2),$(3),$(4))
endef
@@ -275,5 +274,5 @@ endef
# autotools-package -- the target generator macro for autotools packages
################################################################################
-autotools-package = $(call inner-autotools-package,$(pkgname),$(call UPPERCASE,$(pkgname)),$(call UPPERCASE,$(pkgname)),$(pkgparentdir),target)
-host-autotools-package = $(call inner-autotools-package,host-$(pkgname),$(call UPPERCASE,host-$(pkgname)),$(call UPPERCASE,$(pkgname)),$(pkgparentdir),host)
+autotools-package = $(call inner-autotools-package,$(pkgname),$(call UPPERCASE,$(pkgname)),$(call UPPERCASE,$(pkgname)),target)
+host-autotools-package = $(call inner-autotools-package,host-$(pkgname),$(call UPPERCASE,host-$(pkgname)),$(call UPPERCASE,$(pkgname)),host)