upx: define UCL_NO_ASM to fix build on x86 (ucl is built with --disable-asm), add...

SVN-Revision: 20107

diff --git a/utils/upx/Makefile b/utils/upx/Makefile
index 4779aa4d1dccf3e3b8dbdb992026be8eb4056c22..08377073d9c1417ea270cbafeb0f70ed336995fe 100644 (file)
--- a/utils/upx/Makefile
+++ b/utils/upx/Makefile
@@ -22,7 +22,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/upx
   SECTION:=utils
   CATEGORY:=Utilities
-  DEPENDS:=+libucl
+  DEPENDS:=+libucl +libstdcpp +zlib
   TITLE:=The Ultimate Packer for eXecutables
   URL:=http://upx.sourceforge.net/
 endef
@@ -35,15 +35,12 @@ or other drawbacks for most of the formats supported, because of in-place
 decompression.
 endef
 
+MAKE_PATH := src
 MAKE_VARS += \
-       UPX_UCLDIR="$(STAGING_DIR)/usr/include/ucl" \
        exeext=""
 
-define Build/Compile
-       $(call Build/Compile/Default, \
-               all \
-       )
-endef
+TARGET_CPPFLAGS += \
+       -DUCL_NO_ASM \
 
 define Package/upx/install
        $(INSTALL_DIR) $(1)/usr/bin