Finally fixed, forced compiling against libncurses

This commit is contained in:
2016-10-29 14:39:13 -05:00
parent f3f656f6a0
commit d3bfdc1510

View File

@@ -8,12 +8,12 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
DEPENDS = DEPENDS = glibc,ncurses
ARCH = x86_64 ARCH = x86_64
URL = http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html URL = http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html
DESC = The GNU Readline library provides a set of functions for use by \ 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. 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) ARCHIVE := $(PWD)/SRC/$(shell ls SRC|egrep '(bz2|gz|tar|xz)$$'|tail -1)
TYPE := $(shell file -ib $(ARCHIVE)|cut -d';' -f1|tr -d '\n') TYPE := $(shell file -ib $(ARCHIVE)|cut -d';' -f1|tr -d '\n')
@@ -51,7 +51,8 @@ $(SRCDIR)/configure: $(ARCHIVE)
@touch $(SRCDIR)/configure @touch $(SRCDIR)/configure
$(SRCDIR)/config.log: $(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; \ patch --verbose -Np0 -i $$patch; \
done done
@cd $(SRCDIR); \ @cd $(SRCDIR); \
@@ -63,8 +64,7 @@ $(SRCDIR)/config.log: $(SRCDIR)/configure
--target=x86_64-snap-linux-gnu --target=x86_64-snap-linux-gnu
$(SRCDIR)/shlib/libhistory.so.$(VERSION): $(SRCDIR)/config.log $(SRCDIR)/shlib/libhistory.so.$(VERSION): $(SRCDIR)/config.log
@cd $(SRCDIR); \ @cd $(SRCDIR) && make SHLIB_LIBS=-lncurses
$(MAKE)
$(ROOT): $(SRCDIR)/shlib/libhistory.so.$(VERSION) $(ROOT): $(SRCDIR)/shlib/libhistory.so.$(VERSION)
@if [ -d $(ROOT) ]; then \ @if [ -d $(ROOT) ]; then \
@@ -73,10 +73,16 @@ $(ROOT): $(SRCDIR)/shlib/libhistory.so.$(VERSION)
mkdir -v $(ROOT); \ mkdir -v $(ROOT); \
fi fi
@cd $(SRCDIR); \ @cd $(SRCDIR) && make install DESTDIR=$(ROOT) SHLIB_LIBS=-lncurses && \
$(MAKEINST) DESTDIR=$(ROOT) install -d -v -m 755 $(ROOT)/lib && \
mv -v $(ROOT)/usr/lib/lib{readline,history}.so.* $(ROOT)/lib && \
@$(SNAPHACKS) 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: clean:
@rm -rvf $(ROOT) \ @rm -rvf $(ROOT) \