Kaynağa Gözat

haserl: bump dev version to 0.9.28

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Gustavo Zacarias 14 yıl önce
ebeveyn
işleme
36d1a7a5a3
2 değiştirilmiş dosya ile 12 ekleme ve 5 silme
  1. 1 1
      package/haserl/Config.in
  2. 11 4
      package/haserl/haserl.mk

+ 1 - 1
package/haserl/Config.in

@@ -38,4 +38,4 @@ endchoice
 config BR2_PACKAGE_HASERL_VERSION
 	string
 	default "0.8.0"		if BR2_PACKAGE_HASERL_VERSION_0_8_X
-	default "0.9.27"	if BR2_PACKAGE_HASERL_VERSION_0_9_X
+	default "0.9.28"	if BR2_PACKAGE_HASERL_VERSION_0_9_X

+ 11 - 4
package/haserl/haserl.mk

@@ -4,13 +4,20 @@
 #
 #############################################################
 
-HASERL_VERSION:=$(call qstrip,$(BR2_PACKAGE_HASERL_VERSION))
-HASERL_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/haserl/
-HASERL_AUTORECONF:=NO
-HASERL_INSTALL_TARGET:=YES
+HASERL_VERSION = $(call qstrip,$(BR2_PACKAGE_HASERL_VERSION))
+HASERL_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/haserl/
 
 # force haserl 0.8.0 to use install-sh so stripping works
 HASERL_CONF_ENV = ac_cv_path_install=./install-sh
+
+# lua2c is only needed when haserl_lualib.inc is older than haserl_lualib.lua
+# So avoid having a host-lua just for this
+define HASERL_NO_LUA2C
+	$(SED) 's/haserl_lualib.lua lua2c/haserl_lualib.lua/' \
+		$(@D)/src/Makefile.in
+endef
+HASERL_POST_EXTRACT_HOOKS += HASERL_NO_LUA2C
+
 ifeq ($(BR2_PACKAGE_HASERL_WITH_LUA),y)
 	HASERL_CONF_OPT += --with-lua=$(STAGING_DIR) \
 		--with-lua-headers=$(STAGING_DIR)