From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sun, 22 May 2011 16:53:09 +0000 (+0000)
Subject: ncurses: enable C++ bindings (#9442)
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=a12a8271a7de80a6080ab3eaf0ddcf067249596c;p=openwrt%2Fstaging%2Frmilecki.git

ncurses: enable C++ bindings (#9442)

SVN-Revision: 26970
---

diff --git a/package/ncurses/Makefile b/package/ncurses/Makefile
index 69a20413696..2c4a3766265 100644
--- a/package/ncurses/Makefile
+++ b/package/ncurses/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2010 OpenWrt.org
+# Copyright (C) 2006-2011 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ncurses
 PKG_VERSION:=5.7
-PKG_RELEASE:=4
+PKG_RELEASE:=5
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
@@ -55,8 +55,6 @@ CONFIGURE_ARGS += \
 	--enable-overwrite \
 	--disable-rpath \
 	--without-ada \
-	--without-cxx \
-	--without-cxx-binding \
 	--without-debug \
 	--without-profile \
 	--without-progs \
@@ -129,8 +127,8 @@ define Build/InstallDev
 
 	$(INSTALL_DIR) $(1)/usr/bin $(2)/bin
 	$(CP) $(PKG_INSTALL_DIR)/usr/bin/ncursesw5-config $(2)/bin/
-	$(SED) 's,^\(prefix\|exec_prefix\)=.*,\1=$(STAGING_DIR)/usr,g' \
-	$(2)/bin/ncursesw5-config
+	$(SED) 's,^\(prefix\|exec_prefix\)=.*,\1=$(STAGING_DIR)/usr,g' -e 's/$$$$INCS //g' \
+		$(2)/bin/ncursesw5-config
 	ln -sf $(STAGING_DIR)/host/bin/ncursesw5-config $(1)/usr/bin/ncursesw5-config
 endef
 else