projects
/
openwrt
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ncurses: add screen-256color terminfo
[openwrt/openwrt.git]
/
package
/
libs
/
ncurses
/
Makefile
diff --git
a/package/libs/ncurses/Makefile
b/package/libs/ncurses/Makefile
index 95f05fa7115f6cf5b242a0bf2b6f94de0f671bc0..04a9a38515be2fe1206fed8268b91a8e55d56dce 100644
(file)
--- a/
package/libs/ncurses/Makefile
+++ b/
package/libs/ncurses/Makefile
@@
-8,13
+8,12
@@
include $(TOPDIR)/rules.mk
PKG_NAME:=ncurses
include $(TOPDIR)/rules.mk
PKG_NAME:=ncurses
-PKG_VERSION:=6.
1
-PKG_RELEASE:=
1
+PKG_VERSION:=6.
2
+PKG_RELEASE:=
2
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@GNU/$(PKG_NAME)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@GNU/$(PKG_NAME)
-PKG_HASH:=
aa057eeeb4a14d470101eff4597d5833dcef5965331be3528c08d99cebaa0d17
+PKG_HASH:=
30306e0c76e0f9f1f0de987cf1c82a5c21e1ce6568b9227f7da5b71cbea86c9d
PKG_LICENSE:=MIT
PKG_LICENSE_FILES:=README
PKG_LICENSE:=MIT
PKG_LICENSE_FILES:=README
@@
-41,7
+40,7
@@
define Package/libncurses
URL:=http://www.gnu.org/software/ncurses/
PROVIDES:=libncursesw
DEPENDS:= +terminfo
URL:=http://www.gnu.org/software/ncurses/
PROVIDES:=libncursesw
DEPENDS:= +terminfo
- ABI_VERSION:=
$(PKG_VERSION)
+ ABI_VERSION:=
6
endef
define Package/libncurses-dev
endef
define Package/libncurses-dev
@@
-76,6
+75,11
@@
CONFIGURE_ARGS += \
--enable-widec \
--with-build-cppflags=-D_GNU_SOURCE
--enable-widec \
--with-build-cppflags=-D_GNU_SOURCE
+CONFIGURE_VARS += \
+ cf_try_fPIC=no
+
+HOST_CFLAGS += $(HOST_FPIC)
+
HOST_CONFIGURE_ARGS += \
--without-cxx \
--without-cxx-binding \
HOST_CONFIGURE_ARGS += \
--without-cxx \
--without-cxx-binding \
@@
-116,7
+120,19
@@
ifneq ($(HOST_OS),FreeBSD)
mv $$$$dir $$$$(echo -ne "\x$$$$dir"); \
done \
)
mv $$$$dir $$$$(echo -ne "\x$$$$dir"); \
done \
)
- for file in a/ansi d/dumb l/linux r/rxvt r/rxvt-unicode s/screen v/vt100 v/vt102 x/xterm x/xterm-color x/xterm-256color; do \
+ for file in \
+ a/ansi \
+ d/dumb \
+ l/linux \
+ r/rxvt \
+ r/rxvt-unicode \
+ s/screen \
+ s/screen-256color \
+ v/vt100 \
+ v/vt102 \
+ x/xterm \
+ x/xterm-color \
+ x/xterm-256color; do \
$(INSTALL_DIR) $(1)/usr/share/terminfo/`dirname $$$$file`; \
$(CP) $(PKG_INSTALL_DIR)/usr/share/terminfo/$$$$file \
$(1)/usr/share/terminfo/$$$$file; \
$(INSTALL_DIR) $(1)/usr/share/terminfo/`dirname $$$$file`; \
$(CP) $(PKG_INSTALL_DIR)/usr/share/terminfo/$$$$file \
$(1)/usr/share/terminfo/$$$$file; \
@@
-127,8
+143,10
@@
endef
define Package/libncurses/install
$(INSTALL_DIR) $(1)/usr/lib
for lib in ncurses panel menu form; do \
define Package/libncurses/install
$(INSTALL_DIR) $(1)/usr/lib
for lib in ncurses panel menu form; do \
- $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib$$$${lib}w.so* $(1)/usr/lib/; \
- ln -s lib$$$${lib}w.so $(1)/usr/lib/lib$$$${lib}.so; \
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib$$$${lib}w.so.* $(1)/usr/lib/; \
+ for so in $(1)/usr/lib/lib$$$${lib}w.so.*; do \
+ ln -s $$$${so##*/} $$$${so%w.so*}.so$$$${so##*w.so}; \
+ done; \
done
endef
done
endef
@@
-146,7
+164,9
@@
endef
define Build/InstallDev
$(CP) $(PKG_INSTALL_DIR)/* $(1)
for lib in ncurses panel menu form; do \
define Build/InstallDev
$(CP) $(PKG_INSTALL_DIR)/* $(1)
for lib in ncurses panel menu form; do \
- ln -s lib$$$${lib}w.so $(1)/usr/lib/lib$$$${lib}.so; \
+ for so in $(1)/usr/lib/lib$$$${lib}w.so*; do \
+ ln -s $$$${so##*/} $$$${so%w.so*}.so$$$${so##*w.so}; \
+ done; \
done
ln -s . $(1)/usr/include/ncursesw
$(TARGET_CROSS)ar rc $(1)/usr/lib/libtinfo.a
done
ln -s . $(1)/usr/include/ncursesw
$(TARGET_CROSS)ar rc $(1)/usr/lib/libtinfo.a
@@
-162,10
+182,6
@@
define Host/Compile
$(MAKE) -C $(HOST_BUILD_DIR)/progs tic
endef
$(MAKE) -C $(HOST_BUILD_DIR)/progs tic
endef
-define Host/Install
- $(INSTALL_BIN) $(HOST_BUILD_DIR)/progs/tic $(STAGING_DIR_HOST)/bin/tic
-endef
-
$(eval $(call HostBuild))
$(eval $(call BuildPackage,terminfo))
$(eval $(call BuildPackage,libncurses))
$(eval $(call HostBuild))
$(eval $(call BuildPackage,terminfo))
$(eval $(call BuildPackage,libncurses))