commit: 7f9b24c6ef4e6bcaabd00e9bc58ff0d475aeff9a Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> AuthorDate: Wed Dec 23 09:35:10 2020 +0000 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> CommitDate: Wed Dec 23 09:35:10 2020 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=7f9b24c6
sys-libs/readline: drop ~ppc-aix Bug: https://bugs.gentoo.org/760057 Package-Manager: Portage-3.0.12-prefix, Repoman-3.0.2 Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> sys-libs/readline/Manifest | 1 - .../readline/files/readline-5.2-ia64hpux.patch | 14 - .../files/readline-5.2-rlfe-aix-eff_uid.patch | 25 - .../readline/files/readline-5.2-rlfe-hpux.patch | 11 - .../readline/files/readline-6.1-aix-expfull.patch | 26 - .../readline/files/readline-6.1-aix-soname.patch | 18 - sys-libs/readline/files/readline-6.3-interix.patch | 14 - sys-libs/readline/files/readline-7.0-libtool.patch | 745 --------------------- sys-libs/readline/readline-8.0_p4.ebuild | 49 +- sys-libs/readline/readline-8.1.ebuild | 43 +- 10 files changed, 12 insertions(+), 934 deletions(-) diff --git a/sys-libs/readline/Manifest b/sys-libs/readline/Manifest index 41c3e4de1e..db9715837e 100644 --- a/sys-libs/readline/Manifest +++ b/sys-libs/readline/Manifest @@ -1,4 +1,3 @@ -DIST host-libtool-0.1.0.tar.gz 388867 BLAKE2B e8bfd1212f39d6262721c4a12535799f4e3428b83f3174bac373c15813462950218dd689380ab8caaf84186b60c29a1fafadfa1c2d0e5cb7f76f6d1699bdcabc SHA512 d8764d7814abf06556fb6eb19c12c2de1d1dc9f2f325deae55606ddfcf88963d65713d6fbd1fae0ab1a0668d90f84204e1cdcbd557944660ab01ecfe3a824ca5 DIST readline-8.0.tar.gz 2975937 BLAKE2B 95e08b28cc46582f036379413810ca40c97d4d3bc59a9e03e04e57d531573abfbe955f6f1cb86e39c208bf6c3f4c618cff70a87bec596d0b9120909d6c5a2f69 SHA512 41759d27bc3a258fefd7f4ff3277fa6ab9c21abb7b160e1a75aa8eba547bd90b288514e76264bd94fb0172da8a4faa54aab2c07b68a0356918ecf7f1969e866f DIST readline-8.1.tar.gz 2993288 BLAKE2B f0feca1ea3517b2b613adacac8c997cce0e86aa2f410c82a40ce1a2e128067112b4c68dbf25b808291c28c47583345abac994ce10b8d117958afcb96ee5e7c69 SHA512 27790d0461da3093a7fee6e89a51dcab5dc61928ec42e9228ab36493b17220641d5e481ea3d8fee5ee0044c70bf960f55c7d3f1a704cf6b9c42e5c269b797e00 DIST readline80-001 927 BLAKE2B 95e3ac33ff4adb65813274864c17781056a8ea065f9a76571b4a6bcb2ebab090c3a021fa2b621832c11b5995e48a8a26dd6e3a8f5864a8e8b520bfcf85d7c4ab SHA512 a148cda6ac97935d51ede1bbacf847d7d2cba8861cf3941d32e3da2f45f16dcc05b20845b63d4264692520db8329e1236cf2bc4fd8ccbe6e40921bbbdeb2cb1c diff --git a/sys-libs/readline/files/readline-5.2-ia64hpux.patch b/sys-libs/readline/files/readline-5.2-ia64hpux.patch deleted file mode 100644 index 3c340e9f2b..0000000000 --- a/sys-libs/readline/files/readline-5.2-ia64hpux.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/support/shobj-conf 2008-02-06 09:37:12 +0100 -+++ b/support/shobj-conf 2008-02-06 09:38:30 +0100 -@@ -363,7 +363,10 @@ - SHOBJ_LDFLAGS='-shared -fpic -Wl,-b -Wl,+s -Wl,+h,$@' - - SHLIB_XLDFLAGS='-Wl,+b,$(libdir)' -- SHLIB_LIBSUFF='sl' -+ case ${host_cpu} in -+ ia64) SHLIB_LIBSUFF='so' ;; -+ *) SHLIB_LIBSUFF='sl' ;; -+ esac - SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)' - ;; - diff --git a/sys-libs/readline/files/readline-5.2-rlfe-aix-eff_uid.patch b/sys-libs/readline/files/readline-5.2-rlfe-aix-eff_uid.patch deleted file mode 100644 index cc6e730718..0000000000 --- a/sys-libs/readline/files/readline-5.2-rlfe-aix-eff_uid.patch +++ /dev/null @@ -1,25 +0,0 @@ -* Fabian Groffen - The AIX linker complains that eff_uid is undefined. I guess this is - right, as it is unknown where to export from. So instead of relying - on pure luck that it is defined in one of the includes, just use the - function that was made for this purpose of retrieving the value. - ---- a/examples/rlfe/pty.c -+++ b/examples/rlfe/pty.c -@@ -70,7 +70,7 @@ - # undef HAVE_SVR4_PTYS - #endif - --extern int eff_uid; -+static int eff_uid; - - /* used for opening a new pty-pair: */ - static char PtyName[32], TtyName[32]; -@@ -114,6 +114,7 @@ - initmaster(f) - int f; - { -+ eff_uid = getuid(); - #ifdef POSIX - tcflush(f, TCIOFLUSH); - #else diff --git a/sys-libs/readline/files/readline-5.2-rlfe-hpux.patch b/sys-libs/readline/files/readline-5.2-rlfe-hpux.patch deleted file mode 100644 index 2742b77217..0000000000 --- a/sys-libs/readline/files/readline-5.2-rlfe-hpux.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/examples/rlfe/os.h 2007-11-20 10:33:49 +0100 -+++ b/examples/rlfe/os.h 2007-11-20 10:36:25 +0100 -@@ -426,7 +426,7 @@ - #define SIGCHLD SIGCLD - #endif - --#if defined(POSIX) || defined(hpux) -+#if defined(POSIX) - # define signal xsignal - #else - # ifdef USESIGSET diff --git a/sys-libs/readline/files/readline-6.1-aix-expfull.patch b/sys-libs/readline/files/readline-6.1-aix-expfull.patch deleted file mode 100644 index eada6fa6a7..0000000000 --- a/sys-libs/readline/files/readline-6.1-aix-expfull.patch +++ /dev/null @@ -1,26 +0,0 @@ -Michael Haubenwallner: - -On AIX, -bexpall does not export symbols starting with '_', and we get -ld: 0711-317 ERROR: Undefined symbol: _rl_echoing_p -With -bexpfull, all symbols are exported. - ---- a/support/shobj-conf 2010-01-25 13:02:55 +0100 -+++ b/support/shobj-conf 2010-01-25 13:03:36 +0100 -@@ -265,7 +265,7 @@ - aix4.[2-9]*-*gcc*|aix[5-9].*-*gcc*) # lightly tested by [email protected] - SHOBJ_CFLAGS=-fpic - SHOBJ_LD='ld' -- SHOBJ_LDFLAGS='-bdynamic -bnoentry -bexpall' -+ SHOBJ_LDFLAGS='-bdynamic -bnoentry -bexpfull' - SHOBJ_XLDFLAGS='-G' - - SHLIB_XLDFLAGS='-bM:SRE' -@@ -276,7 +276,7 @@ - aix4.[2-9]*|aix[5-9].*) - SHOBJ_CFLAGS=-K - SHOBJ_LD='ld' -- SHOBJ_LDFLAGS='-bdynamic -bnoentry -bexpall' -+ SHOBJ_LDFLAGS='-bdynamic -bnoentry -bexpfull' - SHOBJ_XLDFLAGS='-G' - - SHLIB_XLDFLAGS='-bM:SRE' diff --git a/sys-libs/readline/files/readline-6.1-aix-soname.patch b/sys-libs/readline/files/readline-6.1-aix-soname.patch deleted file mode 100644 index 82fb050978..0000000000 --- a/sys-libs/readline/files/readline-6.1-aix-soname.patch +++ /dev/null @@ -1,18 +0,0 @@ -Michael Haubenwallner: - -With a little help from my friend, the native-cctools wrapping ld to support -'-soname' flag on AIX, we can provide full soname support there (#213277). -However, this patch is not for upstream, as they cannot rely on that ld wrapper: -They would have to do the aix-soname magic themself instead. - ---- a/support/shobj-conf 2011-02-08 11:53:20 +0100 -+++ b/support/shobj-conf 2011-02-08 11:57:14 +0100 -@@ -269,7 +269,7 @@ - SHOBJ_LDFLAGS='-bdynamic -bnoentry -bexpfull' - SHOBJ_XLDFLAGS='-G' - -- SHLIB_XLDFLAGS='-bM:SRE' -+ SHLIB_XLDFLAGS='-bM:SRE -soname `basename $@ $(SHLIB_MINOR)`' - SHLIB_LIBS='-lcurses -lc' - SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)' - ;; diff --git a/sys-libs/readline/files/readline-6.3-interix.patch b/sys-libs/readline/files/readline-6.3-interix.patch deleted file mode 100644 index 94c033e60d..0000000000 --- a/sys-libs/readline/files/readline-6.3-interix.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -urB readline-6.3.orig/examples/rlfe/rlfe.c readline-6.3/examples/rlfe/rlfe.c ---- readline-6.3.orig/examples/rlfe/rlfe.c 2014-11-27 07:37:41.225503671 -0200 -+++ readline-6.3/examples/rlfe/rlfe.c 2014-11-27 07:41:12.285503660 -0200 -@@ -79,6 +79,10 @@ - # include <sys/wait.h> - #endif - -+#ifdef __INTERIX -+# include <sys/select.h> -+#endif -+ - #ifdef READLINE_LIBRARY - # include "readline.h" - # include "history.h" diff --git a/sys-libs/readline/files/readline-7.0-libtool.patch b/sys-libs/readline/files/readline-7.0-libtool.patch deleted file mode 100644 index 5b436b4bdb..0000000000 --- a/sys-libs/readline/files/readline-7.0-libtool.patch +++ /dev/null @@ -1,745 +0,0 @@ -diff -ru readline-7.0.orig/examples/rlfe/Makefile.in readline-7.0/examples/rlfe/Makefile.in ---- readline-7.0.orig/examples/rlfe/Makefile.in 2009-02-22 23:27:18.000000000 +0000 -+++ readline-7.0/examples/rlfe/Makefile.in 2018-12-27 16:24:26.200061860 +0000 -@@ -49,7 +49,7 @@ - all: rlfe - - rlfe: $(OFILES) -- $(CC) $(LDFLAGS) -o $@ $(OFILES) $(LIBS) -+ $(LTLINK) $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(OFILES) $(LIBS) - - rlfe-$(VERSION).tar.gz: - tar czf $@ $(CFILES) $(HFILES) $(EXTRA_DIST) -diff -ru readline-7.0.orig/shlib/Makefile.in readline-7.0/shlib/Makefile.in ---- readline-7.0.orig/shlib/Makefile.in 2015-07-13 00:41:58.000000000 +0000 -+++ readline-7.0/shlib/Makefile.in 2018-12-27 16:25:28.204577868 +0000 -@@ -78,14 +78,14 @@ - # changes to [email protected]. - # - SHOBJ_CC = @SHOBJ_CC@ --SHOBJ_CFLAGS = @SHOBJ_CFLAGS@ --SHOBJ_LD = @SHOBJ_LD@ -+SHOBJ_CFLAGS_shared = @SHOBJ_CFLAGS@ -+SHOBJ_LD_shared = @SHOBJ_LD@ - --SHOBJ_LDFLAGS = @SHOBJ_LDFLAGS@ --SHOBJ_XLDFLAGS = @SHOBJ_XLDFLAGS@ -+SHOBJ_LDFLAGS_shared = @SHOBJ_LDFLAGS@ -+SHOBJ_XLDFLAGS_shared = @SHOBJ_XLDFLAGS@ - SHOBJ_LIBS = @SHOBJ_LIBS@ - --SHLIB_XLDFLAGS = @LDFLAGS@ @SHLIB_XLDFLAGS@ -+SHLIB_XLDFLAGS_shared = @SHLIB_XLDFLAGS@ - SHLIB_LIBS = @SHLIB_LIBS@ - - SHLIB_DOT = @SHLIB_DOT@ -@@ -95,7 +95,7 @@ - SHLIB_LIBVERSION = @SHLIB_LIBVERSION@ - SHLIB_DLLVERSION = @SHLIB_DLLVERSION@ - --SHLIB_STATUS = @SHLIB_STATUS@ -+SHLIB_STATUS_shared = @SHLIB_STATUS@ - - TERMCAP_LIB = @TERMCAP_LIB@ - -@@ -109,13 +109,52 @@ - - CCFLAGS = $(DEFS) $(LOCAL_DEFS) $(INCLUDES) $(CPPFLAGS) $(LOCAL_CFLAGS) $(CFLAGS) - --.SUFFIXES: .so -+SHARED_TARGET = @SHARED_TARGET@ # using libtool when empty -+ -+SHLIB_STATUS_ = libtool -+SHLIB_STATUS = $(SHLIB_STATUS_$(SHARED_TARGET)) -+ -+SO_shared = so -+SO_ = lo # use libtool when SHARED_TARGET is empty -+SO = $(SO_$(SHARED_TARGET)) -+ -+LIBTOOL_ = libtool -+LIBTOOL = $(LIBTOOL_$(SHARED_TARGET)) -+ -+LTTAG_CC_ = --tag=CC -+LTCLEAN_ = $(LIBTOOL) --mode=clean -+LTCOMPILE_ = $(LIBTOOL) --mode=compile -+LTINSTALL_ = $(LIBTOOL) --mode=install -+LTLINK_ = $(LIBTOOL) --mode=link -+LTUNINSTALL_ = $(LIBTOOL) --mode=uninstall -+ -+SHOBJ_CFLAGS_ = -+SHOBJ_LD_ = $(SHOBJ_CC) -+SHOBJ_LDFLAGS_ = -shared -version-info `echo $(SHLIB_MAJOR)$(SHLIB_MINOR) | sed -e 's/\./:/g'` -+SHLIB_XLDFLAGS_ = -no-undefined -rpath $(libdir) -+ -+LTTAG_CC = $(LTTAG_CC_$(SHARED_TARGET)) -+LTCLEAN = $(LTCLEAN_$(SHARED_TARGET)) -+LTCOMPILE = $(LTCOMPILE_$(SHARED_TARGET)) -+LTINSTALL = $(LTINSTALL_$(SHARED_TARGET)) -+LTLINK = $(LTLINK_$(SHARED_TARGET)) -+LTUNINSTALL = $(LTUNINSTALL_$(SHARED_TARGET)) -+ -+SHOBJ_CFLAGS = $(SHOBJ_CFLAGS_$(SHARED_TARGET)) -+SHOBJ_LD = $(SHOBJ_LD_$(SHARED_TARGET)) -+SHOBJ_LDFLAGS = $(SHOBJ_LDFLAGS_$(SHARED_TARGET)) -+SHLIB_XLDFLAGS = $(LDFLAGS) $(SHLIB_XLDFLAGS_$(SHARED_TARGET)) -+ -+.SUFFIXES: .so .lo - - .c.so: - ${RM} $@ - $(SHOBJ_CC) -c $(CCFLAGS) $(SHOBJ_CFLAGS) -o $*.o $< - $(MV) $*.o $@ - -+.c.lo: -+ $(LTCOMPILE) $(LTTAG_CC) $(SHOBJ_CC) -c $(CCFLAGS) $(SHOBJ_CFLAGS) -o $*.lo $< -+ - # The name of the main library target. - - SHARED_READLINE = $(SHLIB_LIBPREF)readline$(SHLIB_DOT)$(SHLIB_LIBVERSION) -@@ -147,16 +186,16 @@ - $(topdir)/rltypedefs.h $(topdir)/rlmbutil.h \ - $(topdir)/colors.h $(topdir)/parse-colors.h - --SHARED_HISTOBJ = history.so histexpand.so histfile.so histsearch.so shell.so \ -- mbutil.so --SHARED_TILDEOBJ = tilde.so --SHARED_COLORSOBJ = colors.so parse-colors.so --SHARED_OBJ = readline.so vi_mode.so funmap.so keymaps.so parens.so search.so \ -- rltty.so complete.so bind.so isearch.so display.so signals.so \ -- util.so kill.so undo.so macro.so input.so callback.so terminal.so \ -- text.so nls.so misc.so \ -+SHARED_HISTOBJ = history.$(SO) histexpand.$(SO) histfile.$(SO) histsearch.$(SO) shell.$(SO) \ -+ mbutil.$(SO) -+SHARED_TILDEOBJ = tilde.$(SO) -+SHARED_COLORSOBJ = colors.$(SO) parse-colors.$(SO) -+SHARED_OBJ = readline.$(SO) vi_mode.$(SO) funmap.$(SO) keymaps.$(SO) parens.$(SO) search.$(SO) \ -+ rltty.$(SO) complete.$(SO) bind.$(SO) isearch.$(SO) display.$(SO) signals.$(SO) \ -+ util.$(SO) kill.$(SO) undo.$(SO) macro.$(SO) input.$(SO) callback.$(SO) terminal.$(SO) \ -+ text.$(SO) nls.$(SO) misc.$(SO) \ - $(SHARED_HISTOBJ) $(SHARED_TILDEOBJ) $(SHARED_COLORSOBJ) \ -- xmalloc.so xfree.so compat.so -+ xmalloc.$(SO) xfree.$(SO) compat.$(SO) - - ########################################################################## - -@@ -164,6 +203,8 @@ - - supported: $(SHARED_LIBS) - -+libtool: libreadline.la libhistory.la -+ - unsupported: - @echo "Your system and compiler (${host_os}-${CC}) are not supported by the" - @echo "${topdir}/support/shobj-conf script." -@@ -172,13 +213,15 @@ - @echo "Please send the changes you made to [email protected]" - @echo "for inclusion in future bash and readline releases." - -+libreadline.la \ - $(SHARED_READLINE): $(SHARED_OBJ) -- $(RM) $@ -- $(SHOBJ_LD) ${SHOBJ_LDFLAGS} ${SHLIB_XLDFLAGS} -o $@ $(SHARED_OBJ) $(SHLIB_LIBS) -+ $(LTCLEAN) $(RM) $@ -+ $(LTLINK) $(LTTAG_CC) $(SHOBJ_LD) ${SHOBJ_LDFLAGS} ${SHLIB_XLDFLAGS} -o $@ $(SHARED_OBJ) $(SHLIB_LIBS) - --$(SHARED_HISTORY): $(SHARED_HISTOBJ) xmalloc.so xfree.so -- $(RM) $@ -- $(SHOBJ_LD) ${SHOBJ_LDFLAGS} ${SHLIB_XLDFLAGS} -o $@ $(SHARED_HISTOBJ) xmalloc.so xfree.so $(SHLIB_LIBS) -+libhistory.la \ -+$(SHARED_HISTORY): $(SHARED_HISTOBJ) xmalloc.$(SO) xfree.$(SO) -+ $(LTCLEAN) $(RM) $@ -+ $(LTLINK) $(LTTAG_CC) $(SHOBJ_LD) ${SHOBJ_LDFLAGS} ${SHLIB_XLDFLAGS} -o $@ $(SHARED_HISTOBJ) xmalloc.$(SO) xfree.$(SO) $(SHLIB_LIBS) - - # Since tilde.c is shared between readline and bash, make sure we compile - # it with the right flags when it's built as part of readline -@@ -187,6 +230,9 @@ - $(SHOBJ_CC) -c $(CCFLAGS) $(SHOBJ_CFLAGS) -DREADLINE_LIBRARY -c -o tilde.o $(topdir)/tilde.c - $(MV) tilde.o $@ - -+tilde.lo: tilde.c -+ $(LTCOMPILE) $(LTTAG_CC) $(SHOBJ_CC) -c $(CCFLAGS) $(SHOBJ_CFLAGS) -DREADLINE_LIBRARY -c -o tilde.lo $(topdir)/tilde.c -+ - installdirs: $(topdir)/support/mkdirs - -$(SHELL) $(topdir)/support/mkdirs $(DESTDIR)$(libdir) - -$(SHELL) $(topdir)/support/mkdirs $(DESTDIR)$(bindir) -@@ -196,6 +242,10 @@ - $(SHELL) $(topdir)/support/shlib-install -O $(host_os) -V $(host_vendor) -d $(DESTDIR)$(libdir) -b $(DESTDIR)$(bindir) -i "$(INSTALL_DATA)" $(SHARED_READLINE) - @echo install: you may need to run ldconfig - -+install-libtool: installdirs $(SHLIB_STATUS) -+ $(LTINSTALL) $(INSTALL_DATA) libhistory.la $(DESTDIR)$(libdir) -+ $(LTINSTALL) $(INSTALL_DATA) libreadline.la $(DESTDIR)$(libdir) -+ - install-unsupported: - @echo install: shared libraries not supported - -@@ -206,13 +256,17 @@ - $(SHELL) $(topdir)/support/shlib-install -O $(host_os) -V $(host_vendor) -d $(DESTDIR)$(libdir) -b $(DESTDIR)$(bindir) -U $(SHARED_READLINE) - @echo uninstall: you may need to run ldconfig - -+uninstall-libtool: -+ $(LTUNINSTALL) $(RM) $(DESTDIR)$(libdir)/libhistory.la -+ $(LTUNINSTALL) $(RM) $(DESTDIR)$(libdir)/libreadline.la -+ - uninstall-unsupported: - @echo uninstall: shared libraries not supported - - uninstall: uninstall-$(SHLIB_STATUS) - - clean mostlyclean: force -- $(RM) $(SHARED_OBJ) $(SHARED_LIBS) -+ $(LTCLEAN) $(RM) $(SHARED_OBJ) $(SHARED_LIBS) libreadline.la libhistory.la - - distclean maintainer-clean: clean - $(RM) Makefile -@@ -224,278 +278,278 @@ - .NOEXPORT: - - # Dependencies --bind.so: $(topdir)/ansi_stdlib.h $(topdir)/posixstat.h --bind.so: $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h --bind.so: $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h --bind.so: $(topdir)/rltypedefs.h --bind.so: $(topdir)/tilde.h $(topdir)/history.h --compat.so: ${BUILD_DIR}/config.h --compat.so: $(topdir)/rlstdc.h $(topdir)/rltypedefs.h --callback.so: $(topdir)/rlconf.h --callback.so: $(topdir)/rldefs.h ${BUILD_DIR}/config.h --callback.so: $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h --callback.so: $(topdir)/rltypedefs.h --callback.so: $(topdir)/tilde.h --complete.so: $(topdir)/ansi_stdlib.h $(topdir)/posixdir.h $(topdir)/posixstat.h --complete.so: $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h --complete.so: $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h --complete.so: $(topdir)/rltypedefs.h --complete.so: $(topdir)/tilde.h --display.so: $(topdir)/ansi_stdlib.h $(topdir)/posixstat.h --display.so: $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h --display.so: $(topdir)/tcap.h --display.so: $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h --display.so: $(topdir)/rltypedefs.h --display.so: $(topdir)/tilde.h $(topdir)/history.h --funmap.so: $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h --funmap.so: $(topdir)/rltypedefs.h --funmap.so: $(topdir)/rlconf.h $(topdir)/ansi_stdlib.h --funmap.so: ${BUILD_DIR}/config.h $(topdir)/tilde.h --histexpand.so: $(topdir)/ansi_stdlib.h --histexpand.so: $(topdir)/history.h $(topdir)/histlib.h $(topdir)/rltypedefs.h --histexpand.so: ${BUILD_DIR}/config.h --histfile.so: $(topdir)/ansi_stdlib.h --histfile.so: $(topdir)/history.h $(topdir)/histlib.h $(topdir)/rltypedefs.h --histfile.so: ${BUILD_DIR}/config.h --history.so: $(topdir)/ansi_stdlib.h --history.so: $(topdir)/history.h $(topdir)/histlib.h $(topdir)/rltypedefs.h --history.so: ${BUILD_DIR}/config.h --histsearch.so: $(topdir)/ansi_stdlib.h --histsearch.so: $(topdir)/history.h $(topdir)/histlib.h $(topdir)/rltypedefs.h --histsearch.so: ${BUILD_DIR}/config.h --input.so: $(topdir)/ansi_stdlib.h --input.so: $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h --input.so: $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h --input.so: $(topdir)/rltypedefs.h --input.so: $(topdir)/tilde.h --isearch.so: $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h --isearch.so: $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h --isearch.so: $(topdir)/rltypedefs.h --isearch.so: $(topdir)/ansi_stdlib.h $(topdir)/history.h $(topdir)/tilde.h --keymaps.so: $(topdir)/keymaps.h $(topdir)/chardefs.h $(topdir)/rlconf.h --keymaps.so: $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h --keymaps.so: $(topdir)/rltypedefs.h --keymaps.so: ${BUILD_DIR}/config.h $(topdir)/ansi_stdlib.h $(topdir)/tilde.h --kill.so: $(topdir)/ansi_stdlib.h --kill.so: $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h --kill.so: $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h --kill.so: $(topdir)/tilde.h $(topdir)/history.h $(topdir)/rltypedefs.h --macro.so: $(topdir)/ansi_stdlib.h --macro.so: $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h --macro.so: $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h --macro.so: $(topdir)/tilde.h $(topdir)/history.h $(topdir)/rltypedefs.h --mbutil.so: $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h --mbutil.so: $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/rltypedefs.h --mbutil.so: $(topdir)/chardefs.h $(topdir)/rlstdc.h --misc.so: $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h --misc.so: $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h --misc.so: $(topdir)/rltypedefs.h --misc.so: $(topdir)/history.h $(topdir)/tilde.h $(topdir)/ansi_stdlib.h --nls.so: $(topdir)/ansi_stdlib.h --nls.so: $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h -+bind$(SO): $(topdir)/ansi_stdlib.h $(topdir)/posixstat.h -+bind$(SO): $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h -+bind$(SO): $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h -+bind$(SO): $(topdir)/rltypedefs.h -+bind$(SO): $(topdir)/tilde.h $(topdir)/history.h -+compat$(SO): ${BUILD_DIR}/config.h -+compat$(SO): $(topdir)/rlstdc.h $(topdir)/rltypedefs.h -+callback$(SO): $(topdir)/rlconf.h -+callback$(SO): $(topdir)/rldefs.h ${BUILD_DIR}/config.h -+callback$(SO): $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h -+callback$(SO): $(topdir)/rltypedefs.h -+callback$(SO): $(topdir)/tilde.h -+complete$(SO): $(topdir)/ansi_stdlib.h $(topdir)/posixdir.h $(topdir)/posixstat.h -+complete$(SO): $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h -+complete$(SO): $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h -+complete$(SO): $(topdir)/rltypedefs.h -+complete$(SO): $(topdir)/tilde.h -+display$(SO): $(topdir)/ansi_stdlib.h $(topdir)/posixstat.h -+display$(SO): $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h -+display$(SO): $(topdir)/tcap.h -+display$(SO): $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h -+display$(SO): $(topdir)/rltypedefs.h -+display$(SO): $(topdir)/tilde.h $(topdir)/history.h -+funmap$(SO): $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h -+funmap$(SO): $(topdir)/rltypedefs.h -+funmap$(SO): $(topdir)/rlconf.h $(topdir)/ansi_stdlib.h -+funmap$(SO): ${BUILD_DIR}/config.h $(topdir)/tilde.h -+histexpand$(SO): $(topdir)/ansi_stdlib.h -+histexpand$(SO): $(topdir)/history.h $(topdir)/histlib.h $(topdir)/rltypedefs.h -+histexpand$(SO): ${BUILD_DIR}/config.h -+histfile$(SO): $(topdir)/ansi_stdlib.h -+histfile$(SO): $(topdir)/history.h $(topdir)/histlib.h $(topdir)/rltypedefs.h -+histfile$(SO): ${BUILD_DIR}/config.h -+history$(SO): $(topdir)/ansi_stdlib.h -+history$(SO): $(topdir)/history.h $(topdir)/histlib.h $(topdir)/rltypedefs.h -+history$(SO): ${BUILD_DIR}/config.h -+histsearch$(SO): $(topdir)/ansi_stdlib.h -+histsearch$(SO): $(topdir)/history.h $(topdir)/histlib.h $(topdir)/rltypedefs.h -+histsearch$(SO): ${BUILD_DIR}/config.h -+input$(SO): $(topdir)/ansi_stdlib.h -+input$(SO): $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h -+input$(SO): $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h -+input$(SO): $(topdir)/rltypedefs.h -+input$(SO): $(topdir)/tilde.h -+isearch$(SO): $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h -+isearch$(SO): $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h -+isearch$(SO): $(topdir)/rltypedefs.h -+isearch$(SO): $(topdir)/ansi_stdlib.h $(topdir)/history.h $(topdir)/tilde.h -+keymaps$(SO): $(topdir)/keymaps.h $(topdir)/chardefs.h $(topdir)/rlconf.h -+keymaps$(SO): $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h -+keymaps$(SO): $(topdir)/rltypedefs.h -+keymaps$(SO): ${BUILD_DIR}/config.h $(topdir)/ansi_stdlib.h $(topdir)/tilde.h -+kill$(SO): $(topdir)/ansi_stdlib.h -+kill$(SO): $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h -+kill$(SO): $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h -+kill$(SO): $(topdir)/tilde.h $(topdir)/history.h $(topdir)/rltypedefs.h -+macro$(SO): $(topdir)/ansi_stdlib.h -+macro$(SO): $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h -+macro$(SO): $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h -+macro$(SO): $(topdir)/tilde.h $(topdir)/history.h $(topdir)/rltypedefs.h -+mbutil$(SO): $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h -+mbutil$(SO): $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/rltypedefs.h -+mbutil$(SO): $(topdir)/chardefs.h $(topdir)/rlstdc.h -+misc$(SO): $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h -+misc$(SO): $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h -+misc$(SO): $(topdir)/rltypedefs.h -+misc$(SO): $(topdir)/history.h $(topdir)/tilde.h $(topdir)/ansi_stdlib.h -+nls$(SO): $(topdir)/ansi_stdlib.h -+nls$(SO): $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h - nls.o: $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h - nls.o: $(topdir)/rltypedefs.h - nls.o: $(topdir)/tilde.h $(topdir)/history.h $(topdir)/rlstdc.h --parens.so: $(topdir)/rlconf.h ${BUILD_DIR}/config.h --parens.so: $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h --parens.so: $(topdir)/rltypedefs.h --parens.so: $(topdir)/tilde.h --rltty.so: $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h --rltty.so: $(topdir)/rltty.h $(topdir)/tilde.h --rltty.so: $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h --rltty.so: $(topdir)/rltypedefs.h --savestring.so: ${BUILD_DIR}/config.h --search.so: $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h --search.so: $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h --search.so: $(topdir)/ansi_stdlib.h $(topdir)/history.h $(topdir)/tilde.h --search.so: $(topdir)/rltypedefs.h --signals.so: $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h --signals.so: $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h --signals.so: $(topdir)/history.h $(topdir)/tilde.h --signals.so: $(topdir)/rltypedefs.h --terminal.so: $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h --terminal.so: $(topdir)/tcap.h --terminal.so: $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h --terminal.so: $(topdir)/tilde.h $(topdir)/history.h --terminal.so: $(topdir)/rltypedefs.h --text.so: $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h --text.so: $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h --text.so: $(topdir)/rltypedefs.h --text.so: $(topdir)/history.h $(topdir)/tilde.h $(topdir)/ansi_stdlib.h --tilde.so: $(topdir)/ansi_stdlib.h ${BUILD_DIR}/config.h $(topdir)/tilde.h --undo.so: $(topdir)/ansi_stdlib.h --undo.so: $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h --undo.so: $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h --undo.so: $(topdir)/rltypedefs.h --undo.so: $(topdir)/tilde.h $(topdir)/history.h --util.so: $(topdir)/posixjmp.h $(topdir)/ansi_stdlib.h --util.so: $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h --util.so: $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h --util.so: $(topdir)/rltypedefs.h $(topdir)/tilde.h --vi_mode.so: $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h --vi_mode.so: $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h --vi_mode.so: $(topdir)/history.h $(topdir)/ansi_stdlib.h $(topdir)/tilde.h --vi_mode.so: $(topdir)/rltypedefs.h --xfree.so: ${BUILD_DIR}/config.h --xfree.so: $(topdir)/ansi_stdlib.h --xmalloc.so: ${BUILD_DIR}/config.h --xmalloc.so: $(topdir)/ansi_stdlib.h -- --bind.so: $(topdir)/rlshell.h --histfile.so: $(topdir)/rlshell.h --nls.so: $(topdir)/rlshell.h --readline.so: $(topdir)/rlshell.h --shell.so: $(topdir)/rlshell.h --terminal.so: $(topdir)/rlshell.h --histexpand.so: $(topdir)/rlshell.h -- --colors.so: $(BUILD_DIR)/config.h $(topdir)/colors.h --colors.so: $(topdir)/rlconf.h --colors.so: $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/rltypedefs.h --colors.so: $(topdir)/chardefs.h $(topdir)/tilde.h $(topdir)/rlstdc.h --colors.so: $(topdir)/ansi_stdlib.h $(topdir)/posixstat.h --parse-colors.so: $(BUILD_DIR)/config.h $(topdir)/colors.h $(topdir)/parse-colors.h --parse-colors.so: $(topdir)/rldefs.h $(topdir)/rlconf.h --parse-colors.so: $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/rltypedefs.h --parse-colors.so: $(topdir)/chardefs.h $(topdir)/tilde.h $(topdir)/rlstdc.h -- --bind.so: $(topdir)/rlprivate.h --callback.so: $(topdir)/rlprivate.h --complete.so: $(topdir)/rlprivate.h --display.so: $(topdir)/rlprivate.h --input.so: $(topdir)/rlprivate.h --isearch.so: $(topdir)/rlprivate.h --kill.so: $(topdir)/rlprivate.h --macro.so: $(topdir)/rlprivate.h --mbutil.so: $(topdir)/rlprivate.h --misc.so: $(topdir)/rlprivate.h --nls.so: $(topdir)/rlprivate.h --parens.so: $(topdir)/rlprivate.h --readline.so: $(topdir)/rlprivate.h --rltty.so: $(topdir)/rlprivate.h --search.so: $(topdir)/rlprivate.h --signals.so: $(topdir)/rlprivate.h --terminal.so: $(topdir)/rlprivate.h --text.so: $(topdir)/rlprivate.h --undo.so: $(topdir)/rlprivate.h --util.so: $(topdir)/rlprivate.h --vi_mode.so: $(topdir)/rlprivate.h --colors.so: $(topdir)/rlprivate.h --parse-colors.so: $(topdir)/rlprivate.h -- --bind.so: $(topdir)/xmalloc.h --callback.so: $(topdir)/xmalloc.h --complete.so: $(topdir)/xmalloc.h --display.so: $(topdir)/xmalloc.h --funmap.so: $(topdir)/xmalloc.h --histexpand.so: $(topdir)/xmalloc.h --histfile.so: $(topdir)/xmalloc.h --history.so: $(topdir)/xmalloc.h --input.so: $(topdir)/xmalloc.h --isearch.so: $(topdir)/xmalloc.h --keymaps.so: $(topdir)/xmalloc.h --kill.so: $(topdir)/xmalloc.h --macro.so: $(topdir)/xmalloc.h --mbutil.so: $(topdir)/xmalloc.h --misc.so: $(topdir)/xmalloc.h --readline.so: $(topdir)/xmalloc.h --savestring.so: $(topdir)/xmalloc.h --search.so: $(topdir)/xmalloc.h --shell.so: $(topdir)/xmalloc.h --terminal.so: $(topdir)/xmalloc.h --text.so: $(topdir)/xmalloc.h --tilde.so: $(topdir)/xmalloc.h --undo.so: $(topdir)/xmalloc.h --util.so: $(topdir)/xmalloc.h --vi_mode.so: $(topdir)/xmalloc.h --xfree.so: $(topdir)/xmalloc.h --xmalloc.so: $(topdir)/xmalloc.h --colors.so: $(topdir)/xmalloc.h --parse-colors.so: $(topdir)/xmalloc.h -- --complete.so: $(topdir)/rlmbutil.h --display.so: $(topdir)/rlmbutil.h --histexpand.so: $(topdir)/rlmbutil.h --input.so: $(topdir)/rlmbutil.h --isearch.so: $(topdir)/rlmbutil.h --mbutil.so: $(topdir)/rlmbutil.h --misc.so: $(topdir)/rlmbutil.h --readline.so: $(topdir)/rlmbutil.h --search.so: $(topdir)/rlmbutil.h --text.so: $(topdir)/rlmbutil.h --vi_mode.so: $(topdir)/rlmbutil.h --colors.so: $(topdir)/rlmbutil.h --parse-colors.so: $(topdir)/rlmbutil.h -- --bind.so: $(topdir)/bind.c --callback.so: $(topdir)/callback.c --compat.so: $(topdir)/compat.c --complete.so: $(topdir)/complete.c --display.so: $(topdir)/display.c --funmap.so: $(topdir)/funmap.c --input.so: $(topdir)/input.c --isearch.so: $(topdir)/isearch.c --keymaps.so: $(topdir)/keymaps.c $(topdir)/emacs_keymap.c $(topdir)/vi_keymap.c --kill.so: $(topdir)/kill.c --macro.so: $(topdir)/macro.c --mbutil.so: $(topdir)/mbutil.c --misc.so: $(topdir)/mbutil.c --nls.so: $(topdir)/nls.c --parens.so: $(topdir)/parens.c --readline.so: $(topdir)/readline.c --rltty.so: $(topdir)/rltty.c --savestring.so: $(topdir)/savestring.c --search.so: $(topdir)/search.c --shell.so: $(topdir)/shell.c --signals.so: $(topdir)/signals.c --terminal.so: $(topdir)/terminal.c --text.so: $(topdir)/text.c --tilde.so: $(topdir)/tilde.c --undo.so: $(topdir)/undo.c --util.so: $(topdir)/util.c --vi_mode.so: $(topdir)/vi_mode.c --xfree.so: $(topdir)/xfree.c --xmalloc.so: $(topdir)/xmalloc.c -- --histexpand.so: $(topdir)/histexpand.c --histfile.so: $(topdir)/histfile.c --history.so: $(topdir)/history.c --histsearch.so: $(topdir)/histsearch.c -- --bind.so: bind.c --callback.so: callback.c --comapt.so: compat.c --complete.so: complete.c --display.so: display.c --funmap.so: funmap.c --input.so: input.c --isearch.so: isearch.c --keymaps.so: keymaps.c emacs_keymap.c vi_keymap.c --kill.so: kill.c --macro.so: macro.c --mbutil.so: mbutil.c --misc.so: misc.c --nls.so: nls.c --parens.so: parens.c --readline.so: readline.c --rltty.so: rltty.c --savestring.so: savestring.c --search.so: search.c --signals.so: signals.c --shell.so: shell.c --terminal.so: terminal.c --text.so: text.c --tilde.so: tilde.c --undo.so: undo.c --util.so: util.c --vi_mode.so: vi_mode.c --xfree.so: xfree.c --xmalloc.so: xmalloc.c -- --colors.so: colors.c --parse-colors.so: parse-colors.c -- --histexpand.so: histexpand.c --histfile.so: histfile.c --history.so: history.c --histsearch.so: histsearch.c -+parens$(SO): $(topdir)/rlconf.h ${BUILD_DIR}/config.h -+parens$(SO): $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h -+parens$(SO): $(topdir)/rltypedefs.h -+parens$(SO): $(topdir)/tilde.h -+rltty$(SO): $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h -+rltty$(SO): $(topdir)/rltty.h $(topdir)/tilde.h -+rltty$(SO): $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h -+rltty$(SO): $(topdir)/rltypedefs.h -+savestring$(SO): ${BUILD_DIR}/config.h -+search$(SO): $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h -+search$(SO): $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h -+search$(SO): $(topdir)/ansi_stdlib.h $(topdir)/history.h $(topdir)/tilde.h -+search$(SO): $(topdir)/rltypedefs.h -+signals$(SO): $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h -+signals$(SO): $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h -+signals$(SO): $(topdir)/history.h $(topdir)/tilde.h -+signals$(SO): $(topdir)/rltypedefs.h -+terminal$(SO): $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h -+terminal$(SO): $(topdir)/tcap.h -+terminal$(SO): $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h -+terminal$(SO): $(topdir)/tilde.h $(topdir)/history.h -+terminal$(SO): $(topdir)/rltypedefs.h -+text$(SO): $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h -+text$(SO): $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h -+text$(SO): $(topdir)/rltypedefs.h -+text$(SO): $(topdir)/history.h $(topdir)/tilde.h $(topdir)/ansi_stdlib.h -+tilde$(SO): $(topdir)/ansi_stdlib.h ${BUILD_DIR}/config.h $(topdir)/tilde.h -+undo$(SO): $(topdir)/ansi_stdlib.h -+undo$(SO): $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h -+undo$(SO): $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h -+undo$(SO): $(topdir)/rltypedefs.h -+undo$(SO): $(topdir)/tilde.h $(topdir)/history.h -+util$(SO): $(topdir)/posixjmp.h $(topdir)/ansi_stdlib.h -+util$(SO): $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h -+util$(SO): $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h -+util$(SO): $(topdir)/rltypedefs.h $(topdir)/tilde.h -+vi_mode$(SO): $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h -+vi_mode$(SO): $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h -+vi_mode$(SO): $(topdir)/history.h $(topdir)/ansi_stdlib.h $(topdir)/tilde.h -+vi_mode$(SO): $(topdir)/rltypedefs.h -+xfree$(SO): ${BUILD_DIR}/config.h -+xfree$(SO): $(topdir)/ansi_stdlib.h -+xmalloc$(SO): ${BUILD_DIR}/config.h -+xmalloc$(SO): $(topdir)/ansi_stdlib.h -+ -+bind$(SO): $(topdir)/rlshell.h -+histfile$(SO): $(topdir)/rlshell.h -+nls$(SO): $(topdir)/rlshell.h -+readline$(SO): $(topdir)/rlshell.h -+shell$(SO): $(topdir)/rlshell.h -+terminal$(SO): $(topdir)/rlshell.h -+histexpand$(SO): $(topdir)/rlshell.h -+ -+colors$(SO): $(BUILD_DIR)/config.h $(topdir)/colors.h -+colors$(SO): $(topdir)/rlconf.h -+colors$(SO): $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/rltypedefs.h -+colors$(SO): $(topdir)/chardefs.h $(topdir)/tilde.h $(topdir)/rlstdc.h -+colors$(SO): $(topdir)/ansi_stdlib.h $(topdir)/posixstat.h -+parse-colors$(SO): $(BUILD_DIR)/config.h $(topdir)/colors.h $(topdir)/parse-colors.h -+parse-colors$(SO): $(topdir)/rldefs.h $(topdir)/rlconf.h -+parse-colors$(SO): $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/rltypedefs.h -+parse-colors$(SO): $(topdir)/chardefs.h $(topdir)/tilde.h $(topdir)/rlstdc.h -+ -+bind$(SO): $(topdir)/rlprivate.h -+callback$(SO): $(topdir)/rlprivate.h -+complete$(SO): $(topdir)/rlprivate.h -+display$(SO): $(topdir)/rlprivate.h -+input$(SO): $(topdir)/rlprivate.h -+isearch$(SO): $(topdir)/rlprivate.h -+kill$(SO): $(topdir)/rlprivate.h -+macro$(SO): $(topdir)/rlprivate.h -+mbutil$(SO): $(topdir)/rlprivate.h -+misc$(SO): $(topdir)/rlprivate.h -+nls$(SO): $(topdir)/rlprivate.h -+parens$(SO): $(topdir)/rlprivate.h -+readline$(SO): $(topdir)/rlprivate.h -+rltty$(SO): $(topdir)/rlprivate.h -+search$(SO): $(topdir)/rlprivate.h -+signals$(SO): $(topdir)/rlprivate.h -+terminal$(SO): $(topdir)/rlprivate.h -+text$(SO): $(topdir)/rlprivate.h -+undo$(SO): $(topdir)/rlprivate.h -+util$(SO): $(topdir)/rlprivate.h -+vi_mode$(SO): $(topdir)/rlprivate.h -+colors$(SO): $(topdir)/rlprivate.h -+parse-colors$(SO): $(topdir)/rlprivate.h -+ -+bind$(SO): $(topdir)/xmalloc.h -+callback$(SO): $(topdir)/xmalloc.h -+complete$(SO): $(topdir)/xmalloc.h -+display$(SO): $(topdir)/xmalloc.h -+funmap$(SO): $(topdir)/xmalloc.h -+histexpand$(SO): $(topdir)/xmalloc.h -+histfile$(SO): $(topdir)/xmalloc.h -+history$(SO): $(topdir)/xmalloc.h -+input$(SO): $(topdir)/xmalloc.h -+isearch$(SO): $(topdir)/xmalloc.h -+keymaps$(SO): $(topdir)/xmalloc.h -+kill$(SO): $(topdir)/xmalloc.h -+macro$(SO): $(topdir)/xmalloc.h -+mbutil$(SO): $(topdir)/xmalloc.h -+misc$(SO): $(topdir)/xmalloc.h -+readline$(SO): $(topdir)/xmalloc.h -+savestring$(SO): $(topdir)/xmalloc.h -+search$(SO): $(topdir)/xmalloc.h -+shell$(SO): $(topdir)/xmalloc.h -+terminal$(SO): $(topdir)/xmalloc.h -+text$(SO): $(topdir)/xmalloc.h -+tilde$(SO): $(topdir)/xmalloc.h -+undo$(SO): $(topdir)/xmalloc.h -+util$(SO): $(topdir)/xmalloc.h -+vi_mode$(SO): $(topdir)/xmalloc.h -+xfree$(SO): $(topdir)/xmalloc.h -+xmalloc$(SO): $(topdir)/xmalloc.h -+colors$(SO): $(topdir)/xmalloc.h -+parse-colors$(SO): $(topdir)/xmalloc.h -+ -+complete$(SO): $(topdir)/rlmbutil.h -+display$(SO): $(topdir)/rlmbutil.h -+histexpand$(SO): $(topdir)/rlmbutil.h -+input$(SO): $(topdir)/rlmbutil.h -+isearch$(SO): $(topdir)/rlmbutil.h -+mbutil$(SO): $(topdir)/rlmbutil.h -+misc$(SO): $(topdir)/rlmbutil.h -+readline$(SO): $(topdir)/rlmbutil.h -+search$(SO): $(topdir)/rlmbutil.h -+text$(SO): $(topdir)/rlmbutil.h -+vi_mode$(SO): $(topdir)/rlmbutil.h -+colors$(SO): $(topdir)/rlmbutil.h -+parse-colors$(SO): $(topdir)/rlmbutil.h -+ -+bind$(SO): $(topdir)/bind.c -+callback$(SO): $(topdir)/callback.c -+compat$(SO): $(topdir)/compat.c -+complete$(SO): $(topdir)/complete.c -+display$(SO): $(topdir)/display.c -+funmap$(SO): $(topdir)/funmap.c -+input$(SO): $(topdir)/input.c -+isearch$(SO): $(topdir)/isearch.c -+keymaps$(SO): $(topdir)/keymaps.c $(topdir)/emacs_keymap.c $(topdir)/vi_keymap.c -+kill$(SO): $(topdir)/kill.c -+macro$(SO): $(topdir)/macro.c -+mbutil$(SO): $(topdir)/mbutil.c -+misc$(SO): $(topdir)/mbutil.c -+nls$(SO): $(topdir)/nls.c -+parens$(SO): $(topdir)/parens.c -+readline$(SO): $(topdir)/readline.c -+rltty$(SO): $(topdir)/rltty.c -+savestring$(SO): $(topdir)/savestring.c -+search$(SO): $(topdir)/search.c -+shell$(SO): $(topdir)/shell.c -+signals$(SO): $(topdir)/signals.c -+terminal$(SO): $(topdir)/terminal.c -+text$(SO): $(topdir)/text.c -+tilde$(SO): $(topdir)/tilde.c -+undo$(SO): $(topdir)/undo.c -+util$(SO): $(topdir)/util.c -+vi_mode$(SO): $(topdir)/vi_mode.c -+xfree$(SO): $(topdir)/xfree.c -+xmalloc$(SO): $(topdir)/xmalloc.c -+ -+histexpand$(SO): $(topdir)/histexpand.c -+histfile$(SO): $(topdir)/histfile.c -+history$(SO): $(topdir)/history.c -+histsearch$(SO): $(topdir)/histsearch.c -+ -+bind$(SO): bind.c -+callback$(SO): callback.c -+comapt$(SO): compat.c -+complete$(SO): complete.c -+display$(SO): display.c -+funmap$(SO): funmap.c -+input$(SO): input.c -+isearch$(SO): isearch.c -+keymaps$(SO): keymaps.c emacs_keymap.c vi_keymap.c -+kill$(SO): kill.c -+macro$(SO): macro.c -+mbutil$(SO): mbutil.c -+misc$(SO): misc.c -+nls$(SO): nls.c -+parens$(SO): parens.c -+readline$(SO): readline.c -+rltty$(SO): rltty.c -+savestring$(SO): savestring.c -+search$(SO): search.c -+signals$(SO): signals.c -+shell$(SO): shell.c -+terminal$(SO): terminal.c -+text$(SO): text.c -+tilde$(SO): tilde.c -+undo$(SO): undo.c -+util$(SO): util.c -+vi_mode$(SO): vi_mode.c -+xfree$(SO): xfree.c -+xmalloc$(SO): xmalloc.c -+ -+colors$(SO): colors.c -+parse-colors$(SO): parse-colors.c -+ -+histexpand$(SO): histexpand.c -+histfile$(SO): histfile.c -+history$(SO): history.c -+histsearch$(SO): histsearch.c diff --git a/sys-libs/readline/readline-8.0_p4.ebuild b/sys-libs/readline/readline-8.0_p4.ebuild index 8b70359f32..1dca8248a0 100644 --- a/sys-libs/readline/readline-8.0_p4.ebuild +++ b/sys-libs/readline/readline-8.0_p4.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit flag-o-matic multilib-minimal preserve-libs toolchain-funcs usr-ldscript libtool +inherit flag-o-matic multilib-minimal preserve-libs toolchain-funcs usr-ldscript # Official patches # See ftp://ftp.cwru.edu/pub/bash/readline-7.0-patches/ @@ -39,15 +39,9 @@ case ${PV} in ;; esac -HOSTLTV="0.1.0" -HOSTLT="host-libtool-${HOSTLTV}" -HOSTLT_URI="https://github.com/haubi/host-libtool/releases/download/v${HOSTLTV}/${HOSTLT}.tar.gz"; -SRC_URI+=" ${HOSTLT_URI}" -HOSTLT_S=${WORKDIR}/${HOSTLT} - LICENSE="GPL-3" SLOT="0/8" # subslot matches SONAME major -KEYWORDS="~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="static-libs +unicode utils" RDEPEND=">=sys-libs/ncurses-5.9-r3:0=[static-libs?,unicode?,${MULTILIB_USEDEP}]" @@ -64,27 +58,11 @@ PATCHES=( "${FILESDIR}"/${PN}-7.0-headers.patch "${FILESDIR}"/${PN}-8.0-headers.patch - "${FILESDIR}"/${PN}-5.2-rlfe-aix-eff_uid.patch - "${FILESDIR}"/${PN}-5.2-rlfe-hpux.patch - "${FILESDIR}"/${PN}-5.2-ia64hpux.patch "${FILESDIR}"/${PN}-6.0-mint.patch "${FILESDIR}"/${PN}-6.0-rlfe-solaris.patch - "${FILESDIR}"/${PN}-6.1-aix-soname.patch - "${FILESDIR}"/${PN}-6.1-aix-expfull.patch - "${FILESDIR}"/${PN}-6.3-interix.patch "${FILESDIR}"/${PN}-8.0-darwin-shlib-versioning.patch - - "${FILESDIR}"/${PN}-7.0-libtool.patch # this enables building via libtool ) -# Needed because we don't want the patches being unpacked -# (which emits annoying and useless error messages) -src_unpack() { - unpack ${HOSTLT}.tar.gz - S="${HOSTLT_S}" elibtoolize - unpack ${MY_P}.tar.gz -} - src_prepare() { [[ ${PLEVEL} -gt 0 ]] && eapply -p0 $(patches -s) default @@ -107,14 +85,6 @@ src_prepare() { } src_configure() { - mkdir -p "${WORKDIR}/${HOSTLT}-${ABI}" || die - cd "${WORKDIR}/${HOSTLT}-${ABI}" || die - ECONF_SOURCE="${HOSTLT_S}" econf $(use_enable static-libs static) - cd "${BUILD_DIR}" - - export PATH="${WORKDIR}/${HOSTLT}-${ABI}:${PATH}" - export ncurses_libs=$($(tc-getPKG_CONFIG) ncurses --libs) - # fix implicit decls with widechar funcs append-cppflags -D_GNU_SOURCE # https://lists.gnu.org/archive/html/bug-readline/2010-07/msg00013.html @@ -138,7 +108,6 @@ src_configure() { # This is for rlfe, but we need to make sure LDFLAGS doesn't change # so we can re-use the config cache file between the two. append-ldflags -L. - export LDFLAGS="-L${BUILD_DIR}/shlib ${LDFLAGS}" # search local dirs first multilib-minimal_src_configure } @@ -147,7 +116,7 @@ multilib_src_configure() { local myeconfargs=( --cache-file="${BUILD_DIR}"/config.cache --with-curses - --disable-shared # use libtool instead + $(use_enable static-libs static) ) ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" @@ -161,9 +130,7 @@ multilib_src_configure() { } multilib_src_compile() { - export PATH="${WORKDIR}/${HOSTLT}-${ABI}:${PATH}" - export ncurses_libs=$($(tc-getPKG_CONFIG) ncurses --libs) - emake shared + emake if use utils && multilib_is_native_abi && ! tc-is-cross-compiler ; then # code is full of AC_TRY_RUN() @@ -173,14 +140,12 @@ multilib_src_compile() { ln -s ../../shlib/lib${l}$(get_libname)* lib${l}$(get_libname) || die ln -s ../../lib${l}.a lib${l}.a || die done - emake LTLINK='libtool --mode=link --tag=CC' + emake fi } multilib_src_install() { - export PATH="${WORKDIR}/${HOSTLT}-${ABI}:${PATH}" - export ncurses_libs=$($(tc-getPKG_CONFIG) ncurses --libs) - emake DESTDIR="${D}" install-shared + default if multilib_is_native_abi ; then gen_usr_ldscript -a readline history #4411 @@ -196,8 +161,6 @@ multilib_src_install_all() { dodoc USAGE docinto ps dodoc doc/*.ps - - find "${D}" -name '*.la' -type f -delete || die } pkg_preinst() { # bug #29865 diff --git a/sys-libs/readline/readline-8.1.ebuild b/sys-libs/readline/readline-8.1.ebuild index 4a3b743d26..53aa5de3fd 100644 --- a/sys-libs/readline/readline-8.1.ebuild +++ b/sys-libs/readline/readline-8.1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit flag-o-matic multilib-minimal preserve-libs toolchain-funcs usr-ldscript libtool +inherit flag-o-matic multilib-minimal preserve-libs toolchain-funcs usr-ldscript # Official patches # See ftp://ftp.cwru.edu/pub/bash/readline-7.0-patches/ @@ -39,16 +39,10 @@ case ${PV} in ;; esac -HOSTLTV="0.1.0" -HOSTLT="host-libtool-${HOSTLTV}" -HOSTLT_URI="https://github.com/haubi/host-libtool/releases/download/v${HOSTLTV}/${HOSTLT}.tar.gz"; -SRC_URI+=" ${HOSTLT_URI}" -HOSTLT_S=${WORKDIR}/${HOSTLT} - LICENSE="GPL-3" SLOT="0/8" # subslot matches SONAME major [[ "${PV}" == *_rc* ]] || \ -KEYWORDS="~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="static-libs +unicode utils" RDEPEND=">=sys-libs/ncurses-5.9-r3:0=[static-libs?,unicode?,${MULTILIB_USEDEP}]" @@ -65,24 +59,14 @@ PATCHES=( "${FILESDIR}"/${PN}-7.0-headers.patch "${FILESDIR}"/${PN}-8.0-headers.patch - "${FILESDIR}"/${PN}-5.2-rlfe-aix-eff_uid.patch - "${FILESDIR}"/${PN}-5.2-rlfe-hpux.patch - "${FILESDIR}"/${PN}-5.2-ia64hpux.patch "${FILESDIR}"/${PN}-6.0-mint.patch "${FILESDIR}"/${PN}-6.0-rlfe-solaris.patch - "${FILESDIR}"/${PN}-6.1-aix-soname.patch - "${FILESDIR}"/${PN}-6.1-aix-expfull.patch - "${FILESDIR}"/${PN}-6.3-interix.patch "${FILESDIR}"/${PN}-8.0-darwin-shlib-versioning.patch - - "${FILESDIR}"/${PN}-7.0-libtool.patch # this enables building via libtool ) # Needed because we don't want the patches being unpacked # (which emits annoying and useless error messages) src_unpack() { - unpack ${HOSTLT}.tar.gz - S="${HOSTLT_S}" elibtoolize unpack ${MY_P}.tar.gz } @@ -108,14 +92,6 @@ src_prepare() { } src_configure() { - mkdir -p "${WORKDIR}/${HOSTLT}-${ABI}" || die - cd "${WORKDIR}/${HOSTLT}-${ABI}" || die - ECONF_SOURCE="${HOSTLT_S}" econf $(use_enable static-libs static) - cd "${BUILD_DIR}" - - export PATH="${WORKDIR}/${HOSTLT}-${ABI}:${PATH}" - export ncurses_libs=$($(tc-getPKG_CONFIG) ncurses --libs) - # fix implicit decls with widechar funcs append-cppflags -D_GNU_SOURCE # https://lists.gnu.org/archive/html/bug-readline/2010-07/msg00013.html @@ -139,7 +115,6 @@ src_configure() { # This is for rlfe, but we need to make sure LDFLAGS doesn't change # so we can re-use the config cache file between the two. append-ldflags -L. - export LDFLAGS="-L${BUILD_DIR}/shlib ${LDFLAGS}" # search local dirs first multilib-minimal_src_configure } @@ -148,7 +123,7 @@ multilib_src_configure() { local myeconfargs=( --cache-file="${BUILD_DIR}"/config.cache --with-curses - --disable-shared # use libtool instead + $(use_enable static-libs static) ) ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" @@ -162,9 +137,7 @@ multilib_src_configure() { } multilib_src_compile() { - export PATH="${WORKDIR}/${HOSTLT}-${ABI}:${PATH}" - export ncurses_libs=$($(tc-getPKG_CONFIG) ncurses --libs) - emake shared + emake if use utils && multilib_is_native_abi && ! tc-is-cross-compiler ; then # code is full of AC_TRY_RUN() @@ -174,14 +147,12 @@ multilib_src_compile() { ln -s ../../shlib/lib${l}$(get_libname)* lib${l}$(get_libname) || die ln -s ../../lib${l}.a lib${l}.a || die done - emake LTLINK='libtool --mode=link --tag=CC' + emake fi } multilib_src_install() { - export PATH="${WORKDIR}/${HOSTLT}-${ABI}:${PATH}" - export ncurses_libs=$($(tc-getPKG_CONFIG) ncurses --libs) - emake DESTDIR="${D}" install-shared + default if multilib_is_native_abi ; then gen_usr_ldscript -a readline history #4411 @@ -197,8 +168,6 @@ multilib_src_install_all() { dodoc USAGE docinto ps dodoc doc/*.ps - - find "${D}" -name '*.la' -type f -delete || die } pkg_preinst() { # bug #29865
