From 44eb5fe71a8282143289e464c9add22f8b9cc302 Mon Sep 17 00:00:00 2001 From: Daniel Dickinson Date: Fri, 18 Mar 2011 23:34:40 +0000 Subject: [package] ncurses: Split terminfo database into a separate package because S-Lang library needs the terminfo database but doesn't depend on ncurses (and libnewt depends on S-Lang library and is intended to be a lightweight dialog replacement that doesn't depend on the heavy ncurses). git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26232 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/ncurses/Makefile | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) (limited to 'package/ncurses') diff --git a/package/ncurses/Makefile b/package/ncurses/Makefile index 8043588508..6b2f7b6300 100644 --- a/package/ncurses/Makefile +++ b/package/ncurses/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ncurses PKG_VERSION:=5.7 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_BUILD_DIR:=$(BUILD_DIR)/$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz @@ -26,6 +26,15 @@ define Package/libncurses CATEGORY:=Libraries TITLE:=Terminal handling library URL:=http://www.gnu.org/software/ncurses/ + DEPENDS:= +terminfo + VARIANT:=libncurses +endef + +define Package/terminfo + SECTION:=libs + CATEGORY:=Libraries + TITLE:=Terminal Info Database (ncurses) + URL:=http://www.gnu.org/software/ncurses/ VARIANT:=libncurses endef @@ -82,9 +91,8 @@ define Build/Install/Default $(1) install.libs install.data; endef -define Package/libncurses/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{curses,ncurses,panel,menu,form}.so* $(1)/usr/lib/ +define Package/terminfo/install + echo "" ifneq ($(HOST_OS),FreeBSD) $(INSTALL_DIR) $(1)/usr/share/terminfo (cd $(PKG_INSTALL_DIR)/usr/share/terminfo; \ @@ -101,6 +109,11 @@ ifneq ($(HOST_OS),FreeBSD) endif endef +define Package/libncurses/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{curses,ncurses,panel,menu,form}.so* $(1)/usr/lib/ +endef + define Package/libncursesw/install $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{ncurses,panel,menu,form}w.so* $(1)/usr/lib/ @@ -124,5 +137,6 @@ define Build/InstallDev endef endif +$(eval $(call BuildPackage,terminfo)) $(eval $(call BuildPackage,libncurses)) $(eval $(call BuildPackage,libncursesw)) -- cgit v1.2.3