CVS commit: pkgsrc/devel/readline

["David A. Holland" <dholland%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   dholland
Date:           Sun Nov 20 01:14:21 UTC 2016

Modified Files:
        pkgsrc/devel/readline: Makefile distinfo
        pkgsrc/devel/readline/patches: patch-ae patch-examples_Makefile.in

Log Message:
Fix three different interacting build problems:
  (1) don't ignore errors when building the examples;
  (2) build the examples *after* the library build, not *during* the
      library build;
  (3) don't try to compile the examples with "libtool --mode=link cc -c"
      as that flies like a particularly wingless brick.

Closes PR 51502.


To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 pkgsrc/devel/readline/Makefile
cvs rdiff -u -r1.27 -r1.28 pkgsrc/devel/readline/distinfo
cvs rdiff -u -r1.17 -r1.18 pkgsrc/devel/readline/patches/patch-ae
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/devel/readline/patches/patch-examples_Makefile.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/readline/Makefile
diff -u pkgsrc/devel/readline/Makefile:1.63 pkgsrc/devel/readline/Makefile:1.64
--- pkgsrc/devel/readline/Makefile:1.63 Mon Sep 19 09:04:29 2016
+++ pkgsrc/devel/readline/Makefile      Sun Nov 20 01:14:21 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2016/09/19 09:04:29 wiz Exp $
+# $NetBSD: Makefile,v 1.64 2016/11/20 01:14:21 dholland Exp $
 
 READLINE_VERSION=      7.0
 
@@ -21,7 +21,7 @@ INFO_FILES=           yes
 CONFIGURE_ENV.NetBSD+= bash_cv_wcwidth_broken=no
 .endif
 
-BUILD_TARGET=          all-libtool examples
+BUILD_TARGET=          everything-libtool
 INSTALL_TARGET=                install-libtool
 
 .include "../../mk/termcap.buildlink3.mk"

Index: pkgsrc/devel/readline/distinfo
diff -u pkgsrc/devel/readline/distinfo:1.27 pkgsrc/devel/readline/distinfo:1.28
--- pkgsrc/devel/readline/distinfo:1.27 Mon Sep 19 09:04:29 2016
+++ pkgsrc/devel/readline/distinfo      Sun Nov 20 01:14:21 2016
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.27 2016/09/19 09:04:29 wiz Exp $
+$NetBSD: distinfo,v 1.28 2016/11/20 01:14:21 dholland Exp $
 
 SHA1 (readline-7.0.tar.gz) = d9095fa14a812495052357e1d678b3f2ac635463
 RMD160 (readline-7.0.tar.gz) = 745bfdddd989fe46c55eea1b41cae7848c3bf2e0
 SHA512 (readline-7.0.tar.gz) = 18243189d39bf0d4c8a76cddcce75243c1bae8824c686e9b6ba352667607e5b10c5feb79372a1093c1c388d821841670702e940df12eae94bcebdeed90047870
 Size (readline-7.0.tar.gz) = 2910016 bytes
-SHA1 (patch-ae) = 98ef48c55111de4a9cc9b19fb44b7d139f6de40f
+SHA1 (patch-ae) = d76f0887b2cbb2bb08c5a123397d05e0fbbe2acf
 SHA1 (patch-ag) = 3114e6959dfff3e2aae74c3df3ba4b0f692b79bb
 SHA1 (patch-ah) = d812ea068415939beb42c72dd9bed8d210db57d1
 SHA1 (patch-colors.c) = beb4cdb33e1b361804a7d8d3b36dbd137e7502fd
-SHA1 (patch-examples_Makefile.in) = f9fce95533ee578c5323d3dbf5eb95fa344dd4ef
+SHA1 (patch-examples_Makefile.in) = 406e208ca140cab4bd34a1aabe63e2c05dacc924

Index: pkgsrc/devel/readline/patches/patch-ae
diff -u pkgsrc/devel/readline/patches/patch-ae:1.17 pkgsrc/devel/readline/patches/patch-ae:1.18
--- pkgsrc/devel/readline/patches/patch-ae:1.17 Wed Mar 12 10:04:50 2014
+++ pkgsrc/devel/readline/patches/patch-ae      Sun Nov 20 01:14:21 2016
@@ -1,8 +1,12 @@
-$NetBSD: patch-ae,v 1.17 2014/03/12 10:04:50 wiz Exp $
+$NetBSD: patch-ae,v 1.18 2016/11/20 01:14:21 dholland Exp $
 
+Libtoolify.
 Pass -no-undefined to libtool for building shared library.
+Don't ignore failures during installation.
+Don't ignore failures building the examples.
+Fix race condition so the examples are built *after* the library.
 
---- Makefile.in.orig   2014-01-27 14:52:00.000000000 +0000
+--- Makefile.in.orig   2015-08-26 14:15:59.000000000 +0000
 +++ Makefile.in
 @@ -18,6 +18,9 @@
  RL_LIBRARY_VERSION = @LIBVERSION@
@@ -14,7 +18,7 @@ Pass -no-undefined to libtool for buildi
  PACKAGE = @PACKAGE_NAME@
  VERSION = @PACKAGE_VERSION@
  
-@@ -78,6 +81,7 @@ CTAGS = ctags -tw
+@@ -76,6 +79,7 @@ CTAGS = ctags -tw
  CFLAGS = @CFLAGS@
  LOCAL_CFLAGS = @LOCAL_CFLAGS@ -DRL_LIBRARY_VERSION='"$(RL_LIBRARY_VERSION)"'
  CPPFLAGS = @CPPFLAGS@
@@ -22,7 +26,7 @@ Pass -no-undefined to libtool for buildi
  
  DEFS = @DEFS@ @CROSS_COMPILE@
  LOCAL_DEFS = @LOCAL_DEFS@
-@@ -100,9 +104,15 @@ GCC_LINT_CFLAGS = $(XCCFLAGS) $(GCC_LINT
+@@ -98,9 +102,15 @@ GCC_LINT_CFLAGS = $(XCCFLAGS) $(GCC_LINT
        ${RM} $@
        $(CC) -c $(CCFLAGS) $<
  
@@ -38,16 +42,19 @@ Pass -no-undefined to libtool for buildi
  
  # The C code source files for this library.
  CSOURCES = $(srcdir)/readline.c $(srcdir)/funmap.c $(srcdir)/keymaps.c \
-@@ -160,6 +170,8 @@ INSTALL_TARGETS = @STATIC_INSTALL_TARGET
+@@ -157,8 +167,10 @@ TARGETS = @STATIC_TARGET@ @SHARED_TARGET
+ INSTALL_TARGETS = @STATIC_INSTALL_TARGET@ @SHARED_INSTALL_TARGET@
  
  all: $(TARGETS)
- 
 +all-libtool: $(LIBTOOL_LIBS)
-+
- everything: all examples
+ 
+-everything: all examples
++everything: all .WAIT examples
++everything-libtool: all-libtool .WAIT examples
  
  static: $(STATIC_LIBS)
-@@ -169,17 +181,33 @@ libreadline.a: $(OBJECTS)
+ 
+@@ -167,17 +179,33 @@ libreadline.a: $(OBJECTS)
        $(AR) $(ARFLAGS) $@ $(OBJECTS)
        -test -n "$(RANLIB)" && $(RANLIB) $@
  
@@ -81,7 +88,17 @@ Pass -no-undefined to libtool for buildi
  readline: $(OBJECTS) readline.h rldefs.h chardefs.h ./libreadline.a
        $(CC) $(CCFLAGS) -DREADLINE_LIBRARY -o $@ $(top_srcdir)/examples/rl.c ./libreadline.a ${TERMCAP_LIB}
  
-@@ -264,6 +292,12 @@ install-examples: installdirs install-he
+@@ -214,8 +242,7 @@ documentation: force
+       -( cd doc && $(MAKE) $(MFLAGS) )
+ 
+ examples: force
+-      -test -d examples || mkdir examples
+-      -(cd examples && ${MAKE} ${MFLAGS} all )
++      (cd examples && ${MAKE} ${MFLAGS} all )
+ 
+ force:
+ 
+@@ -262,6 +289,12 @@ install-examples: installdirs install-he
  uninstall-examples: maybe-uninstall-headers
        -( cd examples; ${MAKE} ${MFLAGS} DESTDIR=${DESTDIR} uninstall )
  

Index: pkgsrc/devel/readline/patches/patch-examples_Makefile.in
diff -u pkgsrc/devel/readline/patches/patch-examples_Makefile.in:1.3 pkgsrc/devel/readline/patches/patch-examples_Makefile.in:1.4
--- pkgsrc/devel/readline/patches/patch-examples_Makefile.in:1.3        Mon Sep 19 09:04:29 2016
+++ pkgsrc/devel/readline/patches/patch-examples_Makefile.in    Sun Nov 20 01:14:21 2016
@@ -1,19 +1,23 @@
-$NetBSD: patch-examples_Makefile.in,v 1.3 2016/09/19 09:04:29 wiz Exp $
+$NetBSD: patch-examples_Makefile.in,v 1.4 2016/11/20 01:14:21 dholland Exp $
 
 Patch to link correctly against libtool built libs.
 
+Note: to make the patch smaller this uses "CC" to link and "REALCC"
+to compile. There's only one compile line and many link lines.
+
 --- examples/Makefile.in.orig  2016-04-26 13:50:18.000000000 +0000
 +++ examples/Makefile.in
-@@ -46,7 +46,7 @@ OBJEXT = @OBJEXT@
+@@ -46,7 +46,8 @@ OBJEXT = @OBJEXT@
  DESTDIR =
  
  DEFS = @DEFS@
 -CC = @CC@
++REALCC = $(LIBTOOL) --mode=compile @CC@
 +CC = $(LIBTOOL) --mode=link @CC@
  CFLAGS = @CFLAGS@
  LOCAL_CFLAGS = @LOCAL_CFLAGS@ -DREADLINE_LIBRARY -DRL_LIBRARY_VERSION='"$(RL_LIBRARY_VERSION)"'
  CPPFLAGS = @CPPFLAGS@
-@@ -56,8 +56,8 @@ INCLUDES = -I$(srcdir) -I$(top_srcdir) -
+@@ -56,14 +57,14 @@ INCLUDES = -I$(srcdir) -I$(top_srcdir) -
  CCFLAGS  = $(DEFS) $(LOCAL_CFLAGS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
  LDFLAGS = -g -L.. @LDFLAGS@
  
@@ -24,3 +28,10 @@ Patch to link correctly against libtool 
  
  TERMCAP_LIB = @TERMCAP_LIB@
  
+ .c.o:
+       ${RM} $@
+-      $(CC) $(CCFLAGS) -c $<
++      $(REALCC) $(CCFLAGS) -c $<
+ 
+ SOURCES = excallback.c fileman.c histexamp.c manexamp.c rl-fgets.c rl.c \
+               rlbasic.c rlcat.c rlevent.c rlptytest.c rltest.c rlversion.c \