package: declare target variant before host variant

Our package infrastructure uses inheritance of a number of values from
the target package to the host package, which assumes the target
package is defined before the host package. In addition, future
changes are going to make this requirement even more important.

Therefore, let's fix the android-tools, gauche, lcms2,
linux-syscall-support and pngquant packages, so that they declare
their target variant before their host variant, like all other
packages in Buildroot.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>

diff --git a/package/android-tools/android-tools.mk b/package/android-tools/android-tools.mk
index 11e0a15a7f06e77521ed0b48507888508975de6e..879d788e3af814109723461ce588b76bd0d356c4 100644 (file)
--- a/package/android-tools/android-tools.mk
+++ b/package/android-tools/android-tools.mk
@@ -81,5 +81,5 @@ define ANDROID_TOOLS_INSTALL_TARGET_CMDS
                $(INSTALL) -D -m 0755 $(@D)/build-$(t)/$(t) $(TARGET_DIR)/usr/bin/$(t)$(sep))
 endef
 
-$(eval $(host-generic-package))
 $(eval $(generic-package))
+$(eval $(host-generic-package))

diff --git a/package/gauche/gauche.mk b/package/gauche/gauche.mk
index 1e1ee390af59ec230a7c6bef24bc141d12273ca6..0b4185f5bf1c5071dd96a22949b51092aa53fdd9 100644 (file)
--- a/package/gauche/gauche.mk
+++ b/package/gauche/gauche.mk
@@ -29,5 +29,5 @@ endif
 # here.
 GAUCHE_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -std=gnu99"
 
-$(eval $(host-autotools-package))
 $(eval $(autotools-package))
+$(eval $(host-autotools-package))

diff --git a/package/lcms2/lcms2.mk b/package/lcms2/lcms2.mk
index 29f8ac8deee367954283cb2038445144a89d7dc3..f61563dea4eeee40505913be7142e62c2a4f1573 100644 (file)
--- a/package/lcms2/lcms2.mk
+++ b/package/lcms2/lcms2.mk
@@ -31,5 +31,5 @@ else
 LCMS2_CONF_OPTS += --without-zlib
 endif
 
-$(eval $(host-autotools-package))
 $(eval $(autotools-package))
+$(eval $(host-autotools-package))

diff --git a/package/linux-syscall-support/linux-syscall-support.mk b/package/linux-syscall-support/linux-syscall-support.mk
index b8145de496cb251fc34d8222757e0925eed319b3..050c5058abb4402c2ebe73964a7611d72c8d4709 100644 (file)
--- a/package/linux-syscall-support/linux-syscall-support.mk
+++ b/package/linux-syscall-support/linux-syscall-support.mk
@@ -25,5 +25,5 @@ define HOST_LINUX_SYSCALL_SUPPORT_INSTALL_CMDS
                $(HOST_DIR)/include/linux_syscall_support.h
 endef
 
-$(eval $(host-generic-package))
 $(eval $(generic-package))
+$(eval $(host-generic-package))

diff --git a/package/pngquant/pngquant.mk b/package/pngquant/pngquant.mk
index 1ce8359d4026c32bebf66217ed61a6d3dbc08402..f181d6fb47e195c918fd9f0e4c5bb066b4115014 100644 (file)
--- a/package/pngquant/pngquant.mk
+++ b/package/pngquant/pngquant.mk
@@ -51,5 +51,5 @@ define HOST_PNGQUANT_INSTALL_CMDS
        $(HOST_MAKE_ENV) $(MAKE) -C $(@D) install
 endef
 
-$(eval $(host-generic-package))
 $(eval $(generic-package))
+$(eval $(host-generic-package))