From: llandwerlin at gmail.com <llandwerlin@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 02/41] ncurses: convert to autotools infrastructure
Date: Wed, 14 Apr 2010 01:05:35 +0200 [thread overview]
Message-ID: <1271199974-30434-3-git-send-email-llandwerlin@gmail.com> (raw)
In-Reply-To: <1271199974-30434-1-git-send-email-llandwerlin@gmail.com>
From: Lionel Landwerlin <llandwerlin@gmail.com>
Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
---
package/ncurses/ncurses.mk | 187 +++++++++++++++-----------------------------
1 files changed, 64 insertions(+), 123 deletions(-)
diff --git a/package/ncurses/ncurses.mk b/package/ncurses/ncurses.mk
index fb22c6c..944fcdb 100644
--- a/package/ncurses/ncurses.mk
+++ b/package/ncurses/ncurses.mk
@@ -23,99 +23,83 @@
# USA
# TARGETS
-NCURSES_VERSION:=5.6
-NCURSES_SITE:=$(BR2_GNU_MIRROR)/ncurses
-NCURSES_DIR:=$(BUILD_DIR)/ncurses-$(NCURSES_VERSION)
-NCURSES_SOURCE:=ncurses-$(NCURSES_VERSION).tar.gz
-NCURSES_CAT:=$(ZCAT)
+NCURSES_VERSION = 5.6
+NCURSES_SITE = $(BR2_GNU_MIRROR)/ncurses
+NCURSES_SOURCE = ncurses-$(NCURSES_VERSION).tar.gz
+NCURSES_INSTALL_STAGING = YES
+
+NCURSES_CONF_OPT = \
+ --with-shared \
+ --without-cxx \
+ --without-cxx-binding \
+ --without-ada \
+ --without-progs \
+ --disable-big-core \
+ --without-profile \
+ --disable-rpath \
+ --enable-echo \
+ --enable-const \
+ --enable-overwrite \
+ --enable-broken_linker
ifneq ($(BR2_PACKAGE_NCURSES_TARGET_HEADERS),y)
-NCURSES_WANT_STATIC=--disable-static
+NCURSES_CONF_OPT += --disable-static
endif
-$(DL_DIR)/$(NCURSES_SOURCE):
- $(call DOWNLOAD,$(NCURSES_SITE),$(NCURSES_SOURCE))
-
-$(NCURSES_DIR)/.patched: $(DL_DIR)/$(NCURSES_SOURCE)
- $(NCURSES_CAT) $(DL_DIR)/$(NCURSES_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- #use the local tic and not whatever the build system was going to find.
- $(SED) 's~\$$srcdir/shlib tic\$$suffix~/usr/bin/tic~' \
- $(NCURSES_DIR)/misc/run_tic.in
- toolchain/patch-kernel.sh $(NCURSES_DIR) package/ncurses/ ncurses\*.patch
- $(CONFIG_UPDATE) $(NCURSES_DIR)
- touch $@
-
-$(NCURSES_DIR)/.configured: $(NCURSES_DIR)/.patched
- (cd $(NCURSES_DIR); rm -rf config.cache; \
- BUILD_CC="$(HOSTCC)" \
- $(TARGET_CONFIGURE_OPTS) \
- $(TARGET_CONFIGURE_ARGS) \
- ./configure $(QUIET) \
- --target=$(GNU_TARGET_NAME) \
- --host=$(REAL_GNU_TARGET_NAME) \
- --build=$(GNU_HOST_NAME) \
- --prefix=/usr \
- --exec-prefix=/usr \
- --bindir=/usr/bin \
- --sbindir=/usr/sbin \
- --libdir=/usr/lib \
- --libexecdir=/usr/lib \
- --sysconfdir=/etc \
- --datadir=/usr/share \
- --localstatedir=/var \
- --includedir=/usr/include \
- --mandir=/usr/man \
- --infodir=/usr/info \
- --with-terminfo-dirs=/usr/share/terminfo \
- --with-default-terminfo-dir=/usr/share/terminfo \
- --with-shared --without-cxx --without-cxx-binding \
- --without-ada --without-progs --disable-big-core \
- $(DISABLE_NLS) $(DISABLE_LARGEFILE) \
- --without-profile --without-debug --disable-rpath \
- --enable-echo --enable-const --enable-overwrite \
- --enable-broken_linker \
- $(NCURSES_WANT_STATIC) \
- )
- touch $@
-
-$(NCURSES_DIR)/lib/libncurses.so.$(NCURSES_VERSION): $(NCURSES_DIR)/.configured
- $(MAKE1) DESTDIR=$(STAGING_DIR) -C $(NCURSES_DIR) \
- libs panel menu form headers
+ifneq ($(BR2_ENABLE_DEBUG),y)
+NCURSES_CONF_OPT += --without-debug
+endif
-$(STAGING_DIR)/usr/lib/libncurses.so.$(NCURSES_VERSION): $(NCURSES_DIR)/lib/libncurses.so.$(NCURSES_VERSION)
- $(MAKE1) \
- prefix=$(STAGING_DIR)/usr/ \
- exec_prefix=$(STAGING_DIR) \
- bindir=$(STAGING_DIR)/bin \
- sbindir=$(STAGING_DIR)/sbin \
- libexecdir=$(STAGING_DIR)/usr/lib \
- datadir=$(STAGING_DIR)/usr/share \
- sysconfdir=$(STAGING_DIR)/etc \
- localstatedir=$(STAGING_DIR)/var \
- libdir=$(STAGING_DIR)/usr/lib \
- infodir=$(STAGING_DIR)/usr/info \
- mandir=$(STAGING_DIR)/usr/man \
- includedir=$(STAGING_DIR)/usr/include \
- gxx_include_dir=$(STAGING_DIR)/usr/include/c++ \
- ticdir=$(STAGING_DIR)/usr/share/terminfo \
- -C $(NCURSES_DIR) install
- chmod a-x $(NCURSES_DIR)/lib/libncurses.so*
+define NCURSES_PATCH_NCURSES_CONFIG
$(SED) 's^prefix="^prefix="$(STAGING_DIR)^' \
$(STAGING_DIR)/bin/ncurses5-config
- touch -c $@
+endef
+
+NCURSES_POST_BUILD_HOOKS += NCURSES_PATCH_NCURSES_CONFIG
+
+ifeq ($(BR2_HAVE_DEVFILES),y)
+define NCURSES_INSTALL_TARGET_DEVFILES
+ mkdir -p $(TARGET_DIR)/usr/include
+ cp -dpf $(NCURSES_DIR)/include/curses.h $(TARGET_DIR)/usr/include/curses.h
+ cp -dpf $(NCURSES_DIR)/include/ncurses_dll.h $(TARGET_DIR)/usr/include/ncurses_dll.h
+ cp -dpf $(NCURSES_DIR)/include/term.h $(TARGET_DIR)/usr/include/
+ cp -dpf $(NCURSES_DIR)/include/unctrl.h $(TARGET_DIR)/usr/include/
+ cp -dpf $(NCURSES_DIR)/include/termcap.h $(TARGET_DIR)/usr/include/
+ cp -dpf $(NCURSES_DIR)/lib/libncurses.a $(TARGET_DIR)/usr/lib/
+ (cd $(TARGET_DIR)/usr/lib; \
+ ln -fs libncurses.a libcurses.a; \
+ ln -fs libncurses.a libtermcap.a; \
+ )
+ (cd $(TARGET_DIR)/usr/include; ln -fs curses.h ncurses.h)
+ rm -f $(TARGET_DIR)/usr/lib/libncurses.so
+ (cd $(TARGET_DIR)/usr/lib; ln -fs libncurses.so.$(NCURSES_VERSION) libncurses.so)
+endef
+endif
-$(TARGET_DIR)/usr/lib/libncurses.so.$(NCURSES_VERSION): $(STAGING_DIR)/usr/lib/libncurses.so.$(NCURSES_VERSION)
- mkdir -p $(TARGET_DIR)/usr/lib
- cp -dpf $(NCURSES_DIR)/lib/libncurses.so* $(TARGET_DIR)/usr/lib/
ifeq ($(BR2_PACKAGE_NCURSES_TARGET_PANEL),y)
+define NCURSES_INSTALL_TARGET_PANEL
cp -dpf $(NCURSES_DIR)/lib/libpanel.so* $(TARGET_DIR)/usr/lib/
+endef
endif
+
ifeq ($(BR2_PACKAGE_NCURSES_TARGET_FORM),y)
+define NCURSES_INSTALL_TARGET_FORM
cp -dpf $(NCURSES_DIR)/lib/libform.so* $(TARGET_DIR)/usr/lib/
+endef
endif
+
ifeq ($(BR2_PACKAGE_NCURSES_TARGET_MENU),y)
+define NCURSES_INSTALL_TARGET_MENU
cp -dpf $(NCURSES_DIR)/lib/libmenu.so* $(TARGET_DIR)/usr/lib/
+endef
endif
+
+define NCURSES_INSTALL_TARGET_CMDS
+ mkdir -p $(TARGET_DIR)/usr/lib
+ cp -dpf $(NCURSES_DIR)/lib/libncurses.so* $(TARGET_DIR)/usr/lib/
+ $(NCURSES_INSTALL_TARGET_PANEL)
+ $(NCURSES_INSTALL_TARGET_FORM)
+ $(BR2_PACKAGE_NCURSES_TARGET_MENU)
ln -snf /usr/share/terminfo $(TARGET_DIR)/usr/lib/terminfo
mkdir -p $(TARGET_DIR)/usr/share/terminfo/x
cp -dpf $(STAGING_DIR)/usr/share/terminfo/x/xterm $(TARGET_DIR)/usr/share/terminfo/x
@@ -130,51 +114,8 @@ endif
cp -dpf $(STAGING_DIR)/usr/share/terminfo/a/ansi $(TARGET_DIR)/usr/share/terminfo/a
mkdir -p $(TARGET_DIR)/usr/share/terminfo/l
cp -dpf $(STAGING_DIR)/usr/share/terminfo/l/linux $(TARGET_DIR)/usr/share/terminfo/l
- -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $@
- touch -c $@
-
-$(NCURSES_DIR)/lib/libncurses.a: $(NCURSES_DIR)/lib/libncurses.so.$(NCURSES_VERSION)
+ -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libncurses.so*
+ $(NCURSES_INSTALL_TARGET_DEVFILES)
+endef # NCURSES_INSTALL_TARGET_CMDS
-$(TARGET_DIR)/usr/lib/libncurses.a: $(NCURSES_DIR)/lib/libncurses.a
- mkdir -p $(TARGET_DIR)/usr/include
- cp -dpf $(NCURSES_DIR)/include/curses.h $(TARGET_DIR)/usr/include/curses.h
- cp -dpf $(NCURSES_DIR)/include/ncurses_dll.h $(TARGET_DIR)/usr/include/ncurses_dll.h
- cp -dpf $(NCURSES_DIR)/include/term.h $(TARGET_DIR)/usr/include/
- cp -dpf $(NCURSES_DIR)/include/unctrl.h $(TARGET_DIR)/usr/include/
- cp -dpf $(NCURSES_DIR)/include/termcap.h $(TARGET_DIR)/usr/include/
- cp -dpf $(NCURSES_DIR)/lib/libncurses.a $(TARGET_DIR)/usr/lib/
- (cd $(TARGET_DIR)/usr/lib; \
- ln -fs libncurses.a libcurses.a; \
- ln -fs libncurses.a libtermcap.a; \
- )
- (cd $(TARGET_DIR)/usr/include; ln -fs curses.h ncurses.h)
- rm -f $(TARGET_DIR)/usr/lib/libncurses.so
- (cd $(TARGET_DIR)/usr/lib; ln -fs libncurses.so.$(NCURSES_VERSION) libncurses.so)
- -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libncurses.so.$(NCURSES_VERSION)
- touch -c $@
-
-ncurses: $(TARGET_DIR)/usr/lib/libncurses.so.$(NCURSES_VERSION) \
- $(if $(BR2_HAVE_DEVFILES),$(TARGET_DIR)/usr/lib/libncurses.a)
-
-ncurses-unpacked: $(NCURSES_DIR)/.patched
-
-ncurses-source: $(DL_DIR)/$(NCURSES_SOURCE)
-
-ncurses-clean:
- rm -f $(STAGING_DIR)/usr/lib/libncurses.so* $(TARGET_DIR)/usr/lib/libncurses.so*
- rm -rf $(STAGING_DIR)/usr/share/tabset $(TARGET_DIR)/usr/share/tabset
- rm -rf $(STAGING_DIR)/usr/share/terminfo $(TARGET_DIR)/usr/share/terminfo
- rm -rf $(TARGET_DIR)/usr/lib/terminfo
- -$(MAKE) -C $(NCURSES_DIR) clean
-
-ncurses-dirclean:
- rm -rf $(NCURSES_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_NCURSES),y)
-TARGETS+=ncurses
-endif
+$(eval $(call AUTOTARGETS,package,ncurses))
--
1.7.0.4
next prev parent reply other threads:[~2010-04-13 23:05 UTC|newest]
Thread overview: 73+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-04-13 23:05 [Buildroot] [pull request] Pull request for various bumps llandwerlin at gmail.com
2010-04-13 23:05 ` [Buildroot] [PATCH 01/41] package: Force copy of .la files at the post install hook (readonly files might be problematic) llandwerlin at gmail.com
2010-04-14 13:11 ` Thomas Petazzoni
2010-04-13 23:05 ` llandwerlin at gmail.com [this message]
2010-04-14 7:41 ` [Buildroot] [PATCH 02/41] ncurses: convert to autotools infrastructure Peter Korsgaard
2010-04-14 8:39 ` Lionel Landwerlin
2010-04-14 13:15 ` Thomas Petazzoni
2010-04-14 13:17 ` Thomas Petazzoni
2010-04-13 23:05 ` [Buildroot] [PATCH 03/41] ncurses: fix path to patch ncurses5-config llandwerlin at gmail.com
2010-04-13 23:05 ` [Buildroot] [PATCH 04/41] lua: conversion to new package infrastructure llandwerlin at gmail.com
2010-04-14 13:19 ` Thomas Petazzoni
2010-04-14 15:25 ` Thomas Petazzoni
2010-04-14 17:24 ` Peter Korsgaard
2010-04-13 23:05 ` [Buildroot] [PATCH 05/41] package: Add $(HOST_DIR)/usr/lib to LD_LIBRARY_PATH for host but not target llandwerlin at gmail.com
2010-04-14 13:26 ` Thomas Petazzoni
2010-04-13 23:05 ` [Buildroot] [PATCH 06/41] Rework icu package on top of the generic infrastructure llandwerlin at gmail.com
2010-04-14 15:18 ` Thomas Petazzoni
2010-04-13 23:05 ` [Buildroot] [PATCH 07/41] external toolchain: fix strip of libraries llandwerlin at gmail.com
2010-04-14 13:41 ` Thomas Petazzoni
2010-04-13 23:05 ` [Buildroot] [PATCH 08/41] ext-toolchain: remove pkgconfig files from the external toolchain llandwerlin at gmail.com
2010-04-14 13:42 ` Thomas Petazzoni
2010-04-13 23:05 ` [Buildroot] [PATCH 09/41] scripts: force copy of files to erase already present and readonly files llandwerlin at gmail.com
2010-04-13 23:05 ` [Buildroot] [PATCH 10/41] package: added PKG_CONF_ENV variables to host packages llandwerlin at gmail.com
2010-04-13 23:05 ` [Buildroot] [PATCH 11/41] sysstat: drop target installation option (it's on by default) llandwerlin at gmail.com
2010-04-14 13:59 ` Thomas Petazzoni
2010-04-13 23:05 ` [Buildroot] [PATCH 12/41] directfb: bump to 1.4.3 llandwerlin at gmail.com
2010-04-13 23:05 ` [Buildroot] [PATCH 13/41] package: added lirc llandwerlin at gmail.com
2010-04-13 23:05 ` [Buildroot] [PATCH 14/41] directfb: added support for lirc llandwerlin at gmail.com
2010-04-14 7:45 ` Peter Korsgaard
2010-04-14 14:02 ` Thomas Petazzoni
2010-04-13 23:05 ` [Buildroot] [PATCH 15/41] directfb: added directfb tests installation option llandwerlin at gmail.com
2010-04-13 23:05 ` [Buildroot] [PATCH 16/41] directfb: drop forced linux-fusion with multiapp llandwerlin at gmail.com
2010-04-13 23:05 ` [Buildroot] [PATCH 17/41] pixman: disable GTK+ tests, let the others => remove patch to disable tests llandwerlin at gmail.com
2010-04-13 23:05 ` [Buildroot] [PATCH 18/41] cairo: bump to 1.8.10 llandwerlin at gmail.com
2010-04-14 7:54 ` Peter Korsgaard
2010-04-13 23:05 ` [Buildroot] [PATCH 19/41] cairo: drop target installation option (it's on by default) llandwerlin at gmail.com
2010-04-13 23:05 ` [Buildroot] [PATCH 20/41] systat: bump to 9.0.6 llandwerlin at gmail.com
2010-04-13 23:05 ` [Buildroot] [PATCH 21/41] automake: bump to 1.11 llandwerlin at gmail.com
2010-04-13 23:05 ` [Buildroot] [PATCH 22/41] libtool: added LIBTOOLIZE variable to point on $(HOST_DIR)/usr/bin/libtoolize llandwerlin at gmail.com
2010-04-13 23:05 ` [Buildroot] [PATCH 23/41] autoconf: added AUTOHEADER variable llandwerlin at gmail.com
2010-04-14 8:18 ` Peter Korsgaard
2010-04-14 8:37 ` Lionel Landwerlin
2010-04-14 9:44 ` Peter Korsgaard
2010-04-14 9:48 ` Lionel Landwerlin
2010-04-13 23:05 ` [Buildroot] [PATCH 24/41] target: Added ttyAS[0-3] devices llandwerlin at gmail.com
2010-04-13 23:05 ` [Buildroot] [PATCH 25/41] openssh: added empty login option llandwerlin at gmail.com
2010-04-14 7:51 ` Peter Korsgaard
2010-04-13 23:05 ` [Buildroot] [PATCH 26/41] linux-fusion: bump to 8.1.1 llandwerlin at gmail.com
2010-04-14 8:16 ` Peter Korsgaard
2010-04-14 8:35 ` Lionel Landwerlin
2010-04-13 23:06 ` [Buildroot] [PATCH 27/41] linux-fusion: drop target installation option (it's on by default) llandwerlin at gmail.com
2010-04-14 8:16 ` Peter Korsgaard
2010-04-13 23:06 ` [Buildroot] [PATCH 28/41] valgrind: conversion to autotool infrastructure llandwerlin at gmail.com
2010-04-13 23:06 ` [Buildroot] [PATCH 29/41] valgrind: bump to 3.5.0 llandwerlin at gmail.com
2010-04-13 23:06 ` [Buildroot] [PATCH 30/41] webkit: setup icu-config util path llandwerlin at gmail.com
2010-04-13 23:06 ` [Buildroot] [PATCH 31/41] webkit: drop target installation option (it's on by default) llandwerlin at gmail.com
2010-04-13 23:06 ` [Buildroot] [PATCH 32/41] package: add libgnutls package llandwerlin at gmail.com
2010-04-14 7:56 ` Peter Korsgaard
2010-04-14 15:26 ` Thomas Petazzoni
2010-04-13 23:06 ` [Buildroot] [PATCH 33/41] libsoup: bump to 2.28.2 llandwerlin at gmail.com
2010-04-14 7:58 ` Peter Korsgaard
2010-05-04 22:15 ` Sven Neumann
2010-04-13 23:06 ` [Buildroot] [PATCH 34/41] libsoup: drop target installation option (it's on by default) llandwerlin at gmail.com
2010-04-13 23:06 ` [Buildroot] [PATCH 35/41] package: add libgail package llandwerlin at gmail.com
2010-04-14 8:13 ` Peter Korsgaard
2010-04-14 8:33 ` Lionel Landwerlin
2010-04-13 23:06 ` [Buildroot] [PATCH 36/41] libgtk2: force to compile png loader in gdk-pixbuf llandwerlin at gmail.com
2010-04-14 8:00 ` Peter Korsgaard
2010-04-13 23:06 ` [Buildroot] [PATCH 37/41] libglib2: bump to 2.24.0 llandwerlin at gmail.com
2010-04-13 23:06 ` [Buildroot] [PATCH 38/41] atk: bump to 1.30 llandwerlin at gmail.com
2010-04-13 23:06 ` [Buildroot] [PATCH 39/41] autoconf: added missing AUTOMAKE variable setting llandwerlin at gmail.com
2010-04-13 23:06 ` [Buildroot] [PATCH 40/41] pango: bump to 1.28 llandwerlin at gmail.com
2010-04-13 23:06 ` [Buildroot] [PATCH 41/41] webkit: bump to 1.2.0 llandwerlin at gmail.com
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1271199974-30434-3-git-send-email-llandwerlin@gmail.com \
--to=llandwerlin@gmail.com \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox