X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fncurses;h=ba5afcefd04181916f76048b4958d405ce4be690;hp=3c7be4d0e85b3637949aec567eaf0273d7df2dde;hb=06fc6170a2b8827125977c2f4e9c6f94e7d93c0a;hpb=9572596c47e961c6f4d970b4c4c72bd5f90920e0

diff --git a/lfs/ncurses b/lfs/ncurses
index 3c7be4d0e8..ba5afcefd0 100644
--- a/lfs/ncurses
+++ b/lfs/ncurses
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2018  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,30 +24,32 @@
 
 include Config
 
-VER        = 5.5
+VER        = 6.0
 
 THISAPP    = ncurses-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
-# Normal build or /tools build.
+# Normal build or $(TOOLS_DIR) build.
 #
 ifeq "$(ROOT)" ""
   TARGET = $(DIR_INFO)/$(THISAPP)
-  EXTRA_CONFIG = --prefix=/usr --with-shared \
-	--without-debug --enable-widec --disable-nls
-  EXTRA_MAKE =
-  EXTRA_INSTALL =
 else
   TARGET = $(DIR_INFO)/$(THISAPP)-tools
-  EXTRA_CONFIG = --prefix=/tools --with-shared \
-    --without-debug --without-ada --enable-overwrite \
-    --disable-nls
-  EXTRA_MAKE = 
-  EXTRA_INSTALL = 
+  EXTRA_CONFIG = --build=$(BUILDTARGET)
 endif
 
+EXTRA_CONFIG += \
+	--prefix=$(PREFIX) \
+	--enable-widec \
+	--with-shared \
+	--without-debug \
+	--without-normal \
+	--enable-pc-files \
+	--disable-nls \
+	--mandir=/usr/share/man
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -56,7 +58,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = e73c1ac10b4bfc46db43b2ddfd6244ef
+$(DL_FILE)_MD5 = ee13d052e1ead260d7c28071f46eefb1
 
 install : $(TARGET)
 
@@ -86,25 +88,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) && patch -Np1 -i $(DIR_SRC)/src/patches/ncurses-5.5-fixes-1.patch
-	cd $(DIR_APP) && ./configure $(EXTRA_CONFIG)
-	cd $(DIR_APP) && make $(EXTRA_MAKE)  #$(MAKETUNING) # Causes an error!
-	cd $(DIR_APP) && make $(EXTRA_INSTALL) install
-ifeq "$(ROOT)" ""
-	chmod -v 755 /usr/lib/*.5.5
-	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
-	cd $(DIR_APP) && for lib in curses ncurses form panel menu ; do \
-	    rm -vf /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++.a4
-	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
+	# 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_DIR)/lib/pkgconfig/
 endif
+	cd $(DIR_APP) && CPPFLAGS=-P ./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
+
+	# 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
+	ln -sfv libncurses.so      $(PREFIX)/lib/libcurses.so
+
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)