OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 2 Rev 3
Line 7... Line 7...
7   7  
Line 8... Line 8...
8 include $(TOPDIR)/rules.mk 8 include $(TOPDIR)/rules.mk
9   9  
10 PKG_NAME:=ncurses 10 PKG_NAME:=ncurses
Line 11... Line 11...
11 PKG_VERSION:=6.1 11 PKG_VERSION:=6.1
12 PKG_RELEASE:=4 12 PKG_RELEASE:=1
13   13  
14 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) 14 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
Line 39... Line 39...
39 CATEGORY:=Libraries 39 CATEGORY:=Libraries
40 TITLE:=Terminal handling library (Unicode) 40 TITLE:=Terminal handling library (Unicode)
41 URL:=http://www.gnu.org/software/ncurses/ 41 URL:=http://www.gnu.org/software/ncurses/
42 PROVIDES:=libncursesw 42 PROVIDES:=libncursesw
43 DEPENDS:= +terminfo 43 DEPENDS:= +terminfo
44 ABI_VERSION:=6 44 ABI_VERSION:=$(PKG_VERSION)
45 endef 45 endef
Line 46... Line 46...
46   46  
47 define Package/libncurses-dev 47 define Package/libncurses-dev
48 SECTION:=devel 48 SECTION:=devel
Line 74... Line 74...
74 --with-default-terminfo-dir=/usr/share/terminfo \ 74 --with-default-terminfo-dir=/usr/share/terminfo \
75 --with-pkg-config-libdir=/usr/lib/pkgconfig \ 75 --with-pkg-config-libdir=/usr/lib/pkgconfig \
76 --enable-widec \ 76 --enable-widec \
77 --with-build-cppflags=-D_GNU_SOURCE 77 --with-build-cppflags=-D_GNU_SOURCE
Line 78... Line -...
78   -  
79 HOST_CFLAGS += $(HOST_FPIC) -  
80   78  
81 HOST_CONFIGURE_ARGS += \ 79 HOST_CONFIGURE_ARGS += \
82 --without-cxx \ 80 --without-cxx \
83 --without-cxx-binding \ 81 --without-cxx-binding \
84 --without-ada \ 82 --without-ada \
Line 127... Line 125...
127 endef 125 endef
Line 128... Line 126...
128   126  
129 define Package/libncurses/install 127 define Package/libncurses/install
130 $(INSTALL_DIR) $(1)/usr/lib 128 $(INSTALL_DIR) $(1)/usr/lib
131 for lib in ncurses panel menu form; do \ 129 for lib in ncurses panel menu form; do \
132 $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib$$$${lib}w.so.* $(1)/usr/lib/; \ 130 $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib$$$${lib}w.so* $(1)/usr/lib/; \
133 for so in $(1)/usr/lib/lib$$$${lib}w.so.*; do \ -  
134 ln -s $$$${so##*/} $$$${so%w.so*}.so$$$${so##*w.so}; \ -  
135 done; \ 131 ln -s lib$$$${lib}w.so $(1)/usr/lib/lib$$$${lib}.so; \
136 done 132 done
Line 137... Line 133...
137 endef 133 endef
138   134  
Line 148... Line 144...
148 endef 144 endef
Line 149... Line 145...
149   145  
150 define Build/InstallDev 146 define Build/InstallDev
151 $(CP) $(PKG_INSTALL_DIR)/* $(1) 147 $(CP) $(PKG_INSTALL_DIR)/* $(1)
152 for lib in ncurses panel menu form; do \ 148 for lib in ncurses panel menu form; do \
153 for so in $(1)/usr/lib/lib$$$${lib}w.so*; do \ -  
154 ln -s $$$${so##*/} $$$${so%w.so*}.so$$$${so##*w.so}; \ -  
155 done; \ 149 ln -s lib$$$${lib}w.so $(1)/usr/lib/lib$$$${lib}.so; \
156 done 150 done
157 ln -s . $(1)/usr/include/ncursesw 151 ln -s . $(1)/usr/include/ncursesw
158 $(TARGET_CROSS)ar rc $(1)/usr/lib/libtinfo.a 152 $(TARGET_CROSS)ar rc $(1)/usr/lib/libtinfo.a
159 $(INSTALL_DIR) $(2)/bin 153 $(INSTALL_DIR) $(2)/bin
Line 166... Line 160...
166 define Host/Compile 160 define Host/Compile
167 $(MAKE) -C $(HOST_BUILD_DIR) libs 161 $(MAKE) -C $(HOST_BUILD_DIR) libs
168 $(MAKE) -C $(HOST_BUILD_DIR)/progs tic 162 $(MAKE) -C $(HOST_BUILD_DIR)/progs tic
169 endef 163 endef
Line -... Line 164...
-   164  
-   165 define Host/Install
-   166 $(INSTALL_BIN) $(HOST_BUILD_DIR)/progs/tic $(STAGING_DIR_HOST)/bin/tic
-   167 endef
170   168  
171 $(eval $(call HostBuild)) 169 $(eval $(call HostBuild))
172 $(eval $(call BuildPackage,terminfo)) 170 $(eval $(call BuildPackage,terminfo))
173 $(eval $(call BuildPackage,libncurses)) 171 $(eval $(call BuildPackage,libncurses))