mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-09 18:45:54 +02:00
ncurses: update to 6.0 and rename 5.9 to ncurses-compat
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. Please ignore my first ncurses 6.0 patch. 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
committed by
Michael Tremer
Michael Tremer
parent
54ea98e318
commit
a420b3e7b9
File diff suppressed because it is too large
Load Diff
3610
config/rootfiles/common/ncurses-compat
Normal file
3610
config/rootfiles/common/ncurses-compat
Normal file
File diff suppressed because it is too large
Load Diff
68
lfs/ncurses
68
lfs/ncurses
@@ -1,7 +1,7 @@
|
||||
###############################################################################
|
||||
# #
|
||||
# IPFire.org - A linux based firewall #
|
||||
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
|
||||
# Copyright (C) 2016 IPFire Team <info@ipfire.org> #
|
||||
# #
|
||||
# This program is free software: you can redistribute it and/or modify #
|
||||
# it under the terms of the GNU General Public License as published by #
|
||||
@@ -24,7 +24,7 @@
|
||||
|
||||
include Config
|
||||
|
||||
VER = 5.9
|
||||
VER = 6.0
|
||||
|
||||
THISAPP = ncurses-$(VER)
|
||||
DL_FILE = $(THISAPP).tar.gz
|
||||
@@ -41,20 +41,6 @@ else
|
||||
PREFIX = /tools
|
||||
endif
|
||||
|
||||
EXTRA_CONFIG += \
|
||||
--prefix=$(PREFIX) \
|
||||
--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
|
||||
|
||||
###############################################################################
|
||||
# Top-level Rules
|
||||
###############################################################################
|
||||
@@ -63,7 +49,7 @@ objects = $(DL_FILE)
|
||||
|
||||
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
|
||||
|
||||
$(DL_FILE)_MD5 = 8cb9c412e5f2d96bc6f459aa8c6282a1
|
||||
$(DL_FILE)_MD5 = ee13d052e1ead260d7c28071f46eefb1
|
||||
|
||||
install : $(TARGET)
|
||||
|
||||
@@ -93,35 +79,31 @@ $(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
|
||||
cd $(DIR_APP) && ./configure \
|
||||
--prefix=$(PREFIX) \
|
||||
--enable-widec \
|
||||
--with-shared \
|
||||
--without-debug \
|
||||
--without-normal \
|
||||
--enable-pc-files \
|
||||
--disable-nls \
|
||||
--mandir=/usr/share/man
|
||||
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)
|
||||
|
||||
127
lfs/ncurses-compat
Normal file
127
lfs/ncurses-compat
Normal file
@@ -0,0 +1,127 @@
|
||||
###############################################################################
|
||||
# #
|
||||
# IPFire.org - A linux based firewall #
|
||||
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
|
||||
# #
|
||||
# This program is free software: you can redistribute it and/or modify #
|
||||
# it under the terms of the GNU General Public License as published by #
|
||||
# the Free Software Foundation, either version 3 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 General Public License for more details. #
|
||||
# #
|
||||
# You should have received a copy of the GNU General Public License #
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>. #
|
||||
# #
|
||||
###############################################################################
|
||||
|
||||
###############################################################################
|
||||
# Definitions
|
||||
###############################################################################
|
||||
|
||||
include Config
|
||||
|
||||
VER = 5.9
|
||||
|
||||
THISAPP = ncurses-$(VER)
|
||||
DL_FILE = $(THISAPP).tar.gz
|
||||
DL_FROM = $(URL_IPFIRE)
|
||||
DIR_APP = $(DIR_SRC)/$(THISAPP)
|
||||
|
||||
# Normal build or /tools build.
|
||||
#
|
||||
ifeq "$(ROOT)" ""
|
||||
TARGET = $(DIR_INFO)/$(THISAPP)
|
||||
PREFIX = /usr
|
||||
else
|
||||
TARGET = $(DIR_INFO)/$(THISAPP)-tools
|
||||
PREFIX = /tools
|
||||
endif
|
||||
|
||||
EXTRA_CONFIG += \
|
||||
--prefix=$(PREFIX) \
|
||||
--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
|
||||
|
||||
###############################################################################
|
||||
# Top-level Rules
|
||||
###############################################################################
|
||||
|
||||
objects = $(DL_FILE)
|
||||
|
||||
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
|
||||
|
||||
$(DL_FILE)_MD5 = 8cb9c412e5f2d96bc6f459aa8c6282a1
|
||||
|
||||
install : $(TARGET)
|
||||
|
||||
check : $(patsubst %,$(DIR_CHK)/%,$(objects))
|
||||
|
||||
download :$(patsubst %,$(DIR_DL)/%,$(objects))
|
||||
|
||||
md5 : $(subst %,%_MD5,$(objects))
|
||||
|
||||
###############################################################################
|
||||
# Downloading, checking, md5sum
|
||||
###############################################################################
|
||||
|
||||
$(patsubst %,$(DIR_CHK)/%,$(objects)) :
|
||||
@$(CHECK)
|
||||
|
||||
$(patsubst %,$(DIR_DL)/%,$(objects)) :
|
||||
@$(LOAD)
|
||||
|
||||
$(subst %,%_MD5,$(objects)) :
|
||||
@$(MD5)
|
||||
|
||||
###############################################################################
|
||||
# Installation Details
|
||||
###############################################################################
|
||||
|
||||
$(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
|
||||
|
||||
# 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; \
|
||||
done
|
||||
|
||||
rm -vf $(PREFIX)/lib/libcurses{,w}.so
|
||||
echo "INPUT(-lncurses)" > $(PREFIX)/lib/libcurses.so
|
||||
echo "INPUT(-lncursesw)" > $(PREFIX)/lib/libcursesw.so
|
||||
echo "INPUT(-ltinfo)" > $(PREFIX)/lib/libtermcap.so
|
||||
@rm -rf $(DIR_APP)
|
||||
@$(POSTBUILD)
|
||||
Reference in New Issue
Block a user