From d3bfdc151013e28d28405fa84b14ab3937264215 Mon Sep 17 00:00:00 2001 From: Jay Larson Date: Sat, 29 Oct 2016 14:39:13 -0500 Subject: [PATCH] Finally fixed, forced compiling against libncurses --- Makefile | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 62ee4fc..d78a535 100644 --- a/Makefile +++ b/Makefile @@ -8,12 +8,12 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -DEPENDS = +DEPENDS = glibc,ncurses ARCH = x86_64 URL = http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html DESC = The GNU Readline library provides a set of functions for use by \ applications that allow users to edit command lines as they are typed in. -SNAPVER = sr1 +SNAPVER = sr3 ARCHIVE := $(PWD)/SRC/$(shell ls SRC|egrep '(bz2|gz|tar|xz)$$'|tail -1) TYPE := $(shell file -ib $(ARCHIVE)|cut -d';' -f1|tr -d '\n') @@ -51,7 +51,8 @@ $(SRCDIR)/configure: $(ARCHIVE) @touch $(SRCDIR)/configure $(SRCDIR)/config.log: $(SRCDIR)/configure - @cd $(SRCDIR) && for patch in `find $(PATCHDIR) -name \*.patch`; do \ + @cd $(SRCDIR) && \ + for patch in `find $(PATCHDIR) -name \*.patch|sort`; do \ patch --verbose -Np0 -i $$patch; \ done @cd $(SRCDIR); \ @@ -63,8 +64,7 @@ $(SRCDIR)/config.log: $(SRCDIR)/configure --target=x86_64-snap-linux-gnu $(SRCDIR)/shlib/libhistory.so.$(VERSION): $(SRCDIR)/config.log - @cd $(SRCDIR); \ - $(MAKE) + @cd $(SRCDIR) && make SHLIB_LIBS=-lncurses $(ROOT): $(SRCDIR)/shlib/libhistory.so.$(VERSION) @if [ -d $(ROOT) ]; then \ @@ -73,10 +73,16 @@ $(ROOT): $(SRCDIR)/shlib/libhistory.so.$(VERSION) mkdir -v $(ROOT); \ fi - @cd $(SRCDIR); \ - $(MAKEINST) DESTDIR=$(ROOT) - - @$(SNAPHACKS) + @cd $(SRCDIR) && make install DESTDIR=$(ROOT) SHLIB_LIBS=-lncurses && \ + install -d -v -m 755 $(ROOT)/lib && \ + mv -v $(ROOT)/usr/lib/lib{readline,history}.so.* $(ROOT)/lib && \ + ln -sfv ../../lib/`readlink $(ROOT)/usr/lib/libreadline.so` \ + $(ROOT)/usr/lib/libreadline.so && \ + ln -sfv ../../lib/`readlink $(ROOT)/usr/lib/libhistory.so` \ + $(ROOT)/usr/lib/libhistory.so && \ + install -v -m 644 doc/*.{ps,pdf,html,dvi} \ + $(ROOT)/usr/share/doc/readline && \ + rm -v $(ROOT)/usr/share/info/dir clean: @rm -rvf $(ROOT) \