* [Buildroot] svn commit: trunk/buildroot/package/ncurses
@ 2007-01-22 23:52 andersen at uclibc.org
0 siblings, 0 replies; 29+ messages in thread
From: andersen at uclibc.org @ 2007-01-22 23:52 UTC (permalink / raw)
To: buildroot
Author: andersen
Date: 2007-01-22 15:52:06 -0800 (Mon, 22 Jan 2007)
New Revision: 17483
Log:
fix symlink
Modified:
trunk/buildroot/package/ncurses/ncurses.mk
Changeset:
Modified: trunk/buildroot/package/ncurses/ncurses.mk
===================================================================
--- trunk/buildroot/package/ncurses/ncurses.mk 2007-01-22 23:39:08 UTC (rev 17482)
+++ trunk/buildroot/package/ncurses/ncurses.mk 2007-01-22 23:52:06 UTC (rev 17483)
@@ -121,7 +121,7 @@
cp -dpf $(NCURSES_DIR)/include/termcap.h $(TARGET_DIR)/usr/include/
cp -dpf $(NCURSES_DIR)/lib/libncurses.a $(TARGET_DIR)/usr/lib/
rm -f $(TARGET_DIR)/usr/lib/terminfo
- (cd $(TARGET_DIR)/usr/lib; ln -fs /usr/share/terminfo)
+ (cd $(TARGET_DIR)/usr/lib; ln -fs ../share/terminfo)
(cd $(TARGET_DIR)/usr/lib; ln -fs libncurses.a libcurses.a)
(cd $(TARGET_DIR)/usr/lib; ln -fs libncurses.a libtermcap.a)
(cd $(TARGET_DIR)/usr/include; ln -fs ncurses.h curses.h)
^ permalink raw reply [flat|nested] 29+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/ncurses
@ 2007-01-30 17:47 aldot at uclibc.org
0 siblings, 0 replies; 29+ messages in thread
From: aldot at uclibc.org @ 2007-01-30 17:47 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-01-30 09:47:03 -0800 (Tue, 30 Jan 2007)
New Revision: 17677
Log:
- explicitely pass the configured $(DISABLE_LFS) in. Also set --disable-big-core
Modified:
trunk/buildroot/package/ncurses/ncurses.mk
Changeset:
Modified: trunk/buildroot/package/ncurses/ncurses.mk
===================================================================
--- trunk/buildroot/package/ncurses/ncurses.mk 2007-01-30 17:45:30 UTC (rev 17676)
+++ trunk/buildroot/package/ncurses/ncurses.mk 2007-01-30 17:47:03 UTC (rev 17677)
@@ -65,7 +65,8 @@
--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_NLS) \
+ --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 \
@@ -114,7 +115,7 @@
touch -c $(TARGET_DIR)/lib/libncurses.so.$(NCURSES_VER)
$(TARGET_DIR)/usr/lib/libncurses.a: $(STAGING_DIR)/lib/libncurses.a
- mkdir -p $(TARGET_DIR)/usr/include
+ -mkdir -p $(TARGET_DIR)/usr/include
cp -dpf $(NCURSES_DIR)/include/curses.h $(TARGET_DIR)/usr/include/ncurses.h
cp -dpf $(NCURSES_DIR)/include/term.h $(TARGET_DIR)/usr/include/
cp -dpf $(NCURSES_DIR)/include/unctrl.h $(TARGET_DIR)/usr/include/
^ permalink raw reply [flat|nested] 29+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/ncurses
@ 2007-03-07 14:46 aldot at uclibc.org
0 siblings, 0 replies; 29+ messages in thread
From: aldot at uclibc.org @ 2007-03-07 14:46 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-03-07 06:46:47 -0800 (Wed, 07 Mar 2007)
New Revision: 18024
Log:
- copy ncurses_dll.h to the target. Fixes a compilation problem seen by Thomas Lundquist
Modified:
trunk/buildroot/package/ncurses/ncurses.mk
Changeset:
Modified: trunk/buildroot/package/ncurses/ncurses.mk
===================================================================
--- trunk/buildroot/package/ncurses/ncurses.mk 2007-03-07 14:32:22 UTC (rev 18023)
+++ trunk/buildroot/package/ncurses/ncurses.mk 2007-03-07 14:46:47 UTC (rev 18024)
@@ -117,6 +117,7 @@
$(TARGET_DIR)/usr/lib/libncurses.a: $(STAGING_DIR)/lib/libncurses.a
-mkdir -p $(TARGET_DIR)/usr/include
cp -dpf $(NCURSES_DIR)/include/curses.h $(TARGET_DIR)/usr/include/ncurses.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/
^ permalink raw reply [flat|nested] 29+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/ncurses
@ 2007-06-23 13:56 aldot at uclibc.org
0 siblings, 0 replies; 29+ messages in thread
From: aldot at uclibc.org @ 2007-06-23 13:56 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-06-23 06:56:52 -0700 (Sat, 23 Jun 2007)
New Revision: 18901
Log:
- bump version
Modified:
trunk/buildroot/package/ncurses/ncurses.mk
Changeset:
Modified: trunk/buildroot/package/ncurses/ncurses.mk
===================================================================
--- trunk/buildroot/package/ncurses/ncurses.mk 2007-06-23 13:49:33 UTC (rev 18900)
+++ trunk/buildroot/package/ncurses/ncurses.mk 2007-06-23 13:56:52 UTC (rev 18901)
@@ -23,7 +23,7 @@
# USA
# TARGETS
-NCURSES_VER:=5.5
+NCURSES_VER:=5.6
NCURSES_SITE:=http://ftp.gnu.org/pub/gnu/ncurses
NCURSES_DIR:=$(BUILD_DIR)/ncurses-$(NCURSES_VER)
NCURSES_SOURCE:=ncurses-$(NCURSES_VER).tar.gz
^ permalink raw reply [flat|nested] 29+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/ncurses
@ 2007-06-25 15:38 aldot at uclibc.org
0 siblings, 0 replies; 29+ messages in thread
From: aldot at uclibc.org @ 2007-06-25 15:38 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-06-25 08:38:03 -0700 (Mon, 25 Jun 2007)
New Revision: 18931
Log:
- correct installation path
Modified:
trunk/buildroot/package/ncurses/ncurses.mk
Changeset:
Modified: trunk/buildroot/package/ncurses/ncurses.mk
===================================================================
--- trunk/buildroot/package/ncurses/ncurses.mk 2007-06-25 15:07:25 UTC (rev 18930)
+++ trunk/buildroot/package/ncurses/ncurses.mk 2007-06-25 15:38:03 UTC (rev 18931)
@@ -29,6 +29,10 @@
NCURSES_SOURCE:=ncurses-$(NCURSES_VER).tar.gz
NCURSES_CAT:=$(ZCAT)
+ifneq ($(strip $(BR2_PACKAGE_NCURSES_TARGET_HEADERS)),y)
+NCURSES_WANT_STATIC=--disable-static
+endif
+
$(DL_DIR)/$(NCURSES_SOURCE):
$(WGET) -P $(DL_DIR) $(NCURSES_SITE)/$(NCURSES_SOURCE)
@@ -56,11 +60,11 @@
--bindir=/usr/bin \
--sbindir=/usr/sbin \
--libdir=/lib \
- --libexecdir=/lib \
+ --libexecdir=/usr/lib \
--sysconfdir=/etc \
--datadir=/usr/share \
--localstatedir=/var \
- --includedir=/include \
+ --includedir=/usr/include \
--mandir=/usr/man \
--infodir=/usr/info \
--with-terminfo-dirs=/usr/share/terminfo \
@@ -71,6 +75,7 @@
--without-profile --without-debug --disable-rpath \
--enable-echo --enable-const --enable-overwrite \
--enable-broken_linker \
+ $(NCURSES_WANT_STATIC) \
);
touch $@
@@ -78,13 +83,13 @@
$(MAKE1) DESTDIR=$(STAGING_DIR) -C $(NCURSES_DIR) \
libs panel menu form headers
-$(STAGING_DIR)/lib/libncurses.a: $(NCURSES_DIR)/lib/libncurses.so.$(NCURSES_VER)
+$(STAGING_DIR)/usr/lib/libncurses.a: $(NCURSES_DIR)/lib/libncurses.so.$(NCURSES_VER)
$(MAKE1) \
prefix=$(STAGING_DIR)/usr/ \
exec_prefix=$(STAGING_DIR) \
bindir=$(STAGING_DIR)/bin \
sbindir=$(STAGING_DIR)/sbin \
- libexecdir=$(STAGING_DIR)/lib \
+ libexecdir=$(STAGING_DIR)/usr/lib \
datadir=$(STAGING_DIR)/usr/share \
sysconfdir=$(STAGING_DIR)/etc \
localstatedir=$(STAGING_DIR)/var \
@@ -98,8 +103,8 @@
chmod a-x $(NCURSES_DIR)/lib/libncurses.so*
touch -c $@
-$(TARGET_DIR)/lib/libncurses.so.$(NCURSES_VER): $(STAGING_DIR)/lib/libncurses.a
- cp -dpf $(NCURSES_DIR)/lib/libncurses.so* $(TARGET_DIR)/lib/
+$(TARGET_DIR)/lib/libncurses.so.$(NCURSES_VER): $(STAGING_DIR)/usr/lib/libncurses.a
+ cp -dpf $(NCURSES_DIR)/lib/libncurses.so* $(TARGET_DIR)/usr/lib/
-cp -dpf $(STAGING_DIR)/usr/lib/terminfo $(TARGET_DIR)/usr/lib/
mkdir -p $(TARGET_DIR)/usr/share/terminfo/x
cp -dpf $(STAGING_DIR)/usr/share/terminfo/x/xterm $(TARGET_DIR)/usr/share/terminfo/x
@@ -142,6 +147,7 @@
ncurses-clean:
rm -f $(STAGING_DIR)/lib/libncurses.so* $(TARGET_DIR)/lib/libncurses.so*
+ 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
-$(MAKE) -C $(NCURSES_DIR) clean
^ permalink raw reply [flat|nested] 29+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/ncurses
@ 2007-06-25 16:35 aldot at uclibc.org
0 siblings, 0 replies; 29+ messages in thread
From: aldot at uclibc.org @ 2007-06-25 16:35 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-06-25 09:35:23 -0700 (Mon, 25 Jun 2007)
New Revision: 18932
Log:
- fix typo in previous commit
Modified:
trunk/buildroot/package/ncurses/ncurses.mk
Changeset:
Modified: trunk/buildroot/package/ncurses/ncurses.mk
===================================================================
--- trunk/buildroot/package/ncurses/ncurses.mk 2007-06-25 15:38:03 UTC (rev 18931)
+++ trunk/buildroot/package/ncurses/ncurses.mk 2007-06-25 16:35:23 UTC (rev 18932)
@@ -104,7 +104,7 @@
touch -c $@
$(TARGET_DIR)/lib/libncurses.so.$(NCURSES_VER): $(STAGING_DIR)/usr/lib/libncurses.a
- cp -dpf $(NCURSES_DIR)/lib/libncurses.so* $(TARGET_DIR)/usr/lib/
+ cp -dpf $(NCURSES_DIR)/lib/libncurses.so* $(TARGET_DIR)/lib/
-cp -dpf $(STAGING_DIR)/usr/lib/terminfo $(TARGET_DIR)/usr/lib/
mkdir -p $(TARGET_DIR)/usr/share/terminfo/x
cp -dpf $(STAGING_DIR)/usr/share/terminfo/x/xterm $(TARGET_DIR)/usr/share/terminfo/x
^ permalink raw reply [flat|nested] 29+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/ncurses
@ 2007-06-25 16:56 aldot at uclibc.org
0 siblings, 0 replies; 29+ messages in thread
From: aldot at uclibc.org @ 2007-06-25 16:56 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-06-25 09:56:11 -0700 (Mon, 25 Jun 2007)
New Revision: 18933
Log:
- account for now optional archive
Modified:
trunk/buildroot/package/ncurses/ncurses.mk
Changeset:
Modified: trunk/buildroot/package/ncurses/ncurses.mk
===================================================================
--- trunk/buildroot/package/ncurses/ncurses.mk 2007-06-25 16:35:23 UTC (rev 18932)
+++ trunk/buildroot/package/ncurses/ncurses.mk 2007-06-25 16:56:11 UTC (rev 18933)
@@ -83,7 +83,7 @@
$(MAKE1) DESTDIR=$(STAGING_DIR) -C $(NCURSES_DIR) \
libs panel menu form headers
-$(STAGING_DIR)/usr/lib/libncurses.a: $(NCURSES_DIR)/lib/libncurses.so.$(NCURSES_VER)
+$(STAGING_DIR)/lib/libncurses.so.$(NCURSES_VER): $(NCURSES_DIR)/lib/libncurses.so.$(NCURSES_VER)
$(MAKE1) \
prefix=$(STAGING_DIR)/usr/ \
exec_prefix=$(STAGING_DIR) \
@@ -103,7 +103,7 @@
chmod a-x $(NCURSES_DIR)/lib/libncurses.so*
touch -c $@
-$(TARGET_DIR)/lib/libncurses.so.$(NCURSES_VER): $(STAGING_DIR)/usr/lib/libncurses.a
+$(TARGET_DIR)/lib/libncurses.so.$(NCURSES_VER): $(STAGING_DIR)/lib/libncurses.so.$(NCURSES_VER)
cp -dpf $(NCURSES_DIR)/lib/libncurses.so* $(TARGET_DIR)/lib/
-cp -dpf $(STAGING_DIR)/usr/lib/terminfo $(TARGET_DIR)/usr/lib/
mkdir -p $(TARGET_DIR)/usr/share/terminfo/x
^ permalink raw reply [flat|nested] 29+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/ncurses
@ 2007-07-23 8:33 ulf at uclibc.org
0 siblings, 0 replies; 29+ messages in thread
From: ulf at uclibc.org @ 2007-07-23 8:33 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2007-07-23 01:33:41 -0700 (Mon, 23 Jul 2007)
New Revision: 19204
Log:
Add some additional terminals to ncurses
Modified:
trunk/buildroot/package/ncurses/ncurses.mk
Changeset:
Modified: trunk/buildroot/package/ncurses/ncurses.mk
===================================================================
--- trunk/buildroot/package/ncurses/ncurses.mk 2007-07-23 08:23:54 UTC (rev 19203)
+++ trunk/buildroot/package/ncurses/ncurses.mk 2007-07-23 08:33:41 UTC (rev 19204)
@@ -111,7 +111,9 @@
cp -dpf $(STAGING_DIR)/usr/share/terminfo/x/xterm-xfree86 $(TARGET_DIR)/usr/share/terminfo/x
mkdir -p $(TARGET_DIR)/usr/share/terminfo/v
cp -dpf $(STAGING_DIR)/usr/share/terminfo/v/vt100 $(TARGET_DIR)/usr/share/terminfo/v
+ cp -dpf $(STAGING_DIR)/usr/share/terminfo/v/vt102 $(TARGET_DIR)/usr/share/terminfo/v
cp -dpf $(STAGING_DIR)/usr/share/terminfo/v/vt200 $(TARGET_DIR)/usr/share/terminfo/v
+ cp -dpf $(STAGING_DIR)/usr/share/terminfo/v/vt220 $(TARGET_DIR)/usr/share/terminfo/v
mkdir -p $(TARGET_DIR)/usr/share/terminfo/a
cp -dpf $(STAGING_DIR)/usr/share/terminfo/a/ansi $(TARGET_DIR)/usr/share/terminfo/a
mkdir -p $(TARGET_DIR)/usr/share/terminfo/l
^ permalink raw reply [flat|nested] 29+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/ncurses
@ 2008-03-06 18:19 ninevoltz at uclibc.org
2008-03-07 13:30 ` Peter Korsgaard
0 siblings, 1 reply; 29+ messages in thread
From: ninevoltz at uclibc.org @ 2008-03-06 18:19 UTC (permalink / raw)
To: buildroot
Author: ninevoltz
Date: 2008-03-06 10:19:15 -0800 (Thu, 06 Mar 2008)
New Revision: 21215
Log:
updated ncurses makefile
Modified:
trunk/buildroot/package/ncurses/ncurses.mk
Changeset:
Modified: trunk/buildroot/package/ncurses/ncurses.mk
===================================================================
--- trunk/buildroot/package/ncurses/ncurses.mk 2008-03-06 18:18:58 UTC (rev 21214)
+++ trunk/buildroot/package/ncurses/ncurses.mk 2008-03-06 18:19:15 UTC (rev 21215)
@@ -1,72 +1,27 @@
#############################################################
#
# ncurses
-# this installs only a few vital termcap entries
-#
+#
#############################################################
-# Copyright (C) 2002 by Ken Restivo <ken@246gt.com>
-# $Id: ncurses.mk,v 1.7 2005/01/03 04:38:13 andersen Exp $
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Library General Public License as
-# published by the Free Software Foundation; either version 2 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Library General Public License for more details.
-#
-# You should have received a copy of the GNU Library General Public
-# License along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-# USA
+NCURSES_VERSION = 5.6
+NCURSES_SITE = http://ftp.gnu.org/pub/gnu/ncurses
+NCURSES_SOURCE = ncurses-$(NCURSES_VERSION).tar.gz
+NCURSES_AUTORECONF = NO
+NCURSES_INSTALL_STAGING = YES
+NCURSES_INSTALL_TARGET = YES
-# TARGETS
-NCURSES_VERSION:=5.6
-NCURSES_SITE:=http://ftp.gnu.org/pub/gnu/ncurses
-NCURSES_DIR:=$(BUILD_DIR)/ncurses-$(NCURSES_VERSION)
-NCURSES_SOURCE:=ncurses-$(NCURSES_VERSION).tar.gz
-NCURSES_CAT:=$(ZCAT)
-
ifneq ($(strip $(BR2_PACKAGE_NCURSES_TARGET_HEADERS)),y)
-NCURSES_WANT_STATIC=--disable-static
+NCURSES_WANT_STATIC = --disable-static
endif
-$(DL_DIR)/$(NCURSES_SOURCE):
- $(WGET) -P $(DL_DIR) $(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 \
- --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=/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 \
+NCURSES_CONF_OPT = --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 \
@@ -74,96 +29,12 @@
--without-profile --without-debug --disable-rpath \
--enable-echo --enable-const --enable-overwrite \
--enable-broken_linker \
- $(NCURSES_WANT_STATIC) \
- )
- touch $@
+ $(NCURSES_WANT_STATIC)
-$(NCURSES_DIR)/lib/libncurses.so.$(NCURSES_VERSION): $(NCURSES_DIR)/.configured
- $(MAKE1) DESTDIR=$(STAGING_DIR) -C $(NCURSES_DIR) \
- libs panel menu form headers
+NCURSES_MAKE_OPT = libs panel menu form headers
-$(STAGING_DIR)/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)/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*
- touch -c $@
+NCURSES_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
-$(TARGET_DIR)/lib/libncurses.so.$(NCURSES_VERSION): $(STAGING_DIR)/lib/libncurses.so.$(NCURSES_VERSION)
- cp -dpf $(NCURSES_DIR)/lib/libncurses.so* $(TARGET_DIR)/lib/
- -cp -dpf $(STAGING_DIR)/usr/lib/terminfo $(TARGET_DIR)/usr/lib/
- mkdir -p $(TARGET_DIR)/usr/share/terminfo/x
- cp -dpf $(STAGING_DIR)/usr/share/terminfo/x/xterm $(TARGET_DIR)/usr/share/terminfo/x
- cp -dpf $(STAGING_DIR)/usr/share/terminfo/x/xterm-color $(TARGET_DIR)/usr/share/terminfo/x
- cp -dpf $(STAGING_DIR)/usr/share/terminfo/x/xterm-xfree86 $(TARGET_DIR)/usr/share/terminfo/x
- mkdir -p $(TARGET_DIR)/usr/share/terminfo/v
- cp -dpf $(STAGING_DIR)/usr/share/terminfo/v/vt100 $(TARGET_DIR)/usr/share/terminfo/v
- cp -dpf $(STAGING_DIR)/usr/share/terminfo/v/vt102 $(TARGET_DIR)/usr/share/terminfo/v
- cp -dpf $(STAGING_DIR)/usr/share/terminfo/v/vt200 $(TARGET_DIR)/usr/share/terminfo/v
- cp -dpf $(STAGING_DIR)/usr/share/terminfo/v/vt220 $(TARGET_DIR)/usr/share/terminfo/v
- mkdir -p $(TARGET_DIR)/usr/share/terminfo/a
- 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_DEPENDENCIES = uclibc
-$(TARGET_DIR)/usr/lib/libncurses.a: $(STAGING_DIR)/lib/libncurses.a
- mkdir -p $(TARGET_DIR)/usr/include
- cp -dpf $(NCURSES_DIR)/include/curses.h $(TARGET_DIR)/usr/include/ncurses.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/
- rm -f $(TARGET_DIR)/usr/lib/terminfo
- (cd $(TARGET_DIR)/usr/lib; ln -fs ../share/terminfo; \
- ln -fs libncurses.a libcurses.a; \
- ln -fs libncurses.a libtermcap.a; \
- )
- (cd $(TARGET_DIR)/usr/include; ln -fs ncurses.h curses.h)
- rm -f $(TARGET_DIR)/lib/libncurses.so
- (cd $(TARGET_DIR)/usr/lib; ln -fs ../../lib/libncurses.so.$(NCURSES_VERSION) libncurses.so)
- -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/lib/libncurses.so.$(NCURSES_VERSION)
- touch -c $@
-
-ncurses: $(TARGET_DIR)/lib/libncurses.so.$(NCURSES_VERSION)
-
-ncurses-headers: $(TARGET_DIR)/usr/lib/libncurses.a
-
-ncurses-source: $(DL_DIR)/$(NCURSES_SOURCE)
-
-ncurses-clean:
- rm -f $(STAGING_DIR)/lib/libncurses.so* $(TARGET_DIR)/lib/libncurses.so*
- 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
- -$(MAKE) -C $(NCURSES_DIR) clean
-
-ncurses-dirclean:
- rm -rf $(NCURSES_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(strip $(BR2_PACKAGE_NCURSES)),y)
-TARGETS+=ncurses
-endif
-ifeq ($(strip $(BR2_PACKAGE_NCURSES_TARGET_HEADERS)),y)
-TARGETS+=ncurses-headers
-endif
+$(eval $(call AUTOTARGETS,package,ncurses))
\ No newline at end of file
^ permalink raw reply [flat|nested] 29+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/ncurses
2008-03-06 18:19 ninevoltz at uclibc.org
@ 2008-03-07 13:30 ` Peter Korsgaard
0 siblings, 0 replies; 29+ messages in thread
From: Peter Korsgaard @ 2008-03-07 13:30 UTC (permalink / raw)
To: buildroot
>>>>> "ninevoltz" == ninevoltz <ninevoltz@uclibc.org> writes:
ninevoltz> Author: ninevoltz
ninevoltz> Date: 2008-03-06 10:19:15 -0800 (Thu, 06 Mar 2008)
ninevoltz> New Revision: 21215
ninevoltz> Log:
ninevoltz> updated ncurses makefile
This seems totally fubar'ed. It now installs .a files under TARGET_DIR
and usr/share/terminfo is over 6MB!
Please fix otherwise I'll revert the commit.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 29+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/ncurses
@ 2008-03-07 13:57 ninevoltz at uclibc.org
2008-03-07 14:03 ` Peter Korsgaard
0 siblings, 1 reply; 29+ messages in thread
From: ninevoltz at uclibc.org @ 2008-03-07 13:57 UTC (permalink / raw)
To: buildroot
Author: ninevoltz
Date: 2008-03-07 05:57:53 -0800 (Fri, 07 Mar 2008)
New Revision: 21273
Log:
reverted ncurses makefile
Modified:
trunk/buildroot/package/ncurses/ncurses.mk
Changeset:
Modified: trunk/buildroot/package/ncurses/ncurses.mk
===================================================================
--- trunk/buildroot/package/ncurses/ncurses.mk 2008-03-07 13:34:02 UTC (rev 21272)
+++ trunk/buildroot/package/ncurses/ncurses.mk 2008-03-07 13:57:53 UTC (rev 21273)
@@ -1,27 +1,72 @@
#############################################################
#
# ncurses
-#
+# this installs only a few vital termcap entries
+#
#############################################################
-NCURSES_VERSION = 5.6
-NCURSES_SITE = http://ftp.gnu.org/pub/gnu/ncurses
-NCURSES_SOURCE = ncurses-$(NCURSES_VERSION).tar.gz
-NCURSES_AUTORECONF = NO
-NCURSES_INSTALL_STAGING = YES
-NCURSES_INSTALL_TARGET = YES
+# Copyright (C) 2002 by Ken Restivo <ken@246gt.com>
+# $Id: ncurses.mk,v 1.7 2005/01/03 04:38:13 andersen Exp $
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Library General Public License as
+# published by the Free Software Foundation; either version 2 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Library General Public License for more details.
+#
+# You should have received a copy of the GNU Library General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+# USA
+# TARGETS
+NCURSES_VERSION:=5.6
+NCURSES_SITE:=http://ftp.gnu.org/pub/gnu/ncurses
+NCURSES_DIR:=$(BUILD_DIR)/ncurses-$(NCURSES_VERSION)
+NCURSES_SOURCE:=ncurses-$(NCURSES_VERSION).tar.gz
+NCURSES_CAT:=$(ZCAT)
+
ifneq ($(strip $(BR2_PACKAGE_NCURSES_TARGET_HEADERS)),y)
-NCURSES_WANT_STATIC = --disable-static
+NCURSES_WANT_STATIC=--disable-static
endif
-NCURSES_CONF_OPT = --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 \
+$(DL_DIR)/$(NCURSES_SOURCE):
+ $(WGET) -P $(DL_DIR) $(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 \
+ --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=/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 \
@@ -29,12 +74,96 @@
--without-profile --without-debug --disable-rpath \
--enable-echo --enable-const --enable-overwrite \
--enable-broken_linker \
- $(NCURSES_WANT_STATIC)
+ $(NCURSES_WANT_STATIC) \
+ )
+ touch $@
-NCURSES_MAKE_OPT = libs panel menu form headers
+$(NCURSES_DIR)/lib/libncurses.so.$(NCURSES_VERSION): $(NCURSES_DIR)/.configured
+ $(MAKE1) DESTDIR=$(STAGING_DIR) -C $(NCURSES_DIR) \
+ libs panel menu form headers
-NCURSES_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
+$(STAGING_DIR)/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)/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*
+ touch -c $@
-NCURSES_DEPENDENCIES = uclibc
+$(TARGET_DIR)/lib/libncurses.so.$(NCURSES_VERSION): $(STAGING_DIR)/lib/libncurses.so.$(NCURSES_VERSION)
+ cp -dpf $(NCURSES_DIR)/lib/libncurses.so* $(TARGET_DIR)/lib/
+ -cp -dpf $(STAGING_DIR)/usr/lib/terminfo $(TARGET_DIR)/usr/lib/
+ mkdir -p $(TARGET_DIR)/usr/share/terminfo/x
+ cp -dpf $(STAGING_DIR)/usr/share/terminfo/x/xterm $(TARGET_DIR)/usr/share/terminfo/x
+ cp -dpf $(STAGING_DIR)/usr/share/terminfo/x/xterm-color $(TARGET_DIR)/usr/share/terminfo/x
+ cp -dpf $(STAGING_DIR)/usr/share/terminfo/x/xterm-xfree86 $(TARGET_DIR)/usr/share/terminfo/x
+ mkdir -p $(TARGET_DIR)/usr/share/terminfo/v
+ cp -dpf $(STAGING_DIR)/usr/share/terminfo/v/vt100 $(TARGET_DIR)/usr/share/terminfo/v
+ cp -dpf $(STAGING_DIR)/usr/share/terminfo/v/vt102 $(TARGET_DIR)/usr/share/terminfo/v
+ cp -dpf $(STAGING_DIR)/usr/share/terminfo/v/vt200 $(TARGET_DIR)/usr/share/terminfo/v
+ cp -dpf $(STAGING_DIR)/usr/share/terminfo/v/vt220 $(TARGET_DIR)/usr/share/terminfo/v
+ mkdir -p $(TARGET_DIR)/usr/share/terminfo/a
+ 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 $@
-$(eval $(call AUTOTARGETS,package,ncurses))
\ No newline at end of file
+$(TARGET_DIR)/usr/lib/libncurses.a: $(STAGING_DIR)/lib/libncurses.a
+ mkdir -p $(TARGET_DIR)/usr/include
+ cp -dpf $(NCURSES_DIR)/include/curses.h $(TARGET_DIR)/usr/include/ncurses.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/
+ rm -f $(TARGET_DIR)/usr/lib/terminfo
+ (cd $(TARGET_DIR)/usr/lib; ln -fs ../share/terminfo; \
+ ln -fs libncurses.a libcurses.a; \
+ ln -fs libncurses.a libtermcap.a; \
+ )
+ (cd $(TARGET_DIR)/usr/include; ln -fs ncurses.h curses.h)
+ rm -f $(TARGET_DIR)/lib/libncurses.so
+ (cd $(TARGET_DIR)/usr/lib; ln -fs ../../lib/libncurses.so.$(NCURSES_VERSION) libncurses.so)
+ -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/lib/libncurses.so.$(NCURSES_VERSION)
+ touch -c $@
+
+ncurses: $(TARGET_DIR)/lib/libncurses.so.$(NCURSES_VERSION)
+
+ncurses-headers: $(TARGET_DIR)/usr/lib/libncurses.a
+
+ncurses-source: $(DL_DIR)/$(NCURSES_SOURCE)
+
+ncurses-clean:
+ rm -f $(STAGING_DIR)/lib/libncurses.so* $(TARGET_DIR)/lib/libncurses.so*
+ 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
+ -$(MAKE) -C $(NCURSES_DIR) clean
+
+ncurses-dirclean:
+ rm -rf $(NCURSES_DIR)
+
+#############################################################
+#
+# Toplevel Makefile options
+#
+#############################################################
+ifeq ($(strip $(BR2_PACKAGE_NCURSES)),y)
+TARGETS+=ncurses
+endif
+ifeq ($(strip $(BR2_PACKAGE_NCURSES_TARGET_HEADERS)),y)
+TARGETS+=ncurses-headers
+endif
^ permalink raw reply [flat|nested] 29+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/ncurses
2008-03-07 13:57 ninevoltz at uclibc.org
@ 2008-03-07 14:03 ` Peter Korsgaard
0 siblings, 0 replies; 29+ messages in thread
From: Peter Korsgaard @ 2008-03-07 14:03 UTC (permalink / raw)
To: buildroot
>>>>> "ninevoltz" == ninevoltz <ninevoltz@uclibc.org> writes:
Hi,
ninevoltz> Author: ninevoltz
ninevoltz> Date: 2008-03-07 05:57:53 -0800 (Fri, 07 Mar 2008)
ninevoltz> New Revision: 21273
ninevoltz> Log:
ninevoltz> reverted ncurses makefile
Thanks. I'm not opposed to your cleaned up version, but it ofcause has
to be functionally the same as before.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 29+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/ncurses
@ 2008-03-31 14:44 jacmet at uclibc.org
0 siblings, 0 replies; 29+ messages in thread
From: jacmet at uclibc.org @ 2008-03-31 14:44 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-03-31 07:44:32 -0700 (Mon, 31 Mar 2008)
New Revision: 21596
Log:
ncurses: cleanup /usr/lib/terminfo symlink handling
Modified:
trunk/buildroot/package/ncurses/ncurses.mk
Changeset:
Modified: trunk/buildroot/package/ncurses/ncurses.mk
===================================================================
--- trunk/buildroot/package/ncurses/ncurses.mk 2008-03-31 14:32:38 UTC (rev 21595)
+++ trunk/buildroot/package/ncurses/ncurses.mk 2008-03-31 14:44:32 UTC (rev 21596)
@@ -104,7 +104,7 @@
$(TARGET_DIR)/lib/libncurses.so.$(NCURSES_VERSION): $(STAGING_DIR)/lib/libncurses.so.$(NCURSES_VERSION)
cp -dpf $(NCURSES_DIR)/lib/libncurses.so* $(TARGET_DIR)/lib/
- -cp -dpf $(STAGING_DIR)/usr/lib/terminfo $(TARGET_DIR)/usr/lib/
+ ln -sf /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
cp -dpf $(STAGING_DIR)/usr/share/terminfo/x/xterm-color $(TARGET_DIR)/usr/share/terminfo/x
@@ -129,8 +129,7 @@
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/
- rm -f $(TARGET_DIR)/usr/lib/terminfo
- (cd $(TARGET_DIR)/usr/lib; ln -fs ../share/terminfo; \
+ (cd $(TARGET_DIR)/usr/lib; \
ln -fs libncurses.a libcurses.a; \
ln -fs libncurses.a libtermcap.a; \
)
@@ -151,6 +150,7 @@
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:
^ permalink raw reply [flat|nested] 29+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/ncurses
@ 2008-04-09 11:38 nkukard at uclibc.org
2008-04-09 22:35 ` Hamish Moffatt
0 siblings, 1 reply; 29+ messages in thread
From: nkukard at uclibc.org @ 2008-04-09 11:38 UTC (permalink / raw)
To: buildroot
Author: nkukard
Date: 2008-04-09 04:38:48 -0700 (Wed, 09 Apr 2008)
New Revision: 21682
Log:
Some package use ncurses libpanel/libform/libmenu, this config allows to selectively
copy them to the target filesystem at the same time at the main library is installed.
-Patch by Michel (BusError)
Modified:
trunk/buildroot/package/ncurses/Config.in
trunk/buildroot/package/ncurses/ncurses.mk
Changeset:
Modified: trunk/buildroot/package/ncurses/Config.in
===================================================================
--- trunk/buildroot/package/ncurses/Config.in 2008-04-09 10:22:22 UTC (rev 21681)
+++ trunk/buildroot/package/ncurses/Config.in 2008-04-09 11:38:48 UTC (rev 21682)
@@ -7,6 +7,28 @@
http://www.gnu.org/software/ncurses/
+config BR2_PACKAGE_NCURSES_TARGET_PANEL
+ bool "ncurses libpanel in target"
+ default n
+ depends on BR2_PACKAGE_NCURSES
+ help
+ Ncurses headers in target
+ Includes ncurses dynamic libpanel in target
+
+config BR2_PACKAGE_NCURSES_TARGET_FORM
+ bool "ncurses libform in target"
+ default n
+ depends on BR2_PACKAGE_NCURSES
+ help
+ Includes ncurses dynamic libform in target
+
+config BR2_PACKAGE_NCURSES_TARGET_MENU
+ bool "ncurses libmenu in target"
+ default n
+ depends on BR2_PACKAGE_NCURSES
+ help
+ Includes ncurses dynamic libmenu in target
+
config BR2_PACKAGE_NCURSES_TARGET_HEADERS
bool "ncurses headers in target"
default n
Modified: trunk/buildroot/package/ncurses/ncurses.mk
===================================================================
--- trunk/buildroot/package/ncurses/ncurses.mk 2008-04-09 10:22:22 UTC (rev 21681)
+++ trunk/buildroot/package/ncurses/ncurses.mk 2008-04-09 11:38:48 UTC (rev 21682)
@@ -104,6 +104,15 @@
$(TARGET_DIR)/lib/libncurses.so.$(NCURSES_VERSION): $(STAGING_DIR)/lib/libncurses.so.$(NCURSES_VERSION)
cp -dpf $(NCURSES_DIR)/lib/libncurses.so* $(TARGET_DIR)/lib/
+ifeq ($(strip $(BR2_PACKAGE_NCURSES_TARGET_PANEL)),y)
+ cp -dpf $(NCURSES_DIR)/lib/libpanel.so* $(TARGET_DIR)/lib/
+endif
+ifeq ($(strip $(BR2_PACKAGE_NCURSES_TARGET_FORM)),y)
+ cp -dpf $(NCURSES_DIR)/lib/libform.so* $(TARGET_DIR)/lib/
+endif
+ifeq ($(strip $(BR2_PACKAGE_NCURSES_TARGET_MENU)),y)
+ cp -dpf $(NCURSES_DIR)/lib/libmenu.so* $(TARGET_DIR)/lib/
+endif
ln -sf /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
^ permalink raw reply [flat|nested] 29+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/ncurses
2008-04-09 11:38 nkukard at uclibc.org
@ 2008-04-09 22:35 ` Hamish Moffatt
2008-04-10 5:14 ` Nigel Kukard
0 siblings, 1 reply; 29+ messages in thread
From: Hamish Moffatt @ 2008-04-09 22:35 UTC (permalink / raw)
To: buildroot
On Wed, Apr 09, 2008 at 04:38:48AM -0700, nkukard at uclibc.org wrote:
> Author: nkukard
> Date: 2008-04-09 04:38:48 -0700 (Wed, 09 Apr 2008)
> New Revision: 21682
>
> Log:
> Some package use ncurses libpanel/libform/libmenu, this config allows to selectively
> copy them to the target filesystem at the same time at the main library is installed.
> -Patch by Michel (BusError)
>
>
> Modified:
> trunk/buildroot/package/ncurses/Config.in
> trunk/buildroot/package/ncurses/ncurses.mk
>
>
> Changeset:
> Modified: trunk/buildroot/package/ncurses/Config.in
> ===================================================================
> --- trunk/buildroot/package/ncurses/Config.in 2008-04-09 10:22:22 UTC (rev 21681)
> +++ trunk/buildroot/package/ncurses/Config.in 2008-04-09 11:38:48 UTC (rev 21682)
> @@ -7,6 +7,28 @@
>
> http://www.gnu.org/software/ncurses/
>
> +config BR2_PACKAGE_NCURSES_TARGET_PANEL
> + bool "ncurses libpanel in target"
> + default n
> + depends on BR2_PACKAGE_NCURSES
> + help
> + Ncurses headers in target
^^^^^^^^^^^^^^^^^^^^^^^^^
> + Includes ncurses dynamic libpanel in target
This looks like a copy/paste error.
> +
> +config BR2_PACKAGE_NCURSES_TARGET_FORM
> + bool "ncurses libform in target"
> + default n
> + depends on BR2_PACKAGE_NCURSES
> + help
> + Includes ncurses dynamic libform in target
> +
> +config BR2_PACKAGE_NCURSES_TARGET_MENU
> + bool "ncurses libmenu in target"
> + default n
> + depends on BR2_PACKAGE_NCURSES
> + help
> + Includes ncurses dynamic libmenu in target
Weird tab/spaces mix here.
> $(TARGET_DIR)/lib/libncurses.so.$(NCURSES_VERSION): $(STAGING_DIR)/lib/libncurses.so.$(NCURSES_VERSION)
> cp -dpf $(NCURSES_DIR)/lib/libncurses.so* $(TARGET_DIR)/lib/
> +ifeq ($(strip $(BR2_PACKAGE_NCURSES_TARGET_PANEL)),y)
> + cp -dpf $(NCURSES_DIR)/lib/libpanel.so* $(TARGET_DIR)/lib/
> +endif
> +ifeq ($(strip $(BR2_PACKAGE_NCURSES_TARGET_FORM)),y)
> + cp -dpf $(NCURSES_DIR)/lib/libform.so* $(TARGET_DIR)/lib/
> +endif
> +ifeq ($(strip $(BR2_PACKAGE_NCURSES_TARGET_MENU)),y)
> + cp -dpf $(NCURSES_DIR)/lib/libmenu.so* $(TARGET_DIR)/lib/
> +endif
Should be /usr/lib rather than /lib?
thanks
Hamish
--
Hamish Moffatt VK3SB <hamish@debian.org> <hamish@cloud.net.au>
^ permalink raw reply [flat|nested] 29+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/ncurses
2008-04-09 22:35 ` Hamish Moffatt
@ 2008-04-10 5:14 ` Nigel Kukard
2008-04-10 7:06 ` Peter Korsgaard
0 siblings, 1 reply; 29+ messages in thread
From: Nigel Kukard @ 2008-04-10 5:14 UTC (permalink / raw)
To: buildroot
> >
> > +config BR2_PACKAGE_NCURSES_TARGET_PANEL
> > + bool "ncurses libpanel in target"
> > + default n
> > + depends on BR2_PACKAGE_NCURSES
> > + help
> > + Ncurses headers in target
> ^^^^^^^^^^^^^^^^^^^^^^^^^
> > + Includes ncurses dynamic libpanel in target
>
> This looks like a copy/paste error.
Fixed
>
> > +
> > +config BR2_PACKAGE_NCURSES_TARGET_FORM
> > + bool "ncurses libform in target"
> > + default n
> > + depends on BR2_PACKAGE_NCURSES
> > + help
> > + Includes ncurses dynamic libform in target
> > +
> > +config BR2_PACKAGE_NCURSES_TARGET_MENU
> > + bool "ncurses libmenu in target"
> > + default n
> > + depends on BR2_PACKAGE_NCURSES
> > + help
> > + Includes ncurses dynamic libmenu in target
>
> Weird tab/spaces mix here.
Fixed
>
> > $(TARGET_DIR)/lib/libncurses.so.$(NCURSES_VERSION): $(STAGING_DIR)/lib/libncurses.so.$(NCURSES_VERSION)
> > cp -dpf $(NCURSES_DIR)/lib/libncurses.so* $(TARGET_DIR)/lib/
> > +ifeq ($(strip $(BR2_PACKAGE_NCURSES_TARGET_PANEL)),y)
> > + cp -dpf $(NCURSES_DIR)/lib/libpanel.so* $(TARGET_DIR)/lib/
> > +endif
> > +ifeq ($(strip $(BR2_PACKAGE_NCURSES_TARGET_FORM)),y)
> > + cp -dpf $(NCURSES_DIR)/lib/libform.so* $(TARGET_DIR)/lib/
> > +endif
> > +ifeq ($(strip $(BR2_PACKAGE_NCURSES_TARGET_MENU)),y)
> > + cp -dpf $(NCURSES_DIR)/lib/libmenu.so* $(TARGET_DIR)/lib/
> > +endif
>
> Should be /usr/lib rather than /lib?
The rest of the libs are being installed to /lib ... I don't like
changing install paths, but I agree with you it should be /usr/lib ...
anyone got any very good reason why ncurses should be installed in /lib?
-N
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
Url : http://busybox.net/lists/buildroot/attachments/20080410/71bdb923/attachment.pgp
^ permalink raw reply [flat|nested] 29+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/ncurses
@ 2008-04-10 5:14 nkukard at uclibc.org
0 siblings, 0 replies; 29+ messages in thread
From: nkukard at uclibc.org @ 2008-04-10 5:14 UTC (permalink / raw)
To: buildroot
Author: nkukard
Date: 2008-04-09 22:14:53 -0700 (Wed, 09 Apr 2008)
New Revision: 21689
Log:
* Fixed copy-and-paste error, incorrect description
* Fixed another copy-and-paste error, weird space/tab mixes
- Thanks Hamish Moffatt
Modified:
trunk/buildroot/package/ncurses/Config.in
Changeset:
Modified: trunk/buildroot/package/ncurses/Config.in
===================================================================
--- trunk/buildroot/package/ncurses/Config.in 2008-04-10 02:09:40 UTC (rev 21688)
+++ trunk/buildroot/package/ncurses/Config.in 2008-04-10 05:14:53 UTC (rev 21689)
@@ -12,7 +12,6 @@
default n
depends on BR2_PACKAGE_NCURSES
help
- Ncurses headers in target
Includes ncurses dynamic libpanel in target
config BR2_PACKAGE_NCURSES_TARGET_FORM
@@ -23,11 +22,11 @@
Includes ncurses dynamic libform in target
config BR2_PACKAGE_NCURSES_TARGET_MENU
- bool "ncurses libmenu in target"
- default n
- depends on BR2_PACKAGE_NCURSES
- help
- Includes ncurses dynamic libmenu in target
+ bool "ncurses libmenu in target"
+ default n
+ depends on BR2_PACKAGE_NCURSES
+ help
+ Includes ncurses dynamic libmenu in target
config BR2_PACKAGE_NCURSES_TARGET_HEADERS
bool "ncurses headers in target"
^ permalink raw reply [flat|nested] 29+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/ncurses
2008-04-10 5:14 ` Nigel Kukard
@ 2008-04-10 7:06 ` Peter Korsgaard
2008-04-10 9:10 ` Hamish Moffatt
0 siblings, 1 reply; 29+ messages in thread
From: Peter Korsgaard @ 2008-04-10 7:06 UTC (permalink / raw)
To: buildroot
>>>>> "Nigel" == Nigel Kukard <nkukard@lbsd.net> writes:
Hi,
>> Should be /usr/lib rather than /lib?
Nigel> The rest of the libs are being installed to /lib ... I don't like
Nigel> changing install paths, but I agree with you it should be /usr/lib ...
Nigel> anyone got any very good reason why ncurses should be installed in /lib?
The basic libncurses.co* is normally installed in /lib, but the extra
libs are in /usr/lib, E.G. on my Debian machine:
% dpkg -L libncurses5|grep .so|sort
/lib/libncurses.so.5
/lib/libncurses.so.5.6
/lib/libtic.so.5
/lib/libtic.so.5.6
/usr/lib/libform.so.5
/usr/lib/libform.so.5.6
/usr/lib/libmenu.so.5
/usr/lib/libmenu.so.5.6
/usr/lib/libpanel.so.5
/usr/lib/libpanel.so.5.6
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 29+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/ncurses
@ 2008-04-10 8:17 nkukard at uclibc.org
0 siblings, 0 replies; 29+ messages in thread
From: nkukard at uclibc.org @ 2008-04-10 8:17 UTC (permalink / raw)
To: buildroot
Author: nkukard
Date: 2008-04-10 01:17:14 -0700 (Thu, 10 Apr 2008)
New Revision: 21690
Log:
* Fixed additional ncurses library install path
Modified:
trunk/buildroot/package/ncurses/ncurses.mk
Changeset:
Modified: trunk/buildroot/package/ncurses/ncurses.mk
===================================================================
--- trunk/buildroot/package/ncurses/ncurses.mk 2008-04-10 05:14:53 UTC (rev 21689)
+++ trunk/buildroot/package/ncurses/ncurses.mk 2008-04-10 08:17:14 UTC (rev 21690)
@@ -105,13 +105,13 @@
$(TARGET_DIR)/lib/libncurses.so.$(NCURSES_VERSION): $(STAGING_DIR)/lib/libncurses.so.$(NCURSES_VERSION)
cp -dpf $(NCURSES_DIR)/lib/libncurses.so* $(TARGET_DIR)/lib/
ifeq ($(strip $(BR2_PACKAGE_NCURSES_TARGET_PANEL)),y)
- cp -dpf $(NCURSES_DIR)/lib/libpanel.so* $(TARGET_DIR)/lib/
+ cp -dpf $(NCURSES_DIR)/lib/libpanel.so* $(TARGET_DIR)/usr/lib/
endif
ifeq ($(strip $(BR2_PACKAGE_NCURSES_TARGET_FORM)),y)
- cp -dpf $(NCURSES_DIR)/lib/libform.so* $(TARGET_DIR)/lib/
+ cp -dpf $(NCURSES_DIR)/lib/libform.so* $(TARGET_DIR)/usr/lib/
endif
ifeq ($(strip $(BR2_PACKAGE_NCURSES_TARGET_MENU)),y)
- cp -dpf $(NCURSES_DIR)/lib/libmenu.so* $(TARGET_DIR)/lib/
+ cp -dpf $(NCURSES_DIR)/lib/libmenu.so* $(TARGET_DIR)/usr/lib/
endif
ln -sf /usr/share/terminfo $(TARGET_DIR)/usr/lib/terminfo
mkdir -p $(TARGET_DIR)/usr/share/terminfo/x
^ permalink raw reply [flat|nested] 29+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/ncurses
2008-04-10 7:06 ` Peter Korsgaard
@ 2008-04-10 9:10 ` Hamish Moffatt
0 siblings, 0 replies; 29+ messages in thread
From: Hamish Moffatt @ 2008-04-10 9:10 UTC (permalink / raw)
To: buildroot
On Thu, Apr 10, 2008 at 09:06:29AM +0200, Peter Korsgaard wrote:
> >>>>> "Nigel" == Nigel Kukard <nkukard@lbsd.net> writes:
>
> Hi,
>
> >> Should be /usr/lib rather than /lib?
>
> Nigel> The rest of the libs are being installed to /lib ... I don't like
> Nigel> changing install paths, but I agree with you it should be /usr/lib ...
> Nigel> anyone got any very good reason why ncurses should be installed in /lib?
>
> The basic libncurses.co* is normally installed in /lib, but the extra
> libs are in /usr/lib, E.G. on my Debian machine:
bash and more (and most other shells in /bin) uses libncurses, so it
needs to be in /lib on a typical system. (On a buildroot system those
would normally be provided by busybox instead).
Hamish
--
Hamish Moffatt VK3SB <hamish@debian.org> <hamish@cloud.net.au>
^ permalink raw reply [flat|nested] 29+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/ncurses
@ 2008-07-01 19:24 jacmet at uclibc.org
0 siblings, 0 replies; 29+ messages in thread
From: jacmet at uclibc.org @ 2008-07-01 19:24 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-07-01 12:24:36 -0700 (Tue, 01 Jul 2008)
New Revision: 22597
Log:
ncurses: don't follow symlink on ln invocation
The ln -sf command would fail if $TARGET_DIR/usr/lib/terminfo already exists
as we don't have write permissions to the symlink target. Fixed by adding
-n option (don't dereference link).
Modified:
trunk/buildroot/package/ncurses/ncurses.mk
Changeset:
Modified: trunk/buildroot/package/ncurses/ncurses.mk
===================================================================
--- trunk/buildroot/package/ncurses/ncurses.mk 2008-07-01 19:09:50 UTC (rev 22596)
+++ trunk/buildroot/package/ncurses/ncurses.mk 2008-07-01 19:24:36 UTC (rev 22597)
@@ -113,7 +113,7 @@
ifeq ($(strip $(BR2_PACKAGE_NCURSES_TARGET_MENU)),y)
cp -dpf $(NCURSES_DIR)/lib/libmenu.so* $(TARGET_DIR)/usr/lib/
endif
- ln -sf /usr/share/terminfo $(TARGET_DIR)/usr/lib/terminfo
+ 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
cp -dpf $(STAGING_DIR)/usr/share/terminfo/x/xterm-color $(TARGET_DIR)/usr/share/terminfo/x
^ permalink raw reply [flat|nested] 29+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/ncurses
@ 2009-01-11 13:33 thomasez at uclibc.org
0 siblings, 0 replies; 29+ messages in thread
From: thomasez at uclibc.org @ 2009-01-11 13:33 UTC (permalink / raw)
To: buildroot
Author: thomasez
Date: 2009-01-11 13:33:13 +0000 (Sun, 11 Jan 2009)
New Revision: 24749
Log:
For some reason we ended up with a link-loop. This does not.
Modified:
trunk/buildroot/package/ncurses/ncurses.mk
Changeset:
Modified: trunk/buildroot/package/ncurses/ncurses.mk
===================================================================
--- trunk/buildroot/package/ncurses/ncurses.mk 2009-01-10 21:03:00 UTC (rev 24748)
+++ trunk/buildroot/package/ncurses/ncurses.mk 2009-01-11 13:33:13 UTC (rev 24749)
@@ -132,7 +132,7 @@
$(TARGET_DIR)/usr/lib/libncurses.a: $(STAGING_DIR)/lib/libncurses.a
mkdir -p $(TARGET_DIR)/usr/include
- cp -dpf $(NCURSES_DIR)/include/curses.h $(TARGET_DIR)/usr/include/ncurses.h
+ 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/
@@ -142,7 +142,7 @@
ln -fs libncurses.a libcurses.a; \
ln -fs libncurses.a libtermcap.a; \
)
- (cd $(TARGET_DIR)/usr/include; ln -fs ncurses.h curses.h)
+ (cd $(TARGET_DIR)/usr/include; ln -fs curses.h ncurses.h)
rm -f $(TARGET_DIR)/lib/libncurses.so
(cd $(TARGET_DIR)/usr/lib; ln -fs ../../lib/libncurses.so.$(NCURSES_VERSION) libncurses.so)
-$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/lib/libncurses.so.$(NCURSES_VERSION)
^ permalink raw reply [flat|nested] 29+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/ncurses
@ 2009-01-12 7:44 ulf at uclibc.org
0 siblings, 0 replies; 29+ messages in thread
From: ulf at uclibc.org @ 2009-01-12 7:44 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2009-01-12 07:44:09 +0000 (Mon, 12 Jan 2009)
New Revision: 24783
Log:
Add ncurse-unpacked target
Modified:
trunk/buildroot/package/ncurses/ncurses.mk
Changeset:
Modified: trunk/buildroot/package/ncurses/ncurses.mk
===================================================================
--- trunk/buildroot/package/ncurses/ncurses.mk 2009-01-12 07:43:23 UTC (rev 24782)
+++ trunk/buildroot/package/ncurses/ncurses.mk 2009-01-12 07:44:09 UTC (rev 24783)
@@ -150,6 +150,8 @@
ncurses: $(TARGET_DIR)/lib/libncurses.so.$(NCURSES_VERSION)
+ncurses-unpacked: $(NCURSES_DIR)/.patched
+
ncurses-headers: $(TARGET_DIR)/usr/lib/libncurses.a
ncurses-source: $(DL_DIR)/$(NCURSES_SOURCE)
^ permalink raw reply [flat|nested] 29+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/ncurses
@ 2009-01-22 22:58 ulf at uclibc.org
0 siblings, 0 replies; 29+ messages in thread
From: ulf at uclibc.org @ 2009-01-22 22:58 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2009-01-22 22:58:55 +0000 (Thu, 22 Jan 2009)
New Revision: 24971
Log:
Use /usr/lib for ncurses instead of /lib
Modified:
trunk/buildroot/package/ncurses/ncurses.mk
Changeset:
Modified: trunk/buildroot/package/ncurses/ncurses.mk
===================================================================
--- trunk/buildroot/package/ncurses/ncurses.mk 2009-01-22 22:58:29 UTC (rev 24970)
+++ trunk/buildroot/package/ncurses/ncurses.mk 2009-01-22 22:58:55 UTC (rev 24971)
@@ -58,7 +58,7 @@
--exec-prefix=/usr \
--bindir=/usr/bin \
--sbindir=/usr/sbin \
- --libdir=/lib \
+ --libdir=/usr/lib \
--libexecdir=/usr/lib \
--sysconfdir=/etc \
--datadir=/usr/share \
@@ -82,7 +82,7 @@
$(MAKE1) DESTDIR=$(STAGING_DIR) -C $(NCURSES_DIR) \
libs panel menu form headers
-$(STAGING_DIR)/lib/libncurses.so.$(NCURSES_VERSION): $(NCURSES_DIR)/lib/libncurses.so.$(NCURSES_VERSION)
+$(STAGING_DIR)/usr/lib/libncurses.so.$(NCURSES_VERSION): $(NCURSES_DIR)/lib/libncurses.so.$(NCURSES_VERSION)
$(MAKE1) \
prefix=$(STAGING_DIR)/usr/ \
exec_prefix=$(STAGING_DIR) \
@@ -92,7 +92,7 @@
datadir=$(STAGING_DIR)/usr/share \
sysconfdir=$(STAGING_DIR)/etc \
localstatedir=$(STAGING_DIR)/var \
- libdir=$(STAGING_DIR)/lib \
+ libdir=$(STAGING_DIR)/usr/lib \
infodir=$(STAGING_DIR)/usr/info \
mandir=$(STAGING_DIR)/usr/man \
includedir=$(STAGING_DIR)/usr/include \
@@ -102,8 +102,8 @@
chmod a-x $(NCURSES_DIR)/lib/libncurses.so*
touch -c $@
-$(TARGET_DIR)/lib/libncurses.so.$(NCURSES_VERSION): $(STAGING_DIR)/lib/libncurses.so.$(NCURSES_VERSION)
- cp -dpf $(NCURSES_DIR)/lib/libncurses.so* $(TARGET_DIR)/lib/
+$(TARGET_DIR)/usr/lib/libncurses.so.$(NCURSES_VERSION): $(STAGING_DIR)/usr/lib/libncurses.so.$(NCURSES_VERSION)
+ cp -dpf $(NCURSES_DIR)/lib/libncurses.so* $(TARGET_DIR)/usr/lib/
ifeq ($(BR2_PACKAGE_NCURSES_TARGET_PANEL),y)
cp -dpf $(NCURSES_DIR)/lib/libpanel.so* $(TARGET_DIR)/usr/lib/
endif
@@ -143,12 +143,12 @@
ln -fs libncurses.a libtermcap.a; \
)
(cd $(TARGET_DIR)/usr/include; ln -fs curses.h ncurses.h)
- rm -f $(TARGET_DIR)/lib/libncurses.so
- (cd $(TARGET_DIR)/usr/lib; ln -fs ../../lib/libncurses.so.$(NCURSES_VERSION) libncurses.so)
- -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/lib/libncurses.so.$(NCURSES_VERSION)
+ 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)/lib/libncurses.so.$(NCURSES_VERSION)
+ncurses: $(TARGET_DIR)/usr/lib/libncurses.so.$(NCURSES_VERSION)
ncurses-unpacked: $(NCURSES_DIR)/.patched
@@ -157,7 +157,6 @@
ncurses-source: $(DL_DIR)/$(NCURSES_SOURCE)
ncurses-clean:
- rm -f $(STAGING_DIR)/lib/libncurses.so* $(TARGET_DIR)/lib/libncurses.so*
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
^ permalink raw reply [flat|nested] 29+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/ncurses
@ 2009-01-23 23:02 ulf at uclibc.org
2009-01-24 6:33 ` Peter Korsgaard
0 siblings, 1 reply; 29+ messages in thread
From: ulf at uclibc.org @ 2009-01-23 23:02 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2009-01-23 23:02:15 +0000 (Fri, 23 Jan 2009)
New Revision: 24992
Log:
Fix static lib dep for ncurses
Modified:
trunk/buildroot/package/ncurses/ncurses.mk
Changeset:
Modified: trunk/buildroot/package/ncurses/ncurses.mk
===================================================================
--- trunk/buildroot/package/ncurses/ncurses.mk 2009-01-23 21:06:05 UTC (rev 24991)
+++ trunk/buildroot/package/ncurses/ncurses.mk 2009-01-23 23:02:15 UTC (rev 24992)
@@ -130,7 +130,9 @@
-$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $@
touch -c $@
-$(TARGET_DIR)/usr/lib/libncurses.a: $(STAGING_DIR)/lib/libncurses.a
+$(NCURSES_DIR)/lib/libncurses.a: $(NCURSES_DIR)/lib/libncurses.so.$(NCURSES_VERSION)
+
+$(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
^ permalink raw reply [flat|nested] 29+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/ncurses
2009-01-23 23:02 ulf at uclibc.org
@ 2009-01-24 6:33 ` Peter Korsgaard
2009-01-25 10:07 ` Thomas Lundquist
0 siblings, 1 reply; 29+ messages in thread
From: Peter Korsgaard @ 2009-01-24 6:33 UTC (permalink / raw)
To: buildroot
>>>>> "ulf" == ulf <ulf@uclibc.org> writes:
ulf> Author: ulf
ulf> Date: 2009-01-23 23:02:15 +0000 (Fri, 23 Jan 2009)
ulf> New Revision: 24992
ulf> Log:
ulf> Fix static lib dep for ncurses
ulf> Changeset:
ulf> Modified: trunk/buildroot/package/ncurses/ncurses.mk
ulf> ===================================================================
ulf> --- trunk/buildroot/package/ncurses/ncurses.mk 2009-01-23 21:06:05 UTC (rev 24991)
ulf> +++ trunk/buildroot/package/ncurses/ncurses.mk 2009-01-23 23:02:15 UTC (rev 24992)
ulf> @@ -130,7 +130,9 @@
ulf> -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $@
ulf> touch -c $@
ulf> -$(TARGET_DIR)/usr/lib/libncurses.a: $(STAGING_DIR)/lib/libncurses.a
ulf> +$(NCURSES_DIR)/lib/libncurses.a: $(NCURSES_DIR)/lib/libncurses.so.$(NCURSES_VERSION)
ulf> +
ulf> +$(TARGET_DIR)/usr/lib/libncurses.a: $(NCURSES_DIR)/lib/libncurses.a
That looks odd. Why not simply always install the development stuff to
target, and simply rely on the BR2_HAVE_DEVFILES setting to clean it
up if it isn't desired?
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 29+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/ncurses
2009-01-24 6:33 ` Peter Korsgaard
@ 2009-01-25 10:07 ` Thomas Lundquist
2009-01-25 20:56 ` Peter Korsgaard
0 siblings, 1 reply; 29+ messages in thread
From: Thomas Lundquist @ 2009-01-25 10:07 UTC (permalink / raw)
To: buildroot
On Sat, Jan 24, 2009 at 07:33:05AM +0100, Peter Korsgaard wrote:
>
> That looks odd. Why not simply always install the development stuff to
> target, and simply rely on the BR2_HAVE_DEVFILES setting to clean it
> up if it isn't desired?
I have to admit I'm a bit sceptic to this. It presumes that the
install scripts behave and we're able to get rid of all overhead when
we want to.
Thomas.
^ permalink raw reply [flat|nested] 29+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/ncurses
2009-01-25 10:07 ` Thomas Lundquist
@ 2009-01-25 20:56 ` Peter Korsgaard
0 siblings, 0 replies; 29+ messages in thread
From: Peter Korsgaard @ 2009-01-25 20:56 UTC (permalink / raw)
To: buildroot
>>>>> "Thomas" == Thomas Lundquist <lists@zelow.no> writes:
Thomas> On Sat, Jan 24, 2009 at 07:33:05AM +0100, Peter Korsgaard wrote:
>>
>> That looks odd. Why not simply always install the development stuff to
>> target, and simply rely on the BR2_HAVE_DEVFILES setting to clean it
>> up if it isn't desired?
Thomas> I have to admit I'm a bit sceptic to this. It presumes that
Thomas> the install scripts behave and we're able to get rid of all
Thomas> overhead when we want to.
True, but we do that already to a certain extent (E.G. the
Makefile.autotools.in stuff using make install-exec / install-strip),
and we've had (have?) quite some bugs with packages not installing the
same with install-strip versus install-exec or not picking up the
correct strip program and/or arguments.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 29+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/ncurses
@ 2009-03-01 22:35 jacmet at uclibc.org
0 siblings, 0 replies; 29+ messages in thread
From: jacmet at uclibc.org @ 2009-03-01 22:35 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2009-03-01 22:35:48 +0000 (Sun, 01 Mar 2009)
New Revision: 25475
Log:
ncurses: fixup ncurses5-config script
Fixes #133.
Modified:
trunk/buildroot/package/ncurses/ncurses.mk
Changeset:
Modified: trunk/buildroot/package/ncurses/ncurses.mk
===================================================================
--- trunk/buildroot/package/ncurses/ncurses.mk 2009-03-01 20:20:20 UTC (rev 25474)
+++ trunk/buildroot/package/ncurses/ncurses.mk 2009-03-01 22:35:48 UTC (rev 25475)
@@ -100,6 +100,8 @@
ticdir=$(STAGING_DIR)/usr/share/terminfo \
-C $(NCURSES_DIR) install
chmod a-x $(NCURSES_DIR)/lib/libncurses.so*
+ $(SED) 's^prefix="^prefix="$(STAGING_DIR)^' \
+ $(STAGING_DIR)/bin/ncurses5-config
touch -c $@
$(TARGET_DIR)/usr/lib/libncurses.so.$(NCURSES_VERSION): $(STAGING_DIR)/usr/lib/libncurses.so.$(NCURSES_VERSION)
^ permalink raw reply [flat|nested] 29+ messages in thread
end of thread, other threads:[~2009-03-01 22:35 UTC | newest]
Thread overview: 29+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-07-01 19:24 [Buildroot] svn commit: trunk/buildroot/package/ncurses jacmet at uclibc.org
-- strict thread matches above, loose matches on Subject: below --
2009-03-01 22:35 jacmet at uclibc.org
2009-01-23 23:02 ulf at uclibc.org
2009-01-24 6:33 ` Peter Korsgaard
2009-01-25 10:07 ` Thomas Lundquist
2009-01-25 20:56 ` Peter Korsgaard
2009-01-22 22:58 ulf at uclibc.org
2009-01-12 7:44 ulf at uclibc.org
2009-01-11 13:33 thomasez at uclibc.org
2008-04-10 8:17 nkukard at uclibc.org
2008-04-10 5:14 nkukard at uclibc.org
2008-04-09 11:38 nkukard at uclibc.org
2008-04-09 22:35 ` Hamish Moffatt
2008-04-10 5:14 ` Nigel Kukard
2008-04-10 7:06 ` Peter Korsgaard
2008-04-10 9:10 ` Hamish Moffatt
2008-03-31 14:44 jacmet at uclibc.org
2008-03-07 13:57 ninevoltz at uclibc.org
2008-03-07 14:03 ` Peter Korsgaard
2008-03-06 18:19 ninevoltz at uclibc.org
2008-03-07 13:30 ` Peter Korsgaard
2007-07-23 8:33 ulf at uclibc.org
2007-06-25 16:56 aldot at uclibc.org
2007-06-25 16:35 aldot at uclibc.org
2007-06-25 15:38 aldot at uclibc.org
2007-06-23 13:56 aldot at uclibc.org
2007-03-07 14:46 aldot at uclibc.org
2007-01-30 17:47 aldot at uclibc.org
2007-01-22 23:52 andersen at uclibc.org
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox