mirror/openwrt
1
0
Fork 0
mirror of https://git.openwrt.org/openwrt/openwrt.git synced 2024-11-05 22:19:32 +01:00
Code Issues

this patch simplifies the Makefile by using PKG_INSTALL:=1 and fixes parallel build.

Browse Source 
-Raphael

SVN-Revision: 19994
This commit is contained in:
Travis Kemen 2010-03-05 20:12:24 +00:00
parent 8ee9f9ee04
commit 0e0bf71ed9
1 changed files with 22 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
package/ncurses/Makefile
View File

@ -1,5 +1,5 @@
# #
# Copyright (C) 2006 OpenWrt.org # Copyright (C) 2006-2010 OpenWrt.org
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
@ -9,12 +9,14 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=ncurses PKG_NAME:=ncurses
PKG_VERSION:=5.7 PKG_VERSION:=5.7
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@GNU/ncurses PKG_SOURCE_URL:=@GNU/ncurses
PKG_MD5SUM:=cce05daf61a64501ef6cd8da1f727ec6 PKG_MD5SUM:=cce05daf61a64501ef6cd8da1f727ec6
PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
define Package/libncurses define Package/libncurses
@ -42,19 +44,22 @@ CONFIGURE_ARGS += \
--with-terminfo-dirs=/usr/share/terminfo \ --with-terminfo-dirs=/usr/share/terminfo \
--with-default-terminfo-dir=/usr/share/terminfo --with-default-terminfo-dir=/usr/share/terminfo
define Build/Compile MAKE_FLAGS += \
$(MAKE) -C $(PKG_BUILD_DIR) \ BUILD_CC="$(HOSTCC)" \
$(TARGET_CONFIGURE_OPTS) \ HOSTCC="$(HOSTCC)" \
BUILD_CC="$(HOSTCC)" \ HOSTCCFLAGS="" \
HOSTCC="$(HOSTCC)" \ libs
HOSTCCFLAGS="" \
DESTDIR="$(PKG_INSTALL_DIR)" \ define Build/Install/Default
libs install.libs install.data $(MAKE_VARS) \
$(MAKE) -C $(PKG_BUILD_DIR)/$(MAKE_PATH) \
$(MAKE_INSTALL_FLAGS) \
$(1) install.libs install.data;
endef endef
define Package/libncurses/install define Package/libncurses/install
$(INSTALL_DIR) $(1)/usr/lib $(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{ncurses,panel,menu,form}*.so.* $(1)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{curses,ncurses,panel,menu,form}.so* $(1)/usr/lib/
$(INSTALL_DIR) $(1)/usr/share/terminfo $(INSTALL_DIR) $(1)/usr/share/terminfo
(cd $(PKG_INSTALL_DIR)/usr/share/terminfo; \ (cd $(PKG_INSTALL_DIR)/usr/share/terminfo; \
for dir in ??; do \ for dir in ??; do \
@ -70,19 +75,11 @@ define Package/libncurses/install
endef endef
define Build/InstallDev define Build/InstallDev
mkdir -p $(1)/usr/include $(INSTALL_DIR) $(1)/usr/include
$(CP) $(PKG_INSTALL_DIR)/usr/include/curses.h $(1)/usr/include/ $(CP) $(PKG_INSTALL_DIR)/usr/include/*.h $(1)/usr/include/
$(CP) $(PKG_INSTALL_DIR)/usr/include/ncurses.h $(1)/usr/include/
$(CP) $(PKG_INSTALL_DIR)/usr/include/ncurses_dll.h $(1)/usr/include/ $(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/include/menu.h $(1)/usr/include/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{curses,ncurses,panel,menu,form}.{a,so*} $(1)/usr/lib/
$(CP) $(PKG_INSTALL_DIR)/usr/include/panel.h $(1)/usr/include/
$(CP) $(PKG_INSTALL_DIR)/usr/include/term{,cap}.h $(1)/usr/include/
$(CP) $(PKG_INSTALL_DIR)/usr/include/unctrl.h $(1)/usr/include/
$(CP) $(PKG_INSTALL_DIR)/usr/include/form.h $(1)/usr/include/
$(CP) $(PKG_INSTALL_DIR)/usr/include/eti.h $(1)/usr/include/
mkdir -p $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libcurses.so $(1)/usr/lib/
$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{ncurses,panel,menu,form}.{a,so*} $(1)/usr/lib/
endef endef
$(eval $(call BuildPackage,libncurses)) $(eval $(call BuildPackage,libncurses))