details: https://anonhg.NetBSD.org/pkgsrc/rev/f1323e5336e2
branches: trunk
changeset: 382442:f1323e5336e2
user: wiz <wiz%pkgsrc.org@localhost>
date: Thu Jul 28 09:02:04 2022 +0000
description:
readline: add --tag=CC in our local libtool patches
diffstat:
devel/readline/distinfo | 6 +++---
devel/readline/patches/patch-ae | 8 ++++----
devel/readline/patches/patch-examples_Makefile.in | 6 +++---
3 files changed, 10 insertions(+), 10 deletions(-)
diffs (72 lines):
diff -r 7fe9fb6b202f -r f1323e5336e2 devel/readline/distinfo
--- a/devel/readline/distinfo Thu Jul 28 08:14:02 2022 +0000
+++ b/devel/readline/distinfo Thu Jul 28 09:02:04 2022 +0000
@@ -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
diff -r 7fe9fb6b202f -r f1323e5336e2 devel/readline/patches/patch-ae
--- a/devel/readline/patches/patch-ae Thu Jul 28 08:14:02 2022 +0000
+++ b/devel/readline/patches/patch-ae Thu Jul 28 09:02:04 2022 +0000
@@ -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 @@
+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 @@
+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 @@
+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}
diff -r 7fe9fb6b202f -r f1323e5336e2 devel/readline/patches/patch-examples_Makefile.in
--- a/devel/readline/patches/patch-examples_Makefile.in Thu Jul 28 08:14:02 2022 +0000
+++ b/devel/readline/patches/patch-examples_Makefile.in Thu Jul 28 09:02:04 2022 +0000
@@ -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 @@
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@