From b07a8c8f41a4dd0594c54c2e5712c6d9059d1638 Mon Sep 17 00:00:00 2001 From: nbd Date: Sun, 10 Apr 2005 22:10:02 +0000 Subject: [PATCH] update ncurses to experimental packaging style (fix dependency on terminfo in staging dir) git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@616 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/ncurses/Makefile | 134 ++++++++++++------ .../ipkg/libncurses-dev/CONTROL/control | 8 -- .../ncurses/ipkg/libncurses/CONTROL/control | 8 -- .../ncurses/ipkg/ncurses-term/CONTROL/control | 9 -- package/ncurses/ipkg/version | 1 - package/ncurses/libncurses.control | 6 + 6 files changed, 100 insertions(+), 66 deletions(-) delete mode 100644 package/ncurses/ipkg/libncurses-dev/CONTROL/control delete mode 100644 package/ncurses/ipkg/libncurses/CONTROL/control delete mode 100644 package/ncurses/ipkg/ncurses-term/CONTROL/control delete mode 100644 package/ncurses/ipkg/version create mode 100644 package/ncurses/libncurses.control diff --git a/package/ncurses/Makefile b/package/ncurses/Makefile index 3d73e7747..a3af81066 100644 --- a/package/ncurses/Makefile +++ b/package/ncurses/Makefile @@ -2,55 +2,109 @@ include $(TOPDIR)/rules.mk -PKG_NAME := ncurses -PKG_VERSION := 5.2 -PKG_RELEASE := 5 -PKG_MD5SUM := 464d6a49010cf2a6eb9ce59a264d4d47 +PKG_NAME:=ncurses +PKG_VERSION:=5.2 +PKG_RELEASE:=6 +PKG_MD5SUM:=464d6a49010cf2a6eb9ce59a264d4d47 -PKG_SOURCE_SITE := ftp://ftp.gnu.org/pub/gnu/$(PKG_NAME) \ - ftp://gatekeeper.dec.com/pub/GNU/$(PKG_NAME) \ +PKG_SOURCE_URL:=ftp://ftp.gnu.org/pub/gnu/$(PKG_NAME) \ + ftp://gatekeeper.dec.com/pub/GNU/$(PKG_NAME) \ ftp://ftp.uu.net/archive/systems/gnu/$(PKG_NAME) \ ftp://ftp.eu.uu.net/pub/gnu/$(PKG_NAME) \ ftp://ftp.funet.fi/pub/gnu/prep/$(PKG_NAME) \ ftp://ftp.leo.org/pub/comp/os/unix/gnu/$(PKG_NAME) \ ftp://ftp.digex.net/pub/gnu/$(PKG_NAME) -PKG_SOURCE_FILE := $(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_CAT := zcat -PKG_SOURCE_DIR := $(PKG_NAME)-$(PKG_VERSION) -PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_SOURCE_DIR) -PKG_IPK := $(PACKAGE_DIR)/lib$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk - -.NOTPARALLEL: - -$(DL_DIR)/$(PKG_SOURCE_FILE): - mkdir -p $(DL_DIR) - $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE_FILE) $(PKG_MD5SUM) $(PKG_SOURCE_SITE) - -$(PKG_BUILD_DIR)/ipkg/rules: $(DL_DIR)/$(PKG_SOURCE_FILE) - mkdir -p $(TOOL_BUILD_DIR) - $(PKG_SOURCE_CAT) $(DL_DIR)/$(PKG_SOURCE_FILE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - -# $(PATCH) $(PKG_BUILD_DIR) ./patches - cp -fpR ./ipkg $(PKG_BUILD_DIR)/ - chmod a+x $(PKG_BUILD_DIR)/ipkg/rules - -$(PKG_IPK): $(PKG_BUILD_DIR)/ipkg/rules - cd $(PKG_BUILD_DIR); \ - TOPDIR="$(TOPDIR)" IPKG_RULES_INC="$(TOPDIR)/rules.mk" \ - INSTALL_DIR="$(STAGING_DIR)" \ - $(MAKE) -j1 -f ./ipkg/rules package - -$(IPKG_STATE_DIR)/info/lib$(PKG_NAME).list: $(PKG_IPK) + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) +PKG_CAT:=zcat +PKG_IPK:=$(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk +PKG_IPK_DIR:=$(PKG_BUILD_DIR)/ipkg + +$(DL_DIR)/$(PKG_SOURCE): + $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) $(PKG_MD5SUM) $(PKG_SOURCE_URL) + +$(PKG_BUILD_DIR)/.unpacked: $(DL_DIR)/$(PKG_SOURCE) + $(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - + touch $(PKG_BUILD_DIR)/.unpacked + +$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.unpacked + (cd $(PKG_BUILD_DIR); rm -rf config.cache; \ + $(TARGET_CONFIGURE_OPTS) \ + CFLAGS="$(TARGET_CFLAGS)" \ + ac_cv_linux_vers="2" \ + ./configure \ + --target=$(GNU_TARGET_NAME) \ + --host=$(GNU_TARGET_NAME) \ + --build=$(GNU_HOST_NAME) \ + --prefix=/usr \ + --exec-prefix=/usr \ + --bindir=/usr/bin \ + --sbindir=/usr/sbin \ + --libexecdir=/usr/lib \ + --sysconfdir=/etc \ + --datadir=/usr/share \ + --localstatedir=/var \ + --mandir=/usr/man \ + --infodir=/usr/info \ + --with-terminfo-dirs=/usr/share/terminfo \ + --with-default-terminfo-dir=/usr/share/terminfo \ + --without-ada \ + --without-cxx \ + --without-cxx-binding \ + --without-progs \ + --without-profile \ + --without-debug \ + --disable-rpath \ + --enable-echo \ + --enable-const \ + --enable-overwrite \ + --with-shared \ + --with-normal \ + $(DISABLE_NLS) \ + $(DISABLE_LARGEFILE) \ + ); + touch $(PKG_BUILD_DIR)/.configured + +$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured + $(MAKE) -C $(PKG_BUILD_DIR) \ + $(TARGET_CONFIGURE_OPTS) \ + BUILD_CC="$(TARGET_CC)" \ + HOSTCC="$(HOSTCC)" \ + HOSTCCFLAGS="\$$(CPPFLAGS)" + mkdir -p $(PKG_BUILD_DIR)/terminfo + $(MAKE) -C $(PKG_BUILD_DIR) \ + DESTDIR="$(PKG_BUILD_DIR)/install" \ + install + touch $(PKG_BUILD_DIR)/.built + +$(STAGING_DIR)/usr/include/ncurses.h: $(PKG_BUILD_DIR)/.built + $(MAKE) -C $(PKG_BUILD_DIR) \ + DESTDIR="$(STAGING_DIR)" \ + install + +$(PKG_IPK): $(PKG_BUILD_DIR)/.built + $(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_IPK_DIR) libncurses.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) + mkdir -p $(PKG_IPK_DIR)/usr/lib + cp -a $(PKG_BUILD_DIR)/lib/lib*.so.* $(PKG_IPK_DIR)/usr/lib/ + mkdir -p $(PKG_IPK_DIR)/usr/share/terminfo + for f in a/ansi d/dumb l/linux s/screen v/vt100 x/xterm x/xterm-color; do \ + mkdir -p $(PKG_IPK_DIR)/usr/share/terminfo/`dirname $${f}`; \ + cp -fpR \ + $(PKG_BUILD_DIR)/install/usr/share/terminfo/$${f} \ + $(PKG_IPK_DIR)/usr/share/terminfo/$${f}; \ + done + mkdir -p $(PACKAGE_DIR) + $(IPKG_BUILD) $(PKG_IPK_DIR) $(PACKAGE_DIR) + +$(IPKG_STATE_DIR)/info/$(PKG_NAME).list: $(PKG_IPK) $(IPKG) install $(PKG_IPK) -source: $(DL_DIR)/$(PKG_SOURCE_FILE) -prepare: $(PKG_BUILD_DIR)/ipkg/rules -compile: $(PKG_IPK) -install: $(IPKG_STATE_DIR)/info/lib$(PKG_NAME).list +source: $(DL_DIR)/$(PKG_SOURCE) +prepare: $(PKG_BUILD_DIR)/.unpacked +compile: $(STAGING_DIR)/usr/include/ncurses.h $(PKG_IPK) +install: $(IPKG_STATE_DIR)/info/$(PKG_NAME).list clean: - -cd $(PKG_BUILD_DIR); \ - TOPDIR="$(TOPDIR)" IPKG_RULES_INC="$(TOPDIR)/rules.mk" \ - INSTALL_DIR="$(STAGING_DIR)" \ - ./ipkg/rules clean rm -rf $(PKG_BUILD_DIR) rm -f $(PKG_IPK) diff --git a/package/ncurses/ipkg/libncurses-dev/CONTROL/control b/package/ncurses/ipkg/libncurses-dev/CONTROL/control deleted file mode 100644 index f91398cc3..000000000 --- a/package/ncurses/ipkg/libncurses-dev/CONTROL/control +++ /dev/null @@ -1,8 +0,0 @@ -Package: libncurses-dev -Priority: optional -Section: devel -Version: [TBDL] -Architecture: [TBDL] -Maintainer: Nico -Source: http://nthill.free.fr/openwrt/sources/ncurses/ -Description: a terminal handling library (development) diff --git a/package/ncurses/ipkg/libncurses/CONTROL/control b/package/ncurses/ipkg/libncurses/CONTROL/control deleted file mode 100644 index f11b67bc7..000000000 --- a/package/ncurses/ipkg/libncurses/CONTROL/control +++ /dev/null @@ -1,8 +0,0 @@ -Package: libncurses -Priority: optional -Section: libs -Version: [TBDL] -Architecture: [TBDL] -Maintainer: Nico -Source: http://nthill.free.fr/openwrt/sources/ncurses/ -Description: a terminal handling library diff --git a/package/ncurses/ipkg/ncurses-term/CONTROL/control b/package/ncurses/ipkg/ncurses-term/CONTROL/control deleted file mode 100644 index a05fbc460..000000000 --- a/package/ncurses/ipkg/ncurses-term/CONTROL/control +++ /dev/null @@ -1,9 +0,0 @@ -Package: ncurses-term -Priority: optional -Section: admin -Version: [TBDL] -Architecture: [TBDL] -Maintainer: Nico -Source: http://nthill.free.fr/openwrt/sources/ncurses/ -Description: common terminal definitions -Depends: libncurses diff --git a/package/ncurses/ipkg/version b/package/ncurses/ipkg/version deleted file mode 100644 index 4fa56e43c..000000000 --- a/package/ncurses/ipkg/version +++ /dev/null @@ -1 +0,0 @@ -5.2-6 diff --git a/package/ncurses/libncurses.control b/package/ncurses/libncurses.control new file mode 100644 index 000000000..39f595d10 --- /dev/null +++ b/package/ncurses/libncurses.control @@ -0,0 +1,6 @@ +Package: libncurses +Priority: optional +Section: libs +Maintainer: Felix Fietkau +Source: buildroot internal +Description: a terminal handling library and common terminal definitions -- 2.35.1