aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2009-03-17 23:36:35 +0000
committerFelix Fietkau <nbd@openwrt.org>2009-03-17 23:36:35 +0000
commit2abe4d1bad90d96262e44068fd9ddf36bc49db95 (patch)
tree3e74fe5d7d47dcd8a8ecf3cb3e5d6fc516db3354
parent18c64a209defa2e399a6b51a2b3954440867a2ca (diff)
downloadupstream-2abe4d1bad90d96262e44068fd9ddf36bc49db95.tar.gz
upstream-2abe4d1bad90d96262e44068fd9ddf36bc49db95.tar.bz2
upstream-2abe4d1bad90d96262e44068fd9ddf36bc49db95.zip
get rid of the ncurses host build - the only reason why it was necessary in the first place was because of misuse of the BUILD_CC variable override.
SVN-Revision: 14934
-rw-r--r--package/ncurses/Makefile21
1 files changed, 1 insertions, 20 deletions
diff --git a/package/ncurses/Makefile b/package/ncurses/Makefile
index e701882d3d..27bd18cd48 100644
--- a/package/ncurses/Makefile
+++ b/package/ncurses/Makefile
@@ -16,9 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@GNU/ncurses
PKG_MD5SUM:=b6593abe1089d6aab1551c105c9300e3
-PKG_BUILD_DEPENDS:=ncurses/host
-
-include $(INCLUDE_DIR)/host-build.mk
include $(INCLUDE_DIR)/package.mk
define Package/libncurses
@@ -28,14 +25,6 @@ define Package/libncurses
URL:=http://www.gnu.org/software/ncurses/
endef
-define Host/Compile
- $(MAKE) -C $(HOST_BUILD_DIR) libs
-endef
-
-define Host/Install
- $(MAKE) -C $(HOST_BUILD_DIR) install.progs
-endef
-
TARGET_CFLAGS += $(FPIC)
CONFIGURE_ARGS += \
@@ -55,16 +44,9 @@ CONFIGURE_ARGS += \
--with-default-terminfo-dir=/usr/share/terminfo
define Build/Compile
- cp \
- $(HOST_BUILD_DIR)/ncurses/make_keys \
- $(HOST_BUILD_DIR)/ncurses/make_hash \
- $(PKG_BUILD_DIR)/ncurses/
- touch \
- $(PKG_BUILD_DIR)/ncurses/make_keys \
- $(PKG_BUILD_DIR)/ncurses/make_hash
$(MAKE) -C $(PKG_BUILD_DIR) \
$(TARGET_CONFIGURE_OPTS) \
- BUILD_CC="$(TARGET_CC)" \
+ BUILD_CC="$(HOSTCC)" \
HOSTCC="$(HOSTCC)" \
HOSTCCFLAGS="" \
DESTDIR="$(PKG_INSTALL_DIR)" \
@@ -104,5 +86,4 @@ define Build/InstallDev
$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{ncurses,panel,menu,form}.{a,so*} $(1)/usr/lib/
endef
-$(eval $(call HostBuild))
$(eval $(call BuildPackage,libncurses))