From: Luka Perkov <luka@openwrt.org>
Date: Tue, 10 May 2016 22:36:59 +0000 (+0000)
Subject: ncurses: remove libncurses, provide it via libncursesw
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=f222b2f9151a0c9de391f69931b689c65d8411e5;p=openwrt%2Fsvn-archive%2Fopenwrt.git

ncurses: remove libncurses, provide it via libncursesw

Signed-off-by: Felix Fietkau <nbd@nbd.name>

SVN-Revision: 49347
---

diff --git a/package/libs/ncurses/Makefile b/package/libs/ncurses/Makefile
index 924033fd1a..c5b130ad2c 100644
--- a/package/libs/ncurses/Makefile
+++ b/package/libs/ncurses/Makefile
@@ -11,7 +11,7 @@ PKG_NAME:=ncurses
 PKG_VERSION:=5.9
 PKG_RELEASE:=3
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GNU/ncurses
 PKG_MD5SUM:=8cb9c412e5f2d96bc6f459aa8c6282a1
@@ -27,21 +27,11 @@ PKG_BUILD_DEPENDS:=ncurses/host
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/host-build.mk
 
-define Package/libncurses
-  SECTION:=libs
-  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
 
 define Package/libncursesw
@@ -49,7 +39,8 @@ define Package/libncursesw
   CATEGORY:=Libraries
   TITLE:=Terminal handling library (Unicode)
   URL:=http://www.gnu.org/software/ncurses/
-  VARIANT:=libncursesw
+  PROVIDES:=libncurses
+  DEPENDS:= +terminfo
 endef
 
 TARGET_CFLAGS += $(FPIC)
@@ -70,7 +61,9 @@ CONFIGURE_ARGS += \
 	--with-normal \
 	--with-shared \
 	--with-terminfo-dirs=/usr/share/terminfo \
-	--with-default-terminfo-dir=/usr/share/terminfo
+	--with-default-terminfo-dir=/usr/share/terminfo \
+	--enable-widec \
+	--with-build-cppflags=-D_GNU_SOURCE
 
 HOST_CONFIGURE_ARGS += \
 	--without-cxx \
@@ -88,13 +81,6 @@ ifeq ($(HOST_OS),FreeBSD)
 		--with-terminfo=/usr/share/terminfo.db 
 endif
 
-ifeq ($(BUILD_VARIANT),libncursesw)
-	CONFIGURE_ARGS += \
-		--enable-widec \
-		--includedir="/usr/include/ncursesw" \
-		--with-build-cppflags=-D_GNU_SOURCE
-endif
-
 MAKE_FLAGS += \
 	BUILD_CC="$(HOSTCC)" \
 	HOSTCC="$(HOSTCC)" \
@@ -126,20 +112,14 @@ 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/
 endef
 
-ifeq ($(BUILD_VARIANT),libncursesw)
 define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include/ncursesw/
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/ncursesw/*.h $(1)/usr/include/ncursesw/
+	$(INSTALL_DIR) $(1)/usr/include
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/*.h $(1)/usr/include/
 
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{ncurses,panel,menu,form}w.{a,so*} $(1)/usr/lib/
@@ -150,22 +130,6 @@ define Build/InstallDev
 		$(2)/bin/ncursesw5-config
 	ln -sf $(STAGING_DIR)/host/bin/ncursesw5-config $(1)/usr/bin/ncursesw5-config
 endef
-else
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/*.h $(1)/usr/include/
-
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{curses,ncurses,panel,menu,form}.{a,so*} $(1)/usr/lib/
-
-	$(INSTALL_DIR) $(1)/usr/bin $(2)/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/ncurses5-config $(2)/bin/
-	$(SED) 's,^\(prefix\|exec_prefix\)=.*,\1=$(STAGING_DIR)/usr,g' \
-		$(2)/bin/ncurses5-config
-	ln -sf $(STAGING_DIR)/host/bin/ncurses5-config $(1)/usr/bin/ncurses5-config
-endef
-endif
-
 
 define Host/Compile
 	$(MAKE) -C $(HOST_BUILD_DIR) libs
@@ -178,5 +142,4 @@ endef
 
 $(eval $(call HostBuild))
 $(eval $(call BuildPackage,terminfo))
-$(eval $(call BuildPackage,libncurses))
 $(eval $(call BuildPackage,libncursesw))