webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-28 03:33:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

ncurses: update to 6.0 and rename 5.9 to ncurses-compat v3

Browse Source 
This patch updates the ncurses to 6.0. The old 5.9 are renamed to ncurses-compat.
The compat makes the old libs maintainable and the compat rootfile is cleaned up.
The 6.0 is build after 5.9 and all IPFire componentes will build with 6.0
In version 6 only the wide-character libraries are build. The are usable
in both multibyte and traditional 8-bit locales while normal libraries work
properly only in 8-bit locales. The toolchain is only bild with 6.0.

Signed-off-by: Marcel Lorenz <marcel.lorenz@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
Marcel Lorenz
2016-06-02 19:39:51 +02:00
committed by Michael Tremer
parent bed16caeb9
commit ec149ba026
5 changed files with 4721 additions and 943 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
lfs/ncurses
View File

@@ -24,7 +24,7 @@
include Config
VER = 5.9
VER = 6.0
THISAPP = ncurses-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -44,17 +44,13 @@ endif
EXTRA_CONFIG += \
--prefix=$(PREFIX) \
--enable-widec \
--with-shared \
--without-debug \
--without-ada \
--with-ospeed=unsigned \
--with-chtype=long \
--enable-hard-tabs \
--enable-xmc-glitch \
--enable-colorfgbg \
--enable-overwrite \
--with-termlib=tinfo \
--disable-nls
--without-normal \
--enable-pc-files \
--disable-nls \
--mandir=/usr/share/man
###############################################################################
# Top-level Rules
@@ -64,7 +60,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 8cb9c412e5f2d96bc6f459aa8c6282a1
$(DL_FILE)_MD5 = ee13d052e1ead260d7c28071f46eefb1
install : $(TARGET)
@@ -94,35 +90,27 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && mkdir -pv narrowc widec
# Don't install a static library
cd $(DIR_APP) && sed -i '/LIBTOOL_INSTALL/d' c++/Makefile.in
# Create pkgconfig dir in toolchain
ifneq "$(ROOT)" ""
mkdir -pv /tools/lib/pkgconfig/
endif
cd $(DIR_APP) && ./configure $(EXTRA_CONFIG)
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
# Build narrowc version.
cd $(DIR_APP)/narrowc && ln -svf ../configure .
cd $(DIR_APP)/narrowc && ./configure $(EXTRA_CONFIG) --with-ticlib
cd $(DIR_APP)/narrowc && make libs
cd $(DIR_APP)/narrowc && make -C progs
# Build widec version.
cd $(DIR_APP)/widec && ln -svf ../configure .
cd $(DIR_APP)/widec && ./configure $(EXTRA_CONFIG) \
--enable-widec --without-progs
cd $(DIR_APP)/widec && make libs
# Install everything.
cd $(DIR_APP) && make -C narrowc install.{libs,progs,data}
rm -vf $(PREFIX)/lib/libtinfo.*
cd $(DIR_APP) && make -C widec install.{libs,includes,man}
# don't require -ltinfo when linking with --no-add-needed
for l in $(PREFIX)/lib/libncurses{,w}.so; do \
soname=$$(basename $$(readlink $$l)); \
rm -f $$l; \
echo "INPUT($$soname -ltinfo)" > $$l; \
# allow the linker to find non-wide-character ncurses libraries
for lib in ncurses form panel menu; do \
rm -vf $(PREFIX)/lib/lib$${lib}.so; \
echo "INPUT(-l$${lib}w)" > $(PREFIX)/lib/lib$${lib}.so; \
ln -sfv $${lib}w.pc $(PREFIX)/lib/pkgconfig/$${lib}.pc; \
done
rm -vf $(PREFIX)/lib/libcurses{,w}.so
echo "INPUT(-lncurses)" > $(PREFIX)/lib/libcurses.so
# old applications that look for -lcurses at build time are still buildable
rm -vf /usr/lib/libcursesw.so
echo "INPUT(-lncursesw)" > $(PREFIX)/lib/libcursesw.so
echo "INPUT(-ltinfo)" > $(PREFIX)/lib/libtermcap.so
ln -sfv libncurses.so $(PREFIX)/lib/libcurses.so
@rm -rf $(DIR_APP)
@$(POSTBUILD)