[packages] upx: define UCL_NO_ASM to fix build on x86 (ucl is built with --disable...

git-svn-id: svn://svn.openwrt.org/openwrt/packages@20107 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/utils/upx/Makefile b/utils/upx/Makefile
index 4779aa4..0837707 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
 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
   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
 
 decompression.
 endef
 

+MAKE_PATH := src

 MAKE_VARS += \
 MAKE_VARS += \

-       UPX_UCLDIR="$(STAGING_DIR)/usr/include/ucl" \

        exeext=""
 
        exeext=""
 

-define Build/Compile
-       $(call Build/Compile/Default, \
-               all \
-       )
-endef
+TARGET_CPPFLAGS += \
+       -DUCL_NO_ASM \

 
 define Package/upx/install
        $(INSTALL_DIR) $(1)/usr/bin
 
 define Package/upx/install
        $(INSTALL_DIR) $(1)/usr/bin