X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=package%2Fncurses%2FMakefile;h=cbbb098cb2daff957cafc8c6e0cea01169e4b614;hb=c1f315fdb76b2ee8ddb6e6cc5355e7735ff60943;hp=6da4299e8150b2b40c9ae8585d1387578e67512e;hpb=ff5e10dbae008b5913e93ff18cd3a5f7d2448be0;p=openwrt%2Fsvn-archive%2Farchive.git diff --git a/package/ncurses/Makefile b/package/ncurses/Makefile index 6da4299e81..cbbb098cb2 100644 --- a/package/ncurses/Makefile +++ b/package/ncurses/Makefile @@ -1,20 +1,22 @@ -# -# Copyright (C) 2006 OpenWrt.org +# +# Copyright (C) 2006-2010 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # -# $Id$ include $(TOPDIR)/rules.mk PKG_NAME:=ncurses -PKG_VERSION:=5.6 -PKG_RELEASE:=1 +PKG_VERSION:=5.7 +PKG_RELEASE:=3 +PKG_BUILD_DIR:=$(BUILD_DIR)/$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@GNU/ncurses -PKG_MD5SUM:=b6593abe1089d6aab1551c105c9300e3 +PKG_MD5SUM:=cce05daf61a64501ef6cd8da1f727ec6 + +PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk @@ -23,108 +25,58 @@ define Package/libncurses CATEGORY:=Libraries TITLE:=Terminal handling library URL:=http://www.gnu.org/software/ncurses/ + VARIANT:=libncurses endef -define Build/Configure +define Package/libncursesw + SECTION:=libs + CATEGORY:=Libraries + TITLE:=Terminal handling library (Unicode) + URL:=http://www.gnu.org/software/ncurses/ + DEPENDS:=libncurses + VARIANT:=libncursesw endef -define Build/Compile - rm -rf $(PKG_INSTALL_DIR) - mkdir -p $(PKG_INSTALL_DIR) - -$(MAKE) -C $(PKG_BUILD_DIR) distclean - (cd $(PKG_BUILD_DIR); rm -f config.cache; \ - CONFIG_SITE="" \ - ./configure \ - --target=$(GNU_HOST_NAME) \ - --host=$(GNU_HOST_NAME) \ - --build=$(GNU_HOST_NAME) \ - --program-prefix="" \ - --program-suffix="" \ - --prefix=/usr \ - --exec-prefix=/usr \ - --bindir=/usr/bin \ - --datadir=/usr/share \ - --includedir=/usr/include \ - --infodir=/usr/share/info \ - --libdir=/usr/lib \ - --libexecdir=/usr/lib \ - --localstatedir=/var \ - --mandir=/usr/share/man \ - --sbindir=/usr/sbin \ - --sysconfdir=/etc \ - $(DISABLE_NLS) \ - $(DISABLE_LARGEFILE) \ - --enable-echo \ - --enable-const \ - --enable-overwrite \ - --disable-rpath \ - --without-ada \ - --without-cxx \ - --without-cxx-binding \ - --without-debug \ - --without-profile \ - --with-progs \ - --with-normal \ - --without-shared \ - --with-terminfo-dirs=/usr/share/terminfo \ - --with-default-terminfo-dir=/usr/share/terminfo \ - ); - $(MAKE) -C $(PKG_BUILD_DIR) \ - DESTDIR="$(PKG_INSTALL_DIR)" \ - libs install.progs - (cd $(PKG_BUILD_DIR); rm -f config.cache; \ - $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - CPPFLAGS="$(TARGET_CPPFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ - ./configure \ - --target=$(GNU_TARGET_NAME) \ - --host=$(GNU_TARGET_NAME) \ - --build=$(GNU_HOST_NAME) \ - --program-prefix="" \ - --program-suffix="" \ - --prefix=/usr \ - --exec-prefix=/usr \ - --bindir=/usr/bin \ - --datadir=/usr/share \ - --includedir=/usr/include \ - --infodir=/usr/share/info \ - --libdir=/usr/lib \ - --libexecdir=/usr/lib \ - --localstatedir=/var \ - --mandir=/usr/share/man \ - --sbindir=/usr/sbin \ - --sysconfdir=/etc \ - $(DISABLE_NLS) \ - $(DISABLE_LARGEFILE) \ - --enable-echo \ - --enable-const \ - --enable-overwrite \ - --disable-rpath \ - --without-ada \ - --without-cxx \ - --without-cxx-binding \ - --without-debug \ - --without-profile \ - --without-progs \ - --with-normal \ - --with-shared \ - --with-terminfo-dirs=/usr/share/terminfo \ - --with-default-terminfo-dir=/usr/share/terminfo \ - ); - rm -f $(PKG_BUILD_DIR)/lib/lib* - $(MAKE) -C $(PKG_BUILD_DIR) \ - $(TARGET_CONFIGURE_OPTS) \ - BUILD_CC="$(TARGET_CC)" \ - HOSTCC="$(HOSTCC)" \ - HOSTCCFLAGS="" \ - DESTDIR="$(PKG_INSTALL_DIR)" \ - libs install.libs install.data +TARGET_CFLAGS += $(FPIC) + +CONFIGURE_ARGS += \ + --enable-echo \ + --enable-const \ + --enable-overwrite \ + --disable-rpath \ + --without-ada \ + --without-cxx \ + --without-cxx-binding \ + --without-debug \ + --without-profile \ + --without-progs \ + --with-normal \ + --with-shared \ + --with-terminfo-dirs=/usr/share/terminfo \ + --with-default-terminfo-dir=/usr/share/terminfo + +ifeq ($(BUILD_VARIANT),libncursesw) + CONFIGURE_ARGS += \ + --enable-widec \ + --with-build-cppflags=-D_GNU_SOURCE +endif + +MAKE_FLAGS += \ + BUILD_CC="$(HOSTCC)" \ + HOSTCC="$(HOSTCC)" \ + HOSTCCFLAGS="" \ + libs + +define Build/Install/Default + $(MAKE_VARS) \ + $(MAKE) -C $(PKG_BUILD_DIR)/$(MAKE_PATH) \ + $(MAKE_INSTALL_FLAGS) \ + $(1) install.libs install.data; endef define Package/libncurses/install $(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 (cd $(PKG_INSTALL_DIR)/usr/share/terminfo; \ for dir in ??; do \ @@ -132,42 +84,35 @@ define Package/libncurses/install mv $$$$dir $$$$(echo -ne "\x$$$$dir"); \ done \ ) - for file in a/ansi d/dumb l/linux r/rxvt s/screen v/vt100 v/vt102 x/xterm x/xterm-color; do \ + 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; do \ $(INSTALL_DIR) $(1)/usr/share/terminfo/`dirname $$$$file`; \ $(CP) $(PKG_INSTALL_DIR)/usr/share/terminfo/$$$$file \ $(1)/usr/share/terminfo/$$$$file; \ done endef +define Package/libncursesw/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{ncurses,panel,menu,form}w.so* $(1)/usr/lib/ +endef + +ifeq ($(BUILD_VARIANT),libncursesw) define Build/InstallDev - mkdir -p $(1)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/curses.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/ - $(CP) $(PKG_INSTALL_DIR)/usr/include/menu.h $(1)/usr/include/ - $(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/ + $(INSTALL_DIR) $(1)/usr/include/ncursesw/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/*.h $(1)/usr/include/ncursesw/ + + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{ncurses,panel,menu,form}w.{a,so*} $(1)/usr/lib/ endef +else +define Build/InstallDev + $(INSTALL_DIR) $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/*.h $(1)/usr/include/ -define Build/UninstallDev - rm -rf \ - $(1)/usr/include/curses.h \ - $(1)/usr/include/ncurses.h \ - $(1)/usr/include/ncurses_dll.h \ - $(1)/usr/include/menu.h \ - $(1)/usr/include/panel.h \ - $(1)/usr/include/term{,cap}.h \ - $(1)/usr/include/unctrl.h \ - $(1)/usr/include/form.h \ - $(1)/usr/include/eti.h \ - $(1)/usr/lib/libcurses.so \ - $(1)/usr/lib/lib{ncurses,panel,menu,form}.{a,so*} + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{curses,ncurses,panel,menu,form}.{a,so*} $(1)/usr/lib/ endef +endif $(eval $(call BuildPackage,libncurses)) +$(eval $(call BuildPackage,libncursesw))