Просмотр исходного кода

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>
Thomas Petazzoni 7 лет назад
Родитель
Сommit
7528c47523

+ 1 - 1
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))
 		$(INSTALL) -D -m 0755 $(@D)/build-$(t)/$(t) $(TARGET_DIR)/usr/bin/$(t)$(sep))
 endef
 endef
 
 
-$(eval $(host-generic-package))
 $(eval $(generic-package))
 $(eval $(generic-package))
+$(eval $(host-generic-package))

+ 1 - 1
package/gauche/gauche.mk

@@ -29,5 +29,5 @@ endif
 # here.
 # here.
 GAUCHE_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -std=gnu99"
 GAUCHE_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -std=gnu99"
 
 
-$(eval $(host-autotools-package))
 $(eval $(autotools-package))
 $(eval $(autotools-package))
+$(eval $(host-autotools-package))

+ 1 - 1
package/lcms2/lcms2.mk

@@ -31,5 +31,5 @@ else
 LCMS2_CONF_OPTS += --without-zlib
 LCMS2_CONF_OPTS += --without-zlib
 endif
 endif
 
 
-$(eval $(host-autotools-package))
 $(eval $(autotools-package))
 $(eval $(autotools-package))
+$(eval $(host-autotools-package))

+ 1 - 1
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
 		$(HOST_DIR)/include/linux_syscall_support.h
 endef
 endef
 
 
-$(eval $(host-generic-package))
 $(eval $(generic-package))
 $(eval $(generic-package))
+$(eval $(host-generic-package))

+ 1 - 1
package/pngquant/pngquant.mk

@@ -51,5 +51,5 @@ define HOST_PNGQUANT_INSTALL_CMDS
 	$(HOST_MAKE_ENV) $(MAKE) -C $(@D) install
 	$(HOST_MAKE_ENV) $(MAKE) -C $(@D) install
 endef
 endef
 
 
-$(eval $(host-generic-package))
 $(eval $(generic-package))
 $(eval $(generic-package))
+$(eval $(host-generic-package))