X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fncurses;h=dd6e56f1ce776691fb3835ea36f3f6f87cc28a7f;hp=552a6fc34e371e9a35356bdfebd617070d538e85;hb=ec149ba0263b59880adf665d3d11d5d39fb1f796;hpb=bed16caeb9368c84d60d9b3f958d1328929f3bfc

diff --git a/lfs/ncurses b/lfs/ncurses
index 552a6fc34e..dd6e56f1ce 100644
--- a/lfs/ncurses
+++ b/lfs/ncurses
@@ -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
-
-	# 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; \
+	# 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
+
+	# 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)