Revision: 6001
http://ipcop.svn.sourceforge.net/ipcop/?rev=6001&view=rev
Author: gespinasse
Date: 2011-10-27 06:46:56 +0000 (Thu, 27 Oct 2011)
Log Message:
-----------
Upgrade ncurses to 5.9
Remove the static lib compilation as not needed
/usr/lib/libncurses++w.a reference was missing on rootfile
Create a symlink on ncursesw5-config.
slang-2.2.4 find only ncurses5-config (so only on TOOLS_DIR). Next slang
version will find ncursesw5-config too.
-v option on ln, mv, rm command is not needed. Contrary to LFS, execution is
visible on log
Add a comment that we could run no tests, avoid me to look at again
Modified Paths:
--------------
ipcop/trunk/config/rootfiles/common/ncurses
ipcop/trunk/lfs/ncurses
ipcop/trunk/updates/2.0.1/ROOTFILES.i486-2.0.1
ipcop/trunk/updates/2.0.1/information.xml
ipcop/trunk/updates/2.0.1/setup
Modified: ipcop/trunk/config/rootfiles/common/ncurses
===================================================================
--- ipcop/trunk/config/rootfiles/common/ncurses 2011-10-26 22:58:14 UTC (rev
6000)
+++ ipcop/trunk/config/rootfiles/common/ncurses 2011-10-27 06:46:56 UTC (rev
6001)
@@ -1,11 +1,10 @@
-## ncurses-5.8 terminfo:gnome*,linux*,putty*,vt100*,vt220*,ntconsonle*,xterm*
-##
lib/libncursesw.so.5
-lib/libncursesw.so.5.8
+lib/libncursesw.so.5.9
#usr/bin/captoinfo
usr/bin/clear
#usr/bin/infocmp
#usr/bin/infotocap
+#usr/bin/ncurses5-config
#usr/bin/ncursesw5-config
usr/bin/reset
#usr/bin/tabs
@@ -33,34 +32,23 @@
#usr/include/termcap.h
#usr/include/tic.h
#usr/include/unctrl.h
-#usr/lib/libcurses.a
#usr/lib/libcurses.so
-#usr/lib/libcursesw.a
#usr/lib/libcursesw.so
-#usr/lib/libform.a
#usr/lib/libform.so
-#usr/lib/libformw.a
#usr/lib/libformw.so
#usr/lib/libformw.so.5
-#usr/lib/libformw.so.5.8
-#usr/lib/libmenu.a
+#usr/lib/libformw.so.5.9
#usr/lib/libmenu.so
-#usr/lib/libmenuw.a
#usr/lib/libmenuw.so
#usr/lib/libmenuw.so.5
-#usr/lib/libmenuw.so.5.8
-#usr/lib/libncurses++.a
-#usr/lib/libncurses++w.a
-#usr/lib/libncurses.a
+#usr/lib/libmenuw.so.5.9
+usr/lib/libncurses++w.a
usr/lib/libncurses.so
-#usr/lib/libncursesw.a
usr/lib/libncursesw.so
-#usr/lib/libpanel.a
usr/lib/libpanel.so
-#usr/lib/libpanelw.a
usr/lib/libpanelw.so
usr/lib/libpanelw.so.5
-usr/lib/libpanelw.so.5.8
+#usr/lib/libpanelw.so.5.9
#usr/lib/terminfo
usr/share/tabset
#usr/share/tabset/std
Modified: ipcop/trunk/lfs/ncurses
===================================================================
--- ipcop/trunk/lfs/ncurses 2011-10-26 22:58:14 UTC (rev 6000)
+++ ipcop/trunk/lfs/ncurses 2011-10-27 06:46:56 UTC (rev 6001)
@@ -33,7 +33,7 @@
include Config
PKG_NAME = ncurses
-VER = 5.8
+VER = 5.9
HOST_ARCH = all
OTHER_SRC = yes
@@ -51,7 +51,7 @@
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 20ed3fa7599937f0ca268d9088837a64
+$(DL_FILE)_MD5 = 8cb9c412e5f2d96bc6f459aa8c6282a1
install : $(TARGET)
@@ -82,11 +82,14 @@
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ # ncurses static lib are not needed at any time. Contrary to LFS, don't
compile them
+ # without-normal, with-shared, without-debug produce the shared lib,
not static and debug libs
ifeq "$(STAGE)" "toolchain"
# don't update host ld.so.cache when ldconfig run
cd $(DIR_APP) && LDCONFIG="/sbin/ldconfig -n /tools_$(MACHINE)/lib"
\
./configure --prefix=/$(TOOLS_DIR)
\
--with-shared \
+ --without-normal \
--without-debug \
--without-manpages \
--without-ada \
@@ -97,29 +100,29 @@
ifeq "$(STAGE)" "base"
cd $(DIR_APP) && ./configure --prefix=/usr \
+ --enable-warnings \
--with-shared \
+ --without-normal \
--without-debug \
--without-manpages \
- --without-ada \
--enable-widec
cd $(DIR_APP) && make -j $(PARALLELISM)
cd $(DIR_APP) && make install
- chmod -v 644 /usr/lib/libncurses++w.a
- mv -v /usr/lib/libncursesw.so.5* /lib
- ln -sfv ../../lib/libncursesw.so.5 /usr/lib/libncursesw.so
+
+ mv /usr/lib/libncursesw.so.5* /lib
+ ln -sf ../../lib/libncursesw.so.5 /usr/lib/libncursesw.so
+ # Help find the wide version for program that only look at the non-wide
for lib in curses ncurses form panel menu ; do \
- rm -vf /usr/lib/lib$${lib}.so ; \
+ rm -f /usr/lib/lib$${lib}.so ; \
echo "INPUT(-l$${lib}w)" > /usr/lib/lib$${lib}.so ; \
- ln -sfv lib$${lib}w.a /usr/lib/lib$${lib}.a ; \
done
- ln -sfv libncurses++w.a /usr/lib/libncurses++.a
+ ln -sf /usr/bin/ncursesw5-config /usr/bin/ncurses5-config
# If any program is still using -lcurses, create the proper links to
fool it
echo "INPUT(-lncursesw)" > /usr/lib/libcursesw.so
ln -sfv libncurses.so /usr/lib/libcurses.so
- ln -sfv libncursesw.a /usr/lib/libcursesw.a
- ln -sfv libncurses.a /usr/lib/libcurses.a
+ # there is tests available but nothing to run from a script
endif
@rm -rf $(DIR_APP)
Modified: ipcop/trunk/updates/2.0.1/ROOTFILES.i486-2.0.1
===================================================================
--- ipcop/trunk/updates/2.0.1/ROOTFILES.i486-2.0.1 2011-10-26 22:58:14 UTC
(rev 6000)
+++ ipcop/trunk/updates/2.0.1/ROOTFILES.i486-2.0.1 2011-10-27 06:46:56 UTC
(rev 6001)
@@ -228,6 +228,11 @@
/usr/lib/librrd_th.so.4
/usr/lib/librrd_th.so.4.1.4
##
+## ncurses-5.9
+/lib/libncursesw.so.5
+/lib/libncursesw.so.5.9
+/usr/lib/libncursesw.so
+##
## ntp-4.2.6p4
/usr/bin/ntpd
/usr/bin/ntpdate
Modified: ipcop/trunk/updates/2.0.1/information.xml
===================================================================
--- ipcop/trunk/updates/2.0.1/information.xml 2011-10-26 22:58:14 UTC (rev
6000)
+++ ipcop/trunk/updates/2.0.1/information.xml 2011-10-27 06:46:56 UTC (rev
6001)
@@ -7,8 +7,8 @@
Add firewall logging to logsummary.<br />
Add 'classroom extension' to proxy.<br />
Upgrade acpid to 2.0.12, bind to 9.8.1, coreutils-8.14, dnsmasq to
2.59,
- iptables to 1.4.12.1, iw to 3.1, krb5 to 1.9.1, libpng to 1.5.5,
ntp to 4.2.6p4,
- module-init-tools to 3.16, openssh to 5.9, openssl to 1.0.0e,
openswan to 2.6.36,
+ iptables to 1.4.12.1, iw to 3.1, krb5 to 1.9.1, libpng to 1.5.5,
module-init-tools to 3.16,
+ ncurses to 5.9, ntp to 4.2.6p4,, openssh to 5.9, openssl to
1.0.0e, openswan to 2.6.36,
pciutils to 3.1.8, pixman to 0.22.2, smartmontools to 5.41, sqlite
to 3.7.8,
squid to 3.1.16, squid-langpack to 20110902, tzdata to 2011m,
usb-modeswitch to 1.2.0, usb-modeswitch-data to 20111023,
Modified: ipcop/trunk/updates/2.0.1/setup
===================================================================
--- ipcop/trunk/updates/2.0.1/setup 2011-10-26 22:58:14 UTC (rev 6000)
+++ ipcop/trunk/updates/2.0.1/setup 2011-10-27 06:46:56 UTC (rev 6001)
@@ -81,17 +81,18 @@
# Remove old libraries (version specific)
/bin/rm -f /usr/lib/libbind9.so.60.0.4
+/bin/rm -f /usr/lib/libcrypto.so.0.9.8
/bin/rm -f /usr/lib/libdns.so.69.1.3
+/bin/rm -f /usr/lib/libfreetype.so.6.7.1
/bin/rm -f /usr/lib/libisc.so.62.1.1
/bin/rm -f /usr/lib/libisccc.so.60.0.0
/bin/rm -f /usr/lib/libisccfg.so.62.0.0
/bin/rm -f /usr/lib/liblwres.so.60.0.1
-/bin/rm -f /usr/lib/libcrypto.so.0.9.8
-/bin/rm -f /usr/lib/libssl.so.0.9.8
+/bin/rm -f /lib/libncursesw.so.5.8
/bin/rm -f /usr/lib/libpci.so.3.1.8
/bin/rm -f /usr/lib/libpixman-1.so.0.20.2
/bin/rm -f /usr/lib/libpng15.so.15.4.0
-/bin/rm -f /usr/lib/libfreetype.so.6.7.1
+/bin/rm -f /usr/lib/libssl.so.0.9.8
# Remove dead symlink
/bin/rm -f /usr/lib/libpng14.so
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
The demand for IT networking professionals continues to grow, and the
demand for specialized networking skills is growing even more rapidly.
Take a complimentary Learning@Cisco Self-Assessment and learn
about Cisco certifications, training, and career opportunities.
http://p.sf.net/sfu/cisco-dev2dev
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
