CVS commit: pkgsrc/devel/readline

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Jul 28 09:02:04 UTC 2022

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

Log Message:
readline: add --tag=CC in our local libtool patches


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 pkgsrc/devel/readline/distinfo
cvs rdiff -u -r1.20 -r1.21 pkgsrc/devel/readline/patches/patch-ae
cvs rdiff -u -r1.5 -r1.6 \
    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/distinfo
diff -u pkgsrc/devel/readline/distinfo:1.33 pkgsrc/devel/readline/distinfo:1.34
--- pkgsrc/devel/readline/distinfo:1.33 Sun Jan 16 22:52:06 2022
+++ pkgsrc/devel/readline/distinfo      Thu Jul 28 09:02:04 2022
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.33 2022/01/16 22:52:06 wiz Exp $
+$NetBSD: distinfo,v 1.34 2022/07/28 09:02:04 wiz Exp $
 
 BLAKE2s (readline-8.1.2.tar.gz) = d38b2a3fad298bcdbf309f322dae4cea26a3389084b4cad39b347e7ec0598d83
 SHA512 (readline-8.1.2.tar.gz) = b512275c8aa8b3b3178366c6d681f867676fc1c881e375134a88e9c860a448535e04ca43df727817fd0048261e48203e88bd1c086e86572022d1d65fb0350e4d
 Size (readline-8.1.2.tar.gz) = 2993073 bytes
-SHA1 (patch-ae) = bdd702b6cbc63cb1e4e6a4889717d7928acd9a01
+SHA1 (patch-ae) = 2ea71c7f8f82ed2dcda5e12d5508625f05eb754f
 SHA1 (patch-ag) = 3114e6959dfff3e2aae74c3df3ba4b0f692b79bb
 SHA1 (patch-ah) = d812ea068415939beb42c72dd9bed8d210db57d1
-SHA1 (patch-examples_Makefile.in) = c785adb3b59b7eabc2785c4951a3acdea3d8cff0
+SHA1 (patch-examples_Makefile.in) = 12bdbc3a0d1a116bed96c66ef4d25273b071fd3c

Index: pkgsrc/devel/readline/patches/patch-ae
diff -u pkgsrc/devel/readline/patches/patch-ae:1.20 pkgsrc/devel/readline/patches/patch-ae:1.21
--- pkgsrc/devel/readline/patches/patch-ae:1.20 Mon Jan  4 12:01:45 2021
+++ pkgsrc/devel/readline/patches/patch-ae      Thu Jul 28 09:02:04 2022
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.20 2021/01/04 12:01:45 wiz Exp $
+$NetBSD: patch-ae,v 1.21 2022/07/28 09:02:04 wiz Exp $
 
 Libtoolify.
 Pass -no-undefined to libtool for building shared library.
@@ -60,7 +60,7 @@ Fix race condition so the examples are b
  
 +libreadline.la: $(OBJECTS:.o=.lo)
 +      $(LIBTOOL) --mode=clean $(RM) $@
-+      $(LIBTOOL) --mode=link $(CC) -o $@ $(OBJECTS:.o=.lo) $(TERMCAP_LIB) \
++      $(LIBTOOL) --mode=link --tag=CC $(CC) -o $@ $(OBJECTS:.o=.lo) $(TERMCAP_LIB) \
 +              -rpath $(libdir) -version-info $(SHLIB_MAJOR):$(SHLIB_MINOR) \
 +              $(LDFLAGS)
 +
@@ -71,7 +71,7 @@ Fix race condition so the examples are b
  
 +libhistory.la: $(HISTOBJ:.o=.lo) xmalloc.lo xfree.lo
 +      $(LIBTOOL) --mode=clean $(RM) $@
-+      $(LIBTOOL) --mode=link $(CC) -o $@ $(HISTOBJ:.o=.lo) xmalloc.lo xfree.lo \
++      $(LIBTOOL) --mode=link --tag=CC $(CC) -o $@ $(HISTOBJ:.o=.lo) xmalloc.lo xfree.lo \
 +              -rpath $(libdir) -version-info $(SHLIB_MAJOR):$(SHLIB_MINOR) \
 +              $(LDFLAGS)
 +
@@ -83,7 +83,7 @@ Fix race condition so the examples are b
  
 +tilde.lo:     tilde.c
 +      $(LIBTOOL) --mode=clean rm -f $@
-+      $(LIBTOOL) --mode=compile $(CC) $(CCFLAGS) -DREADLINE_LIBRARY -c $(srcdir)/tilde.c
++      $(LIBTOOL) --mode=compile --tag=CC $(CC) $(CCFLAGS) -DREADLINE_LIBRARY -c $(srcdir)/tilde.c
 +
  readline: $(OBJECTS) readline.h rldefs.h chardefs.h ./libreadline.a
        $(CC) $(CCFLAGS) -DREADLINE_LIBRARY -o $@ $(top_srcdir)/examples/rl.c ./libreadline.a ${TERMCAP_LIB}

Index: pkgsrc/devel/readline/patches/patch-examples_Makefile.in
diff -u pkgsrc/devel/readline/patches/patch-examples_Makefile.in:1.5 pkgsrc/devel/readline/patches/patch-examples_Makefile.in:1.6
--- pkgsrc/devel/readline/patches/patch-examples_Makefile.in:1.5        Wed Feb 13 22:49:02 2019
+++ pkgsrc/devel/readline/patches/patch-examples_Makefile.in    Thu Jul 28 09:02:04 2022
@@ -1,4 +1,4 @@
-$NetBSD: patch-examples_Makefile.in,v 1.5 2019/02/13 22:49:02 wiz Exp $
+$NetBSD: patch-examples_Makefile.in,v 1.6 2022/07/28 09:02:04 wiz Exp $
 
 Patch to link correctly against libtool built libs.
 
@@ -12,8 +12,8 @@ to compile. There's only one compile lin
  
  DEFS = @DEFS@
 -CC = @CC@
-+REALCC = $(LIBTOOL) --mode=compile @CC@
-+CC = $(LIBTOOL) --mode=link @CC@
++REALCC = $(LIBTOOL) --mode=compile --tag=CC @CC@
++CC = $(LIBTOOL) --mode=link --tag=CC @CC@
  CFLAGS = @CFLAGS@
  LOCAL_CFLAGS = @LOCAL_CFLAGS@ -DREADLINE_LIBRARY -DRL_LIBRARY_VERSION='"$(RL_LIBRARY_VERSION)"'
  CPPFLAGS = @CPPFLAGS@