diff options
Diffstat (limited to 'recipes-core/readline/readline-5.2/0001-Makefile.in-add-readline.pc.in.patch')
-rw-r--r-- | recipes-core/readline/readline-5.2/0001-Makefile.in-add-readline.pc.in.patch | 135 |
1 files changed, 135 insertions, 0 deletions
diff --git a/recipes-core/readline/readline-5.2/0001-Makefile.in-add-readline.pc.in.patch b/recipes-core/readline/readline-5.2/0001-Makefile.in-add-readline.pc.in.patch new file mode 100644 index 0000000..d9d36a0 --- /dev/null +++ b/recipes-core/readline/readline-5.2/0001-Makefile.in-add-readline.pc.in.patch | |||
@@ -0,0 +1,135 @@ | |||
1 | From 20141946db72908e23c11d946937e945fb7e527d Mon Sep 17 00:00:00 2001 | ||
2 | From: Chet Ramey <chet.ramey@case.edu> | ||
3 | Date: Mon, 11 Apr 2022 18:06:03 +0800 | ||
4 | Subject: [PATCH] Makefile.in: add readline.pc.in | ||
5 | |||
6 | Add config file for pkgconfig. | ||
7 | |||
8 | Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/readline.git/commit/?id=d49a9082c0e15bba8cd3d8cc0a994409cf823cac] | ||
9 | |||
10 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> | ||
11 | --- | ||
12 | MANIFEST | 1 + | ||
13 | Makefile.in | 26 ++++++++++++++++++++------ | ||
14 | configure.in | 11 ++++++++++- | ||
15 | 3 files changed, 31 insertions(+), 7 deletions(-) | ||
16 | |||
17 | diff --git a/MANIFEST b/MANIFEST | ||
18 | index b288fb6..f5b583b 100644 | ||
19 | --- a/MANIFEST | ||
20 | +++ b/MANIFEST | ||
21 | @@ -19,6 +19,7 @@ config.h.in f | ||
22 | configure f | ||
23 | configure.in f | ||
24 | Makefile.in f | ||
25 | +readline.pc.in f | ||
26 | ansi_stdlib.h f | ||
27 | chardefs.h f | ||
28 | history.h f | ||
29 | diff --git a/Makefile.in b/Makefile.in | ||
30 | index 87df428..e4233f7 100644 | ||
31 | --- a/Makefile.in | ||
32 | +++ b/Makefile.in | ||
33 | @@ -57,6 +57,7 @@ mandir = @mandir@ | ||
34 | includedir = @includedir@ | ||
35 | datadir = @datadir@ | ||
36 | localedir = $(datadir)/locale | ||
37 | +pkgconfigdir = ${libdir}/pkgconfig | ||
38 | |||
39 | infodir = @infodir@ | ||
40 | |||
41 | @@ -133,7 +134,7 @@ DOCUMENTATION = $(DOCSOURCE) $(DOCOBJECT) $(DOCSUPPORT) | ||
42 | |||
43 | CREATED_MAKEFILES = Makefile doc/Makefile examples/Makefile shlib/Makefile | ||
44 | CREATED_CONFIGURE = config.status config.h config.cache config.log \ | ||
45 | - stamp-config stamp-h | ||
46 | + stamp-config stamp-h readline.pc | ||
47 | CREATED_TAGS = TAGS tags | ||
48 | |||
49 | INSTALLED_HEADERS = readline.h chardefs.h keymaps.h history.h tilde.h \ | ||
50 | @@ -217,9 +218,18 @@ uninstall-headers: | ||
51 | |||
52 | maybe-uninstall-headers: uninstall-headers | ||
53 | |||
54 | +install-pc: installdirs | ||
55 | + -$(INSTALL_DATA) $(BUILD_DIR)/readline.pc $(DESTDIR)$(pkgconfigdir)/readline.pc | ||
56 | + | ||
57 | +uninstall-pc: | ||
58 | + -test -n "$(pkgconfigdir)" && cd $(DESTDIR)$(pkgconfigdir) && \ | ||
59 | + ${RM} readline.pc | ||
60 | + | ||
61 | +maybe-uninstall-pc: uninstall-pc | ||
62 | + | ||
63 | install: $(INSTALL_TARGETS) | ||
64 | |||
65 | -install-static: installdirs $(STATIC_LIBS) install-headers install-doc | ||
66 | +install-static: installdirs $(STATIC_LIBS) install-headers install-doc install-pc | ||
67 | -$(MV) $(DESTDIR)$(libdir)/libreadline.a $(DESTDIR)$(libdir)/libreadline.old | ||
68 | $(INSTALL_DATA) libreadline.a $(DESTDIR)$(libdir)/libreadline.a | ||
69 | -test -n "$(RANLIB)" && $(RANLIB) $(DESTDIR)$(libdir)/libreadline.a | ||
70 | @@ -230,17 +240,18 @@ install-static: installdirs $(STATIC_LIBS) install-headers install-doc | ||
71 | installdirs: $(srcdir)/support/mkinstalldirs | ||
72 | -$(SHELL) $(srcdir)/support/mkinstalldirs $(DESTDIR)$(includedir) \ | ||
73 | $(DESTDIR)$(includedir)/readline $(DESTDIR)$(libdir) \ | ||
74 | - $(DESTDIR)$(infodir) $(DESTDIR)$(man3dir) | ||
75 | + $(DESTDIR)$(infodir) $(DESTDIR)$(man3dir) \ | ||
76 | + $(DESTDIR)$(pkgconfigdir) | ||
77 | |||
78 | -uninstall: uninstall-headers uninstall-doc | ||
79 | +uninstall: uninstall-headers uninstall-doc uninstall-pc | ||
80 | -test -n "$(DESTDIR)$(libdir)" && cd $(DESTDIR)$(libdir) && \ | ||
81 | ${RM} libreadline.a libreadline.old libhistory.a libhistory.old $(SHARED_LIBS) | ||
82 | -( cd shlib; ${MAKE} ${MFLAGS} DESTDIR=${DESTDIR} uninstall ) | ||
83 | |||
84 | -install-shared: installdirs install-headers shared install-doc | ||
85 | +install-shared: installdirs install-headers shared install-doc install-pc | ||
86 | -( cd shlib ; ${MAKE} ${MFLAGS} DESTDIR=${DESTDIR} install ) | ||
87 | |||
88 | -uninstall-shared: maybe-uninstall-headers | ||
89 | +uninstall-shared: maybe-uninstall-headers maybe-uninstall-pc | ||
90 | -( cd shlib; ${MAKE} ${MFLAGS} DESTDIR=${DESTDIR} uninstall ) | ||
91 | |||
92 | install-doc: installdirs | ||
93 | @@ -281,6 +292,9 @@ distclean maintainer-clean: clean | ||
94 | $(RM) $(CREATED_CONFIGURE) | ||
95 | $(RM) $(CREATED_TAGS) | ||
96 | |||
97 | +readline.pc: config.status $(srcdir)/readline.pc.in | ||
98 | + $(SHELL) config.status | ||
99 | + | ||
100 | info dvi: | ||
101 | -( cd doc && $(MAKE) $(MFLAGS) $@ ) | ||
102 | |||
103 | diff --git a/configure.in b/configure.in | ||
104 | index 9d1f3fb..1186fc3 100644 | ||
105 | --- a/configure.in | ||
106 | +++ b/configure.in | ||
107 | @@ -191,6 +191,14 @@ if test "$TERMCAP_LIB" = "./lib/termcap/libtermcap.a"; then | ||
108 | fi | ||
109 | fi | ||
110 | |||
111 | +case "$TERMCAP_LIB" in | ||
112 | +-ltinfo) TERMCAP_PKG_CONFIG_LIB=tinfo ;; | ||
113 | +-lcurses) TERMCAP_PKG_CONFIG_LIB=ncurses ;; | ||
114 | +-lncurses) TERMCAP_PKG_CONFIG_LIB=ncurses ;; | ||
115 | +-ltermcap) TERMCAP_PKG_CONFIG_LIB=termcap ;; | ||
116 | +*) TERMCAP_PKG_CONFIG_LIB=termcap ;; | ||
117 | +esac | ||
118 | + | ||
119 | BASH_CHECK_MULTIBYTE | ||
120 | |||
121 | case "$host_cpu" in | ||
122 | @@ -288,8 +296,9 @@ AC_SUBST(host_os) | ||
123 | AC_SUBST(LIBVERSION) | ||
124 | |||
125 | AC_SUBST(TERMCAP_LIB) | ||
126 | +AC_SUBST(TERMCAP_PKG_CONFIG_LIB) | ||
127 | |||
128 | -AC_OUTPUT([Makefile doc/Makefile examples/Makefile shlib/Makefile], | ||
129 | +AC_OUTPUT([Makefile doc/Makefile examples/Makefile shlib/Makefile readline.pc], | ||
130 | [ | ||
131 | # Makefile uses this timestamp file to record whether config.h is up to date. | ||
132 | echo > stamp-h | ||
133 | -- | ||
134 | 2.25.1 | ||
135 | |||