Guest User

openbmc-packages-luajit

a guest
Aug 4th, 2016
88
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
  1. diff --git a/lang/luajit/Makefile b/lang/luajit/Makefile
  2. index 1cdfebc..1448781 100644
  3. --- a/lang/luajit/Makefile
  4. +++ b/lang/luajit/Makefile
  5. @@ -26,7 +26,7 @@ PKG_LICENSE_FILES:=COPYRIGHT
  6.  include $(INCLUDE_DIR)/package.mk
  7.  include $(INCLUDE_DIR)/host-build.mk
  8.  
  9. -define Package/lua/Default
  10. +define Package/luajit/Default
  11.    SUBMENU:=Lua
  12.    SECTION:=lang
  13.    CATEGORY:=Languages
  14. @@ -35,33 +35,34 @@ define Package/lua/Default
  15.    MAINTAINER:=Anton D. Kachalov <mouse@yandex-team.ru>
  16.  endef
  17.  
  18. -define Package/lua/Default/description
  19. +define Package/luajit/Default/description
  20.   JIT for Lua is a powerful light-weight programming language designed for extending
  21.   applications. Lua is also frequently used as a general-purpose, stand-alone
  22.   language. Lua is free software.
  23.  endef
  24.  
  25. -define Package/liblua
  26. -$(call Package/lua/Default)
  27. +define Package/libluajit
  28. +$(call Package/luajit/Default)
  29.    SUBMENU:=
  30.    SECTION:=libs
  31.    CATEGORY:=Libraries
  32.    TITLE+= (libraries)
  33. +  DEPENDS:=@LUA_IS_JIT
  34.  endef
  35.  
  36. -define Package/liblua/description
  37. -$(call Package/lua/Default/description)
  38. +define Package/libluajit/description
  39. +$(call Package/luajit/Default/description)
  40.   This package contains the JIT Lua shared libraries, needed by other programs.
  41.  endef
  42.  
  43. -define Package/lua
  44. -$(call Package/lua/Default)
  45. -  DEPENDS:=+liblua
  46. +define Package/luajit
  47. +$(call Package/luajit/Default)
  48. +  DEPENDS:=+libluajit
  49.    TITLE+= (JIT)
  50.  endef
  51.  
  52. -define Package/lua/description
  53. -$(call Package/lua/Default/description)
  54. +define Package/luajit/description
  55. +$(call Package/luajit/Default/description)
  56.   This package contains the Lua language interpreter.
  57.  endef
  58.  
  59. @@ -90,7 +91,7 @@ define Build/Compile
  60.     $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
  61.         HOST_CC="gcc -m32" \
  62.         CROSS="$(TARGET_CROSS)" \
  63. -       $(if $(findstring c,$(OPENWRT_VERBOSE)),Q= E=@:,) \
  64. +       $(if $(findstring s,$(OPENWRT_VERBOSE)),Q= E=@:,) \
  65.         INSTALL_ROOT=/usr \
  66.         TARGET_CFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" \
  67.         MYLDFLAGS="$(TARGET_LDFLAGS)" \
  68. @@ -115,18 +116,20 @@ define Build/InstallDev
  69.     ln -sf libluajit-5.1.so.$(PKG_VERSION) $(1)/usr/lib/liblua.so
  70.  endef
  71.  
  72. -define Package/liblua/install
  73. +define Package/libluajit/install
  74.     $(INSTALL_DIR) $(1)/usr/lib
  75.     $(CP) $(PKG_INSTALL_DIR)/usr/lib/libluajit-5.1.so.* $(1)/usr/lib/
  76.     ln -sf libluajit-5.1.so.$(PKG_VERSION) $(1)/usr/lib/libluajit-5.1.so.2
  77.  endef
  78.  
  79. -define Package/lua/install
  80. +define Package/luajit/install
  81.     $(INSTALL_DIR) $(1)/usr/{bin,share}
  82.     $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/luajit-$(PKG_VERSION) $(1)/usr/bin/lua
  83.     $(CP) $(PKG_INSTALL_DIR)/usr/share/luajit-$(PKG_VERSION)/* $(1)/usr/share/luajit-$(PKG_VERSION)
  84.  endef
  85.  
  86. -$(eval $(call BuildPackage,liblua))
  87. -$(eval $(call BuildPackage,lua))
  88. +$(eval $(call BuildPackage,libluajit))
  89. +$(eval $(call BuildPackage,luajit))
  90. +ifneq ($(CONFIG_PACKAGE_luajit),)
  91.  $(eval $(call HostBuild))
  92. +endif
RAW Paste Data