uml: this patch went upstream

[openwrt.git] / package / ncurses / Makefile

diff --git a/package/ncurses/Makefile b/package/ncurses/Makefile
index f51c233..8043588 100644 (file)
--- a/package/ncurses/Makefile
+++ b/package/ncurses/Makefile
@@ -1,20 +1,23 @@
-# 
-# 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.
 #
 #
 # 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
 
 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_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GNU/ncurses

-PKG_MD5SUM:=b6593abe1089d6aab1551c105c9300e3
+PKG_MD5SUM:=cce05daf61a64501ef6cd8da1f727ec6
+
+PKG_INSTALL:=1
+PKG_BUILD_PARALLEL:=1

 
 include $(INCLUDE_DIR)/package.mk
 
 
 include $(INCLUDE_DIR)/package.mk
 


@@ -23,108 +26,66 @@ define Package/libncurses
   CATEGORY:=Libraries
   TITLE:=Terminal handling library
   URL:=http://www.gnu.org/software/ncurses/
   CATEGORY:=Libraries
   TITLE:=Terminal handling library
   URL:=http://www.gnu.org/software/ncurses/

+  VARIANT:=libncurses

 endef
 
 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
 
 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 \
+       --disable-big-core \
+       --disable-home-terminfo \
+       --with-normal \
+       --with-shared \
+       --with-terminfo-dirs=/usr/share/terminfo \
+       --with-default-terminfo-dir=/usr/share/terminfo
+
+ifeq ($(HOST_OS),FreeBSD)
+       CONFIGURE_ARGS +=
+               --with-terminfo=/usr/share/terminfo.db 
+endif
+
+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
 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/
+ifneq ($(HOST_OS),FreeBSD)

        $(INSTALL_DIR) $(1)/usr/share/terminfo
        (cd $(PKG_INSTALL_DIR)/usr/share/terminfo; \
                for dir in ??; do \
        $(INSTALL_DIR) $(1)/usr/share/terminfo
        (cd $(PKG_INSTALL_DIR)/usr/share/terminfo; \
                for dir in ??; do \


@@ -132,42 +93,36 @@ define Package/libncurses/install
                        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 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
                $(INSTALL_DIR) $(1)/usr/share/terminfo/`dirname $$$$file`; \
                $(CP) $(PKG_INSTALL_DIR)/usr/share/terminfo/$$$$file \
                        $(1)/usr/share/terminfo/$$$$file; \
        done

+endif
+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
 
 endef
 

+ifeq ($(BUILD_VARIANT),libncursesw)

 define Build/InstallDev
 define Build/InstallDev

-       mkdir -p $(STAGING_DIR)/usr/include
-       $(CP) $(PKG_INSTALL_DIR)/usr/include/curses.h $(STAGING_DIR)/usr/include/
-       $(CP) $(PKG_INSTALL_DIR)/usr/include/ncurses.h $(STAGING_DIR)/usr/include/
-       $(CP) $(PKG_INSTALL_DIR)/usr/include/ncurses_dll.h $(STAGING_DIR)/usr/include/
-       $(CP) $(PKG_INSTALL_DIR)/usr/include/menu.h $(STAGING_DIR)/usr/include/
-       $(CP) $(PKG_INSTALL_DIR)/usr/include/panel.h $(STAGING_DIR)/usr/include/
-       $(CP) $(PKG_INSTALL_DIR)/usr/include/term{,cap}.h $(STAGING_DIR)/usr/include/
-       $(CP) $(PKG_INSTALL_DIR)/usr/include/unctrl.h $(STAGING_DIR)/usr/include/
-       $(CP) $(PKG_INSTALL_DIR)/usr/include/form.h $(STAGING_DIR)/usr/include/
-       $(CP) $(PKG_INSTALL_DIR)/usr/include/eti.h $(STAGING_DIR)/usr/include/
-       mkdir -p $(STAGING_DIR)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcurses.so $(STAGING_DIR)/usr/lib/
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{ncurses,panel,menu,form}.{a,so*} $(STAGING_DIR)/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
 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 \
-               $(STAGING_DIR)/usr/include/curses.h \
-               $(STAGING_DIR)/usr/include/ncurses.h \
-               $(STAGING_DIR)/usr/include/ncurses_dll.h \
-               $(STAGING_DIR)/usr/include/menu.h \
-               $(STAGING_DIR)/usr/include/panel.h \
-               $(STAGING_DIR)/usr/include/term{,cap}.h \
-               $(STAGING_DIR)/usr/include/unctrl.h \
-               $(STAGING_DIR)/usr/include/form.h \
-               $(STAGING_DIR)/usr/include/eti.h \
-               $(STAGING_DIR)/usr/lib/libcurses.so \
-               $(STAGING_DIR)/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
 endef

+endif

 
 $(eval $(call BuildPackage,libncurses))
 
 $(eval $(call BuildPackage,libncurses))

+$(eval $(call BuildPackage,libncursesw))