To: vim_dev@googlegroups.com Subject: Patch 8.2.2432 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.2432 Problem: Libvterm tests are executed even when libtool doesn't work. Solution: Only run libvterm tests if /usr/bin/gcc exists. Files: src/Makefile *** ../vim-8.2.2431/src/Makefile 2020-12-03 21:24:04.089645975 +0100 --- src/Makefile 2021-01-30 20:28:32.411697049 +0100 *************** *** 2294,2302 **** # Run the libvterm tests. # This works only on GNU make, not on BSD make. test_libvterm: @if $(MAKE) --version 2>/dev/null | grep -qs "GNU Make"; then \ ! cd libvterm; $(MAKE) -f Makefile test CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"; \ fi # Run individual OLD style test. --- 2294,2305 ---- # Run the libvterm tests. # This works only on GNU make, not on BSD make. + # Libtool requires "gcc". test_libvterm: @if $(MAKE) --version 2>/dev/null | grep -qs "GNU Make"; then \ ! if test -x "/usr/bin/gcc"; then \ ! cd libvterm; $(MAKE) -f Makefile test CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"; \ ! fi \ fi # Run individual OLD style test. *** ../vim-8.2.2431/src/version.c 2021-01-30 19:33:29.790351321 +0100 --- src/version.c 2021-01-30 20:30:58.695284127 +0100 *************** *** 752,753 **** --- 752,755 ---- { /* Add new patch number below this line */ + /**/ + 2432, /**/ -- We're knights of the round table We dance whene'er we're able We do routines and chorus scenes With footwork impeccable. We dine well here in Camelot We eat ham and jam and spam a lot. "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///