uhttpd: add enable instance option

[openwrt/.git] / toolchain / nasm / Makefile

diff --git a/toolchain/nasm/Makefile b/toolchain/nasm/Makefile
index a39c71f65fac7395cf51ef44ff9e54220cf34516..3efcc86203359775c12ddc65641bf834a3dcf583 100644 (file)
--- a/toolchain/nasm/Makefile
+++ b/toolchain/nasm/Makefile
@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=nasm
-PKG_VERSION:=2.13.03
+PKG_VERSION:=2.14
 
 PKG_SOURCE_URL:=https://www.nasm.us/pub/nasm/releasebuilds/$(PKG_VERSION)/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 
-PKG_HASH:=812ecfb0dcbc5bd409aaa8f61c7de94c5b8752a7b00c632883d15b2ed6452573
+PKG_HASH:=97c615dbf02ef80e4e2b6c385f7e28368d51efc214daa98e600ca4572500eec0
 
 HOST_BUILD_PARALLEL:=1
 
@@ -19,7 +19,7 @@ include $(INCLUDE_DIR)/toolchain-build.mk
 HOST_CONFIGURE_ARGS+= \
                --target=$(REAL_GNU_TARGET_NAME) \
                --with-sysroot=$(TOOLCHAIN_DIR) \
-               --enable-lto \
+               --disable-lto \
                --disable-werror \
                --disable-gdb \
                $(SOFT_FLOAT_CONFIG_OPTION) \
@@ -37,12 +37,9 @@ define Host/Configure
        $(call Host/Configure/Default)
 endef
 
-define Host/Compile
-       +$(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) all
-endef
-
 define Host/Install
        $(MAKE) -C $(HOST_BUILD_DIR) \
+               $(HOST_MAKE_FLAGS) \
                prefix=$(TOOLCHAIN_DIR) \
                install
 endef