diff options
| -rw-r--r-- | package/haserl/Config.in | 2 | ||||
| -rw-r--r-- | package/haserl/haserl.mk | 12 |
2 files changed, 11 insertions, 3 deletions
diff --git a/package/haserl/Config.in b/package/haserl/Config.in index bfe1df8380..680e280a1a 100644 --- a/package/haserl/Config.in +++ b/package/haserl/Config.in @@ -41,4 +41,4 @@ endif config BR2_PACKAGE_HASERL_VERSION string default "0.8.0" if BR2_PACKAGE_HASERL_VERSION_0_8_X - default "0.9.30" if BR2_PACKAGE_HASERL_VERSION_0_9_X + default "0.9.33" if BR2_PACKAGE_HASERL_VERSION_0_9_X diff --git a/package/haserl/haserl.mk b/package/haserl/haserl.mk index 56240c7f81..4b46f04a97 100644 --- a/package/haserl/haserl.mk +++ b/package/haserl/haserl.mk @@ -12,13 +12,21 @@ HASERL_SITE = http://downloads.sourceforge.net/project/haserl/haserl-devel endif HASERL_LICENSE = GPLv2 HASERL_LICENSE_FILES = COPYING +HASERL_DEPENDENCIES = host-pkgconf ifeq ($(BR2_PACKAGE_HASERL_WITH_LUA),y) - HASERL_CONF_OPT += --with-lua=$(STAGING_DIR) \ - --with-lua-headers=$(STAGING_DIR) + HASERL_CONF_OPT += --with-lua HASERL_DEPENDENCIES += lua host-lua + +# liblua uses dlopen when dynamically linked +ifneq ($(BR2_PREFER_STATIC_LIB),y) + HASERL_CONF_ENV += LIBS="-ldl" +endif + # lua2c is built for host, so needs to find host libs/headers HASERL_MAKE_OPT += lua2c_LDFLAGS='$(HOST_CFLAGS) $(HOST_LDFLAGS)' +else + HASERL_CONF_OPT += --without-lua endif define HASERL_REMOVE_EXAMPLES |
