[package] fix urbi compilation failure on octeon (#6987)

[openwrt/svn-archive/archive.git] / lang / urbi / Makefile

diff --git a/lang/urbi/Makefile b/lang/urbi/Makefile
index 34d893594cd067fe9f77b45b16417446ce81ff3e..945dbf98db0f794c06789edd10f47ad046e962fa 100644 (file)
--- a/lang/urbi/Makefile
+++ b/lang/urbi/Makefile
@@ -1,25 +1,27 @@
 #
-# Copyright (C) 2007 OpenWrt.org
+# Copyright (C) 2007-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id: $
- 
+
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=urbi
 PKG_VERSION:=1.0RC2-l455
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-sdk-$(PKG_VERSION)-src.zip
 PKG_SOURCE_URL:=http://www.gostai.com/downloads/aibo/
 PKG_MD5SUM:=02f64abb6232ddd7b0cb6dc182e2df26
+PKG_FIXUP:=libtool-ucxx
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-sdk
 
 include $(INCLUDE_DIR)/package.mk
 
+TARGET_CFLAGS += $(FPIC)
+
 define Package/urbi
   SECTION:=lang
   CATEGORY:=Languages
@@ -41,25 +43,22 @@ define Build/Compile
        $(MAKE) -C $(PKG_BUILD_DIR) \
                $(TARGET_CONFIGURE_OPTS) \
                DESTDIR="$(PKG_INSTALL_DIR)" \
+               WARNING_CXXFLAGS="-Wall" \
                all install
 endef
 
 define Build/InstallDev
-       $(INSTALL_DIR) $(STAGING_DIR)/usr/include/urbi
-       $(CP) $(PKG_INSTALL_DIR)/usr/include/urbi* $(STAGING_DIR)/usr/include/urbi/
-       $(INSTALL_DIR) $(STAGING_DIR)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/liburbi* $(STAGING_DIR)/usr/lib/
-endef
-
-define Build/UninstallDev
-       rm -rf $(STAGING_DIR)/usr/include/urbi
+       $(INSTALL_DIR) $(1)/usr/include/urbi
+       $(CP) $(PKG_INSTALL_DIR)/usr/include/urbi* $(1)/usr/include/urbi/
+       $(INSTALL_DIR) $(1)/usr/lib
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/liburbi* $(1)/usr/lib/
 endef
 
 define Package/urbi/install
        $(INSTALL_DIR) $(1)/usr/lib
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
        $(INSTALL_DIR) $(1)/usr/bin
-       $(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/
        $(INSTALL_DIR) $(1)/usr/gostai
        $(CP) $(PKG_INSTALL_DIR)/usr/gostai/* $(1)/usr/gostai/
 endef