1 |
commit: 4b5bfb9347a3a9aeb556f2bc36d8a88e65b09132 |
2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Nov 27 09:57:47 2017 +0000 |
4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Nov 27 09:58:05 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=4b5bfb93 |
7 |
|
8 |
sys-libs/readline: sync |
9 |
|
10 |
Package-Manager: Portage-2.3.13-prefix, Repoman-2.3.4 |
11 |
|
12 |
sys-libs/readline/Manifest | 17 - |
13 |
.../readline/files/readline-5.1-rlfe-extern.patch | 17 - |
14 |
sys-libs/readline/files/readline-5.2-aixdll.patch | 121 ---- |
15 |
sys-libs/readline/files/readline-5.2-interix.patch | 46 -- |
16 |
sys-libs/readline/files/readline-5.2-mint.patch | 48 -- |
17 |
.../readline-5.2-no-ignore-shlib-errors.patch | 24 - |
18 |
.../readline/files/readline-5.2-solaris-fPIC.patch | 25 - |
19 |
.../readline-6.1-darwin-shlib-versioning.patch | 24 - |
20 |
sys-libs/readline/files/readline-6.2-libtool.patch | 686 --------------------- |
21 |
.../readline/files/readline-6.3-read-eof.patch | 54 ++ |
22 |
sys-libs/readline/readline-5.2_p14.ebuild | 76 --- |
23 |
sys-libs/readline/readline-6.2_p1-r1.ebuild | 136 ---- |
24 |
sys-libs/readline/readline-6.3_p8-r1.ebuild | 196 ------ |
25 |
...3_p8-r01.1.ebuild => readline-6.3_p8-r3.ebuild} | 86 +-- |
26 |
14 files changed, 100 insertions(+), 1456 deletions(-) |
27 |
|
28 |
diff --git a/sys-libs/readline/Manifest b/sys-libs/readline/Manifest |
29 |
index 27b74c2223..83956ce54b 100644 |
30 |
--- a/sys-libs/readline/Manifest |
31 |
+++ b/sys-libs/readline/Manifest |
32 |
@@ -1,22 +1,5 @@ |
33 |
DIST host-libtool-0.1.0.tar.gz 388867 SHA256 a32c9046e7f63b84ea41228ed54b17b98789ce129f7d02c215840dbecb15c8f5 SHA512 d8764d7814abf06556fb6eb19c12c2de1d1dc9f2f325deae55606ddfcf88963d65713d6fbd1fae0ab1a0668d90f84204e1cdcbd557944660ab01ecfe3a824ca5 WHIRLPOOL 5b002500155ad6d2400ba65950827db76f1c91ccc09f11fc726f71c23452d364d32229a6a92334ef3a77e72c53c353dee53b56601691868a3ab26adc0983c36b |
34 |
-DIST readline-5.2.tar.gz 2037705 SHA256 12e88d96aee2cd1192500356f0535540db499282ca7f76339fb4228c31249f45 SHA512 74318b32c56e888716bda2507228ecc374a24e85b2faeec4778227a9f04eb19de1fc8468c78746954c84f9e616a06dd0f8a4332ba4b438fefb7e222699baa379 WHIRLPOOL 8641abf42316ab278207c0a25d9155d4d4fddaf0e704255b40708875b9f31bd3e6caf903550783c15b160bd2b86ffc129b2eb7a1fb4a641d8d58edc3b53145c3 |
35 |
-DIST readline-6.2.tar.gz 2277926 SHA256 79a696070a058c233c72dd6ac697021cc64abd5ed51e59db867d66d196a89381 SHA512 fa5b4f1b6f81bc0b3be0739adb06dab0668603ff256fe62b59ebfe21d5a9e340a758a8eef569df8c4c4ecb86cdd9698a6dabc2ee8c70a769de2bd5930c32ff59 WHIRLPOOL 5d92645085f253206c16533e3cb35bb382d6fe616bf2144feb06f9ffb9b4d7cc25ceaa846b98f17aa442552a0e80642a62d57fe20982e0ed8fdefb75c2f9bbf0 |
36 |
DIST readline-6.3.tar.gz 2468560 SHA256 56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43 SHA512 f70efaf46d570b85c7637172b0ee2eb9a4aa73ba38a62bb45075e665929d9701b96fba0aea6c767fd9a2a0d39dfe8e70ab06da08f8524aee76a7c502f370a401 WHIRLPOOL 7c68627559890dbebf1394b911cfd4675ec8862b84d4e067a207dd37a0a94482c8d92216195df2873bcdf03a0a86150663a9604cd65a0d78363376bc8ee4cfda |
37 |
-DIST readline52-001 874 SHA256 eac304c369154059f93049ada328739faaf40338d3cb1fb4b544c93d5ce3f8d5 SHA512 65b92b5e03c20566eb3c7626e3ee9631e2b26932c34f2f95d88ae731df2805bcf63fc1215b97c97a2948e83b9373e3985ca1f64a598d84f1457bb33b605e5d9c WHIRLPOOL a11176d2bd2e02c5d81dc2791946251e89133d74d8621874db638a3854415e184934589b9c04d066035ca83f00b0de5e06876fddc7d6ca8e33203559b1eeda9c |
38 |
-DIST readline52-002 1433 SHA256 9deacaef25507a0c2ae0b661bf9342559b59a2954d66ea3c5f5bcd900fdfcf78 SHA512 9d5b5549c355e80608d76b532bdf358a4e26dac0b62f7c51055bb15ea831a74ad2ef25391ddc2b1615bff8974a2e89a8045567fb0c6d2726dde37aa02a0e6b31 WHIRLPOOL f45f3641984fbb519344f8be6cffb863ee9dd07dd4a59c83d8a722770e84d35be8722970e87afa47b7db6c568bf45cea8904136a92dcfab85e0c5f6b04591077 |
39 |
-DIST readline52-003 1204 SHA256 2a55d2ecb1c9b0147aeb193a6323616ab31c1c525a83b2db3a994b15594ba934 SHA512 7f1722adea9bb9a94277cfbc66d47f600654a0d43bce7def1405e1bb925e5fb324615dd588d1ff2555e6bdebbe3b4609237ba7f52d80689a45f80935e440a37c WHIRLPOOL ad2bf92f7bcdd50f1bf2cacf917339590a9614237712f55f6432f0f6b7354b1a4c336be7784689749809d91b8f9e1b8e518642d315f84ee2a2fb4ff3235d1ad9 |
40 |
-DIST readline52-004 2192 SHA256 a03b65633781efa7c3aae5d57162985e7b7a3c10acf0f2621be610e16f27e5f2 SHA512 e0c0f87ca14a3d473aa31627385f1cb9c2daaf685d8bc0c25bfb2214d5665077a74c4589e3ff5bbc6d0e8b5321ac7fe0c4f7620761d46bbdca787a751e6dbd02 WHIRLPOOL c4f95b2bdc4d2e87983f307d484276cac5e8cd1a14fdef316cba91f53e274a87928f5b7701e098d6d8e9e522320925b086786513f70599cc749dd010e27f9638 |
41 |
-DIST readline52-005 8029 SHA256 06001896514148a757ea6edbbd40c4fc4331dc653847244386c37b138b150f64 SHA512 bd7af4e71f1572811b37bccb68d5ebc20f2e7c21850d9ec55bc48fdf756f9ebaac888b0fc6d83b70e94e335056646e5021ec86b26100a976883ff72ee6d8d521 WHIRLPOOL 6fed5902600d880b181cde7962d0d8eb8f1552770cddf7e80fa2547da7f8f1b8da4dda06d1875510974c897136cfe36079c80aaa83ce81aafab5af39675f393b |
42 |
-DIST readline52-006 2820 SHA256 dfef3e982c0adf8bb5a9b7d0468ec8f5f18138b325e28759437464de5be71013 SHA512 3523800517b24fa512f3bc8750ecb83be73d57c7d48636ac3aa6b681ee185b6460ce8461a046734b64d78834f89d18d4c9c1de92d1eee94294eeae7e2911ce93 WHIRLPOOL b85c88d1bba3ac13d7379a6018d1d2a8c5fde78af37b28eeaf18e2ce3257e220b7ed36e106b649bd35f45b83703e7d5749a7ebe7e606857a8c774f4197a5f648 |
43 |
-DIST readline52-007 1523 SHA256 775b028c7b761397ac6ae1bdfbac7e896dc3b9b3adc2f91312499180ca13bdd1 SHA512 fe9471b237713ef7ce53fd0cf7bbb5a60720c64ec3df9dc58146d9c187511f0a6f480ae3f3b65168723e416ba4f08c67a2add0b01ede1149f72e7fc2ef21050f WHIRLPOOL 0a737ca595dcf8ce11f22e07b0927ba35f76981b7dcab38931536f38f9f94cf57882a555f3d0993b3b9d986156deaa8742db5ad50767beb7b68bda4cd067d3ba |
44 |
-DIST readline52-008 2277 SHA256 a21b4e0bf0530b878bad24d5be23d18a9e03a75a31ae30844dc0933bb3d77ecd SHA512 a864e970006146533dac885b00f53dcf1471f95d6143d8874fe8c8e056477d6c237cf2814625bf2031844285484757fa0ccf66d064ac2065ac62a21384d67c93 WHIRLPOOL 2ec34f16bb51f2def75d6ba70a99073a8164157000bc2cdd84590060e7192c7c5aaedb67a89fa8602b02c5db3636262f6bd6d49321ca1130b9571d6d5c6285b4 |
45 |
-DIST readline52-009 1332 SHA256 138d5e0f0709a47a2d1621295a3dd5e3cc73b63b5cc28dab03abc4e94fe95ecf SHA512 a19ca5b5875208f8ea4804461c1ba1b0e27feabb0a2a0db1fe9ea94b8d84e366e754688f5d8840f48c6bc22a02b0abcbaf35dd3361784b7db4e9e83629d840be WHIRLPOOL 707c8bbe7492f7744d43b8c90e4ae83a44fae0932bb7007725d6e75c0748cac4bb3a6b20823cb546760d1c0009c31ebaac6088e6e3a71b0ffc5bf8329538301f |
46 |
-DIST readline52-010 1543 SHA256 83f8c1aadb86b1a2fad8821a9c6be72a8de5afd7fd9fde58a30b3b57d939693e SHA512 851b7ee9fa3ab84e570723d445ade084fbb5af17fd4131520650f53000e93cb7c799c56cb00e8f906b230524b2fdda60970e72a44d1673d9bcd2c4de7ae400f8 WHIRLPOOL c491a42ac29463172c56408362ac3f3787b5f18e7050a72e73ed1191519c0093591b1ff095b8ec056af001016b47f654d4db46df86fd02b643b9ff3e8ee8ecee |
47 |
-DIST readline52-011 886 SHA256 08ad3384ab0906e6fa4cc417eb8c43ff59375bcead15fd5c8e31730f0413b3d6 SHA512 b4d813c3aa9c1f35962ea8ca6ad1abb34f4ed3ab91dd31eb1fc5e9b9e54da032e6fbfea583e472cc6d8c6baa4f2ad8f63efc22c749fd713e0704474aad74f0ae WHIRLPOOL 4d3b05ed68601a96d2046a917051f87263ee60b5a4f5e44211f8f6d4dd26cd55e88f119ef0fd1c92dace7de88e981155dbfc64e595f2d59d2af430585f70adad |
48 |
-DIST readline52-012 3870 SHA256 20f0243be2299c23213492cc2c19cfd15cc528d2b566a76a2de58306bb9e4c9e SHA512 2964c1c3a234223216ca3a099c42d8ee7de94fa7bee73ac346cc9991b9a11ad0406d3f9d785548f15170bf803714f4ffb0c2dfad19bb633358805c9b2e2873d3 WHIRLPOOL fa4bb64304b266dc24565ca4c5396aec8a5192998bb2322906be45e40389ef10141f0bdf243a33438384508d74387b4fb645b9189264742ae6a10e5600a57af3 |
49 |
-DIST readline52-013 5147 SHA256 0cc649516a5bdfa61c5e56937407570288b6972d75aa1bd060ad30ebe98144d5 SHA512 6c9addc3b130d5f034488cc9506f22bd183794fd1a8ac820c674b39761c8c47df1b69dc41c8be60054a068b2ae5fb63a76268b977ea07b33a8fcc4a829b55a8f WHIRLPOOL 17a956bb00d99819067f81dbe73ab1e573f0079b0c328ecede4082b98a03b20ff2d5629daf639abc1ff19b3b9d13e3c8d23a5bfa85b4712337611ef3a4d91aff |
50 |
-DIST readline52-014 1244 SHA256 6f1a68320d01522ca1ea5a737124ecc8739f3dcbfea2dee21e3ccf839a21a817 SHA512 d262861e67b79059de3967ba820ce02a7d28eff33175ecb30b748d24c08f3a151da3c53430fc2d26da5934f198075c55d2f616b93fabd297d60b9c82bae17cf0 WHIRLPOOL ff137bf6e56989e24a378dfc15c1831a7f0f458442781bffe07c429e04f21d674993ab523198341918a1cd540d2bd8806ec0c9283f879d7346f0c26b920eeca8 |
51 |
-DIST readline62-001 1388 SHA256 38a86c417437692db01069c8ab40a9a8f548e67ad9af0390221b024b1c39b4e3 SHA512 e505161a9ab28f6c1086a6a4ecc5a82da9001d79e4c2b7c44cd82e86dca90bc726ee2387a31e8b4c6893b240877a766fdd913ee7294389722214e6281c518478 WHIRLPOOL 28c63b09a62fa1b64902b04a3c5607da742f7f308648262736240138fa7c957f21856556c8dd2dc08749acf143c271907c69124a978191a5ddb21a6dcf9ee70a |
52 |
DIST readline63-001 1366 SHA256 1a79bbb6eaee750e0d6f7f3d059b30a45fc54e8e388a8e05e9c3ae598590146f SHA512 e70f89ca52a4eae7e1cddd70de6a7162252231ee029c89bb3fcb0f6c8c8b46c666be910c8b2eee72e96983ec2f1a23663694dc222f67228d82e8e4684f1504a2 WHIRLPOOL ed0b0ce066ab4764851d81e44d708cc9e2f3fe36ac4788243c81b3e25aa0995d054c1caf0a788c25969c7cdc6b2bad55a9c9c64286f485194b4e76bc453edf74 |
53 |
DIST readline63-002 1297 SHA256 39e304c7a526888f9e112e733848215736fb7b9d540729b9e31f3347b7a1e0a5 SHA512 4e23bd67433577e6e361d10a6c32768ea9e13b10e77493e565b870f56069b673fbcb0b860225f79fa9931845fc91d35c9a82c1385c23f8b757ebfd59f27851f4 WHIRLPOOL ca878e614ee233748f7017f5606fe2e96bb8374b33e4a571c5901594d7f329fd19b217abcf9cb844fa96374bff9e044712ed1017d6d99936f700da030202231d |
54 |
DIST readline63-003 985 SHA256 ec41bdd8b00fd884e847708513df41d51b1243cecb680189e31b7173d01ca52f SHA512 6bfb84a5b980091b995e2b96bdf5680f97fe670e6cac1b8606d2d75a1ef922ff5bd4e73f029f7af98a115006b7ab7828146f2cd6986287543d8a29987c91dc12 WHIRLPOOL 3615b462024e836f0854c2ffaf1282b42462a0da90c8ce248a47e9ea5a0ce00892135c1b725f9fb8ef1fafb1e88e02649c664373ba41683ca2457aafdd12ac93 |
55 |
|
56 |
diff --git a/sys-libs/readline/files/readline-5.1-rlfe-extern.patch b/sys-libs/readline/files/readline-5.1-rlfe-extern.patch |
57 |
deleted file mode 100644 |
58 |
index 3ec2cb36ac..0000000000 |
59 |
--- a/sys-libs/readline/files/readline-5.1-rlfe-extern.patch |
60 |
+++ /dev/null |
61 |
@@ -1,17 +0,0 @@ |
62 |
---- examples/rlfe/extern.h.orig 2006-09-28 11:33:35.372527000 +0200 |
63 |
-+++ examples/rlfe/extern.h 2006-09-28 11:39:01.460499000 +0200 |
64 |
-@@ -27,6 +27,14 @@ |
65 |
- #define __attribute__(x) |
66 |
- #endif |
67 |
- |
68 |
-+#ifndef __P |
69 |
-+# if defined(__STDC__) || defined(__cplusplus) |
70 |
-+# define __P(p) p |
71 |
-+# else |
72 |
-+# define __P |
73 |
-+# endif |
74 |
-+#endif /* __P */ |
75 |
-+ |
76 |
- /* pty.c */ |
77 |
- extern int OpenPTY __P((char **)); |
78 |
- extern void InitPTY __P((int)); |
79 |
|
80 |
diff --git a/sys-libs/readline/files/readline-5.2-aixdll.patch b/sys-libs/readline/files/readline-5.2-aixdll.patch |
81 |
deleted file mode 100644 |
82 |
index e7e819d7b8..0000000000 |
83 |
--- a/sys-libs/readline/files/readline-5.2-aixdll.patch |
84 |
+++ /dev/null |
85 |
@@ -1,121 +0,0 @@ |
86 |
-Switch creation of shared libraries on AIX to AIX native style, |
87 |
-where a shared object is packed into an archive library. |
88 |
-Additionally, create that shared objects using linker flag '-G' |
89 |
-as suggested in various AIX documentations. |
90 |
-But when doing so, there's no need for a static library in its common sense. |
91 |
-Instead, symlink the shlib/libX.a to static (top-level) build directory. |
92 |
-diff -ru readline-5.2.orig/configure.in readline-5.2/configure.in |
93 |
---- readline-5.2.orig/configure.in 2008-03-20 09:47:38.000000000 +0100 |
94 |
-+++ readline-5.2/configure.in 2008-03-20 09:47:48.000000000 +0100 |
95 |
-@@ -238,6 +238,9 @@ |
96 |
- if test "$SHLIB_STATUS" = 'unsupported'; then |
97 |
- opt_shared_libs=no |
98 |
- fi |
99 |
-+ if test "$opt_shared_libs" = yes -a "$SHLIB_STATUS" = 'aixdll'; then |
100 |
-+ opt_static_libs=no |
101 |
-+ fi |
102 |
- |
103 |
- # shared library versioning |
104 |
- # quoted for m4 so I can use character classes |
105 |
-diff -ru readline-5.2.orig/configure readline-5.2/configure |
106 |
---- readline-5.2.orig/configure 2008-03-20 09:47:38.000000000 +0100 |
107 |
-+++ readline-5.2/configure 2008-03-20 09:47:48.000000000 +0100 |
108 |
-@@ -8468,6 +8468,9 @@ |
109 |
- if test "$SHLIB_STATUS" = 'unsupported'; then |
110 |
- opt_shared_libs=no |
111 |
- fi |
112 |
-+ if test "$opt_shared_libs" = yes -a "$SHLIB_STATUS" = 'aixdll'; then |
113 |
-+ opt_static_libs=no |
114 |
-+ fi |
115 |
- |
116 |
- # shared library versioning |
117 |
- # quoted for m4 so I can use character classes |
118 |
-diff -ru readline-5.2.orig/shlib/Makefile.in readline-5.2/shlib/Makefile.in |
119 |
---- readline-5.2.orig/shlib/Makefile.in 2008-03-20 09:47:38.000000000 +0100 |
120 |
-+++ readline-5.2/shlib/Makefile.in 2008-03-20 09:47:48.000000000 +0100 |
121 |
-@@ -162,6 +162,15 @@ |
122 |
- @echo "Please send the changes you made to bash-maintainers@×××.org" |
123 |
- @echo "for inclusion in future bash and readline releases." |
124 |
- |
125 |
-+aixdll: libreadline.a libhistory.a |
126 |
-+libreadline.a: $(SHARED_READLINE) |
127 |
-+ $(AR) q $@ $? |
128 |
-+ ln -sf shlib/$@ ../$@ |
129 |
-+ |
130 |
-+libhistory.a: $(SHARED_HISTORY) |
131 |
-+ $(AR) q $@ $? |
132 |
-+ ln -sf shlib/$@ ../$@ |
133 |
-+ |
134 |
- $(SHARED_READLINE): $(SHARED_OBJ) |
135 |
- $(RM) $@ |
136 |
- $(SHOBJ_LD) ${SHOBJ_LDFLAGS} ${SHLIB_XLDFLAGS} -o $@ $(SHARED_OBJ) $(SHLIB_LIBS) |
137 |
-@@ -180,11 +189,19 @@ |
138 |
- installdirs: $(topdir)/support/mkdirs |
139 |
- -$(SHELL) $(topdir)/support/mkdirs $(DESTDIR)$(libdir) |
140 |
- |
141 |
--install: installdirs $(SHLIB_STATUS) |
142 |
-+install-supported: installdirs supported |
143 |
- $(SHELL) $(topdir)/support/shlib-install -O $(host_os) -d $(DESTDIR)$(libdir) -b $(DESTDIR)$(bindir) -i "$(INSTALL_DATA)" $(SHARED_HISTORY) |
144 |
- $(SHELL) $(topdir)/support/shlib-install -O $(host_os) -d $(DESTDIR)$(libdir) -b $(DESTDIR)$(bindir) -i "$(INSTALL_DATA)" $(SHARED_READLINE) |
145 |
- @echo install: you may need to run ldconfig |
146 |
- |
147 |
-+install-unsupported: unsupported |
148 |
-+ |
149 |
-+install-aixdll: installdirs aixdll |
150 |
-+ $(SHELL) $(topdir)/support/shlib-install -O $(host_os) -d $(DESTDIR)$(libdir) -b $(DESTDIR)$(bindir) -i "$(INSTALL_DATA)" libhistory.a |
151 |
-+ $(SHELL) $(topdir)/support/shlib-install -O $(host_os) -d $(DESTDIR)$(libdir) -b $(DESTDIR)$(bindir) -i "$(INSTALL_DATA)" libreadline.a |
152 |
-+ |
153 |
-+install: install-$(SHLIB_STATUS) |
154 |
-+ |
155 |
- uninstall: |
156 |
- $(SHELL) $(topdir)/support/shlib-install -O $(host_os) -d $(DESTDIR)$(libdir) -b $(DESTDIR)$(bindir) -U $(SHARED_HISTORY) |
157 |
- $(SHELL) $(topdir)/support/shlib-install -O $(host_os) -d $(DESTDIR)$(libdir) -b $(DESTDIR)$(bindir) -U $(SHARED_READLINE) |
158 |
-diff -ru readline-5.2.orig/support/shlib-install readline-5.2/support/shlib-install |
159 |
---- readline-5.2.orig/support/shlib-install 2008-03-20 09:47:38.000000000 +0100 |
160 |
-+++ readline-5.2/support/shlib-install 2008-03-20 09:47:48.000000000 +0100 |
161 |
-@@ -144,7 +144,7 @@ |
162 |
- fi |
163 |
- ;; |
164 |
- |
165 |
--solaris2*|aix4.[2-9]*|aix[5-9].*|osf*|irix[56]*|sysv[45]*|dgux*|interix*) |
166 |
-+solaris2*|osf*|irix[56]*|sysv[45]*|dgux*|interix*) |
167 |
- # libname.so -> libname.so.M |
168 |
- ${echo} ${RM} ${INSTALLDIR}/$LINK1 |
169 |
- if [ -z "$uninstall" ]; then |
170 |
-diff -ru readline-5.2.orig/support/shobj-conf readline-5.2/support/shobj-conf |
171 |
---- readline-5.2.orig/support/shobj-conf 2008-03-20 09:47:38.000000000 +0100 |
172 |
-+++ readline-5.2/support/shobj-conf 2008-03-20 09:56:29.000000000 +0100 |
173 |
-@@ -249,24 +249,26 @@ |
174 |
- |
175 |
- aix4.[2-9]*-*gcc*|aix[5-9].*-*gcc*) # lightly tested by jik@×××××.com |
176 |
- SHOBJ_CFLAGS=-fpic |
177 |
-- SHOBJ_LD='ld' |
178 |
-- SHOBJ_LDFLAGS='-bdynamic -bnoentry -bexpall' |
179 |
-- SHOBJ_XLDFLAGS='-G' |
180 |
-+ SHOBJ_LD='$(CC)' |
181 |
-+ SHOBJ_LDFLAGS='-shared -Wl,-G -Wl,-bdynamic -Wl,-bexpall' |
182 |
- |
183 |
-- SHLIB_XLDFLAGS='-bM:SRE' |
184 |
-+ SHLIB_XLDFLAGS='-Wl,-blibpath:${libdir}:/usr/lib:lib' |
185 |
- SHLIB_LIBS='-lcurses -lc' |
186 |
- SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)' |
187 |
-+ |
188 |
-+ SHLIB_STATUS='aixdll' |
189 |
- ;; |
190 |
- |
191 |
- aix4.[2-9]*|aix[5-9].*) |
192 |
- SHOBJ_CFLAGS=-K |
193 |
- SHOBJ_LD='ld' |
194 |
-- SHOBJ_LDFLAGS='-bdynamic -bnoentry -bexpall' |
195 |
-- SHOBJ_XLDFLAGS='-G' |
196 |
-+ SHOBJ_LDFLAGS='-G -bdynamic -bexpall' |
197 |
- |
198 |
-- SHLIB_XLDFLAGS='-bM:SRE' |
199 |
-+ SHLIB_XLDFLAGS='-blibpath:${libdir}:/usr/lib:lib' |
200 |
- SHLIB_LIBS='-lcurses -lc' |
201 |
- SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)' |
202 |
-+ |
203 |
-+ SHLIB_STATUS='aixdll' |
204 |
- ;; |
205 |
- |
206 |
- # |
207 |
|
208 |
diff --git a/sys-libs/readline/files/readline-5.2-interix.patch b/sys-libs/readline/files/readline-5.2-interix.patch |
209 |
deleted file mode 100644 |
210 |
index a06eb68a97..0000000000 |
211 |
--- a/sys-libs/readline/files/readline-5.2-interix.patch |
212 |
+++ /dev/null |
213 |
@@ -1,46 +0,0 @@ |
214 |
-reported upstream: http://lists.gnu.org/archive/html/bug-readline/2011-05/msg00005.html |
215 |
- |
216 |
-diff -ru -x config* readline-5.2.orig/examples/rlfe/os.h readline-5.2/examples/rlfe/os.h |
217 |
---- readline-5.2.orig/examples/rlfe/os.h Mon Jan 21 08:04:30 2008 |
218 |
-+++ readline-5.2/examples/rlfe/os.h Mon Jan 21 08:20:21 2008 |
219 |
-@@ -208,7 +208,9 @@ |
220 |
- # include <cytermio.h> |
221 |
- # endif |
222 |
- # else /* TERMIO */ |
223 |
--# include <sgtty.h> |
224 |
-+# ifndef __INTERIX |
225 |
-+# include <sgtty.h> |
226 |
-+# endif |
227 |
- # endif /* TERMIO */ |
228 |
- #endif /* POSIX */ |
229 |
- |
230 |
-diff -ru -x config* readline-5.2.orig/examples/rlfe/rlfe.c readline-5.2/examples/rlfe/rlfe.c |
231 |
---- readline-5.2.orig/examples/rlfe/rlfe.c Mon Jan 21 08:04:30 2008 |
232 |
-+++ readline-5.2/examples/rlfe/rlfe.c Mon Jan 21 08:14:45 2008 |
233 |
-@@ -77,6 +77,10 @@ |
234 |
- |
235 |
- #include <sys/wait.h> |
236 |
- |
237 |
-+#ifdef __INTERIX |
238 |
-+# include <sys/select.h> |
239 |
-+#endif |
240 |
-+ |
241 |
- #ifdef READLINE_LIBRARY |
242 |
- # include "readline.h" |
243 |
- # include "history.h" |
244 |
-@@ -545,7 +549,14 @@ |
245 |
- #endif |
246 |
- |
247 |
- t.c_lflag &= ~(ICANON | ISIG | ECHO | ECHOCTL | ECHOE | \ |
248 |
-- ECHOK | ECHOKE | ECHONL | ECHOPRT ); |
249 |
-+ ECHOK | ECHONL |
250 |
-+#ifdef ECHOKE |
251 |
-+ | ECHOKE |
252 |
-+#endif |
253 |
-+#ifdef ECHOPRT |
254 |
-+ | ECHOPRT |
255 |
-+#endif |
256 |
-+ ); |
257 |
- t.c_iflag &= ~ICRNL; |
258 |
- t.c_iflag |= IGNBRK; |
259 |
- t.c_cc[VMIN] = 1; |
260 |
|
261 |
diff --git a/sys-libs/readline/files/readline-5.2-mint.patch b/sys-libs/readline/files/readline-5.2-mint.patch |
262 |
deleted file mode 100644 |
263 |
index b24e2db377..0000000000 |
264 |
--- a/sys-libs/readline/files/readline-5.2-mint.patch |
265 |
+++ /dev/null |
266 |
@@ -1,48 +0,0 @@ |
267 |
-Patch by Alan Hourihane for FreeMiNT |
268 |
-http://archives.gentoo.org/gentoo-alt/msg_c989ade3c4f92f866fe1c40ff2da0c4a.xml |
269 |
- |
270 |
-diff -ur readline-5.2/examples/rlfe/rlfe.c readline-5.2-mint/examples/rlfe/rlfe.c |
271 |
---- readline-5.2/examples/rlfe/rlfe.c 2008-03-11 19:23:25.800436592 +0000 |
272 |
-+++ readline-5.2-mint/examples/rlfe/rlfe.c 2008-03-11 19:23:38.877438387 +0000 |
273 |
-@@ -541,6 +541,13 @@ |
274 |
- add_special_char(t.c_cc[VDISCARD]); |
275 |
- #endif |
276 |
- |
277 |
-+#ifndef ECHOKE |
278 |
-+#define ECHOKE 0 |
279 |
-+#endif |
280 |
-+#ifndef ECHOPRT |
281 |
-+#define ECHOPRT 0 |
282 |
-+#endif |
283 |
-+ |
284 |
- t.c_lflag &= ~(ICANON | ISIG | ECHO | ECHOCTL | ECHOE | \ |
285 |
- ECHOK | ECHOKE | ECHONL | ECHOPRT ); |
286 |
- t.c_iflag &= ~ICRNL; |
287 |
-Only in readline-5.2: readline-5.2-mint.patch |
288 |
-diff -ur readline-5.2/support/shobj-conf readline-5.2-mint/support/shobj-conf |
289 |
---- readline-5.2/support/shobj-conf 2006-04-11 14:15:43.000000000 +0100 |
290 |
-+++ readline-5.2-mint/support/shobj-conf 2008-03-11 17:34:33.588499957 +0000 |
291 |
-@@ -487,6 +487,11 @@ |
292 |
- SHLIB_STATUS=unsupported |
293 |
- ;; |
294 |
- |
295 |
-+mint*) |
296 |
-+ SHOBJ_STATUS=unsupported |
297 |
-+ SHLIB_STATUS=unsupported |
298 |
-+ ;; |
299 |
-+ |
300 |
- cygwin*) |
301 |
- SHOBJ_LD='$(CC)' |
302 |
- SHOBJ_LDFLAGS='-shared -Wl,--enable-auto-import -Wl,--enable-auto-image-base -Wl,--export-all -Wl,--out-implib=$(@).a' |
303 |
-diff -ur readline-5.2/terminal.c readline-5.2-mint/terminal.c |
304 |
---- readline-5.2/terminal.c 2006-09-28 15:11:10.000000000 +0100 |
305 |
-+++ readline-5.2-mint/terminal.c 2008-03-11 17:34:53.147437815 +0000 |
306 |
-@@ -641,7 +641,7 @@ |
307 |
- int |
308 |
- rl_crlf () |
309 |
- { |
310 |
--#if defined (NEW_TTY_DRIVER) |
311 |
-+#if defined (NEW_TTY_DRIVER) || defined(__MINT__) |
312 |
- if (_rl_term_cr) |
313 |
- tputs (_rl_term_cr, 1, _rl_output_character_function); |
314 |
- #endif /* NEW_TTY_DRIVER */ |
315 |
|
316 |
diff --git a/sys-libs/readline/files/readline-5.2-no-ignore-shlib-errors.patch b/sys-libs/readline/files/readline-5.2-no-ignore-shlib-errors.patch |
317 |
deleted file mode 100644 |
318 |
index fc63491131..0000000000 |
319 |
--- a/sys-libs/readline/files/readline-5.2-no-ignore-shlib-errors.patch |
320 |
+++ /dev/null |
321 |
@@ -1,24 +0,0 @@ |
322 |
-dont ignore errors in the shlib subdir |
323 |
- |
324 |
-http://bugs.gentoo.org/216952 |
325 |
- |
326 |
---- Makefile.in |
327 |
-+++ Makefile.in |
328 |
-@@ -194,7 +194,7 @@ |
329 |
- |
330 |
- shared: force |
331 |
- -test -d shlib || mkdir shlib |
332 |
-- -( cd shlib ; ${MAKE} ${MFLAGS} all ) |
333 |
-+ ( cd shlib ; ${MAKE} ${MFLAGS} all ) |
334 |
- |
335 |
- documentation: force |
336 |
- -test -d doc || mkdir doc |
337 |
-@@ -238,7 +238,7 @@ |
338 |
- -( cd shlib; ${MAKE} ${MFLAGS} DESTDIR=${DESTDIR} uninstall ) |
339 |
- |
340 |
- install-shared: installdirs install-headers shared install-doc |
341 |
-- -( cd shlib ; ${MAKE} ${MFLAGS} DESTDIR=${DESTDIR} install ) |
342 |
-+ ( cd shlib ; ${MAKE} ${MFLAGS} DESTDIR=${DESTDIR} install ) |
343 |
- |
344 |
- uninstall-shared: maybe-uninstall-headers |
345 |
- -( cd shlib; ${MAKE} ${MFLAGS} DESTDIR=${DESTDIR} uninstall ) |
346 |
|
347 |
diff --git a/sys-libs/readline/files/readline-5.2-solaris-fPIC.patch b/sys-libs/readline/files/readline-5.2-solaris-fPIC.patch |
348 |
deleted file mode 100644 |
349 |
index dd3aa5a6cc..0000000000 |
350 |
--- a/sys-libs/readline/files/readline-5.2-solaris-fPIC.patch |
351 |
+++ /dev/null |
352 |
@@ -1,25 +0,0 @@ |
353 |
-* when using -fpic, the .got section must fit into 4K, which on Solaris |
354 |
- it doesn't ("relocation truncated to fit: R_SPARC_GOT13") |
355 |
-* http://lists.gnu.org/archive/html/bug-readline/2008-04/msg00000.html |
356 |
- |
357 |
---- support/shobj-conf |
358 |
-+++ support/shobj-conf |
359 |
-@@ -80,15 +80,17 @@ |
360 |
- ;; |
361 |
- |
362 |
- sunos5*-*gcc*|solaris2*-*gcc*) |
363 |
-- SHOBJ_CFLAGS=-fpic |
364 |
- SHOBJ_LD='${CC}' |
365 |
- ld_used=`gcc -print-prog-name=ld` |
366 |
- if ${ld_used} -V 2>&1 | grep GNU >/dev/null 2>&1; then |
367 |
- # This line works for the GNU ld |
368 |
- SHOBJ_LDFLAGS='-shared -Wl,-h,$@' |
369 |
-+ # http://sourceware.org/ml/binutils/2001-08/msg00361.html |
370 |
-+ SHOBJ_CFLAGS=-fPIC |
371 |
- else |
372 |
- # This line works for the Solaris linker in /usr/ccs/bin/ld |
373 |
- SHOBJ_LDFLAGS='-shared -Wl,-i -Wl,-h,$@' |
374 |
-+ SHOBJ_CFLAGS=-fpic |
375 |
- fi |
376 |
- |
377 |
- # SHLIB_XLDFLAGS='-R $(libdir)' |
378 |
|
379 |
diff --git a/sys-libs/readline/files/readline-6.1-darwin-shlib-versioning.patch b/sys-libs/readline/files/readline-6.1-darwin-shlib-versioning.patch |
380 |
deleted file mode 100644 |
381 |
index ababffa6fe..0000000000 |
382 |
--- a/sys-libs/readline/files/readline-6.1-darwin-shlib-versioning.patch |
383 |
+++ /dev/null |
384 |
@@ -1,24 +0,0 @@ |
385 |
-- drop forcing MACOSX_DEPLOYMENT_TARGET |
386 |
-- no reason to call the compiler with -v |
387 |
-- build an installname like libreadline.6.dylib iso |
388 |
- libreadline.6.1.dylib, like on Linux, so we don't have to rebuild half |
389 |
- of our system every time readline gets a bump |
390 |
- |
391 |
---- support/shobj-conf |
392 |
-+++ support/shobj-conf |
393 |
-@@ -163,13 +163,13 @@ |
394 |
- |
395 |
- SHOBJ_CFLAGS='-fno-common' |
396 |
- |
397 |
-- SHOBJ_LD='MACOSX_DEPLOYMENT_TARGET=10.3 ${CC}' |
398 |
-+ SHOBJ_LD='${CC}' |
399 |
- |
400 |
- SHLIB_LIBVERSION='$(SHLIB_MAJOR)$(SHLIB_MINOR).$(SHLIB_LIBSUFF)' |
401 |
- SHLIB_LIBSUFF='dylib' |
402 |
- |
403 |
- SHOBJ_LDFLAGS='-dynamiclib -dynamic -undefined dynamic_lookup -arch_only `/usr/bin/arch`' |
404 |
-- SHLIB_XLDFLAGS='-dynamiclib -arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v' |
405 |
-+ SHLIB_XLDFLAGS='-dynamiclib -arch_only `/usr/bin/arch` -install_name $(libdir)/`basename $@ $(SHLIB_MINOR)$(SHLIB_DOT)$(SHLIB_LIBSUFF)`$(SHLIB_DOT)$(SHLIB_LIBSUFF) -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR)' |
406 |
- |
407 |
- SHLIB_LIBS='-lncurses' # see if -lcurses works on MacOS X 10.1 |
408 |
- ;; |
409 |
|
410 |
diff --git a/sys-libs/readline/files/readline-6.2-libtool.patch b/sys-libs/readline/files/readline-6.2-libtool.patch |
411 |
deleted file mode 100644 |
412 |
index aa052c1ae0..0000000000 |
413 |
--- a/sys-libs/readline/files/readline-6.2-libtool.patch |
414 |
+++ /dev/null |
415 |
@@ -1,686 +0,0 @@ |
416 |
---- shlib/Makefile.in.orig 2014-04-15 11:05:22 +0200 |
417 |
-+++ shlib/Makefile.in 2014-04-15 11:43:33 +0200 |
418 |
-@@ -78,14 +78,14 @@ |
419 |
- # changes to bash-maintainers@×××.org. |
420 |
- # |
421 |
- SHOBJ_CC = @SHOBJ_CC@ |
422 |
--SHOBJ_CFLAGS = @SHOBJ_CFLAGS@ |
423 |
--SHOBJ_LD = @SHOBJ_LD@ |
424 |
-+SHOBJ_CFLAGS_shared = @SHOBJ_CFLAGS@ |
425 |
-+SHOBJ_LD_shared = @SHOBJ_LD@ |
426 |
- |
427 |
--SHOBJ_LDFLAGS = @SHOBJ_LDFLAGS@ |
428 |
--SHOBJ_XLDFLAGS = @SHOBJ_XLDFLAGS@ |
429 |
-+SHOBJ_LDFLAGS_shared = @SHOBJ_LDFLAGS@ |
430 |
-+SHOBJ_XLDFLAGS_shared = @SHOBJ_XLDFLAGS@ |
431 |
- SHOBJ_LIBS = @SHOBJ_LIBS@ |
432 |
- |
433 |
--SHLIB_XLDFLAGS = @LDFLAGS@ @SHLIB_XLDFLAGS@ |
434 |
-+SHLIB_XLDFLAGS_shared = @SHLIB_XLDFLAGS@ |
435 |
- SHLIB_LIBS = @SHLIB_LIBS@ |
436 |
- |
437 |
- SHLIB_DOT = @SHLIB_DOT@ |
438 |
-@@ -95,7 +95,7 @@ |
439 |
- SHLIB_LIBVERSION = @SHLIB_LIBVERSION@ |
440 |
- SHLIB_DLLVERSION = @SHLIB_DLLVERSION@ |
441 |
- |
442 |
--SHLIB_STATUS = @SHLIB_STATUS@ |
443 |
-+SHLIB_STATUS_shared = @SHLIB_STATUS@ |
444 |
- |
445 |
- TERMCAP_LIB = @TERMCAP_LIB@ |
446 |
- |
447 |
-@@ -109,13 +109,52 @@ |
448 |
- |
449 |
- CCFLAGS = $(DEFS) $(LOCAL_DEFS) $(CPPFLAGS) $(INCLUDES) $(LOCAL_CFLAGS) $(CFLAGS) |
450 |
- |
451 |
--.SUFFIXES: .so |
452 |
-+SHARED_TARGET = @SHARED_TARGET@ # using libtool when empty |
453 |
-+ |
454 |
-+SHLIB_STATUS_ = libtool |
455 |
-+SHLIB_STATUS = $(SHLIB_STATUS_$(SHARED_TARGET)) |
456 |
-+ |
457 |
-+SO_shared = so |
458 |
-+SO_ = lo # use libtool when SHARED_TARGET is empty |
459 |
-+SO = $(SO_$(SHARED_TARGET)) |
460 |
-+ |
461 |
-+LIBTOOL_ = libtool |
462 |
-+LIBTOOL = $(LIBTOOL_$(SHARED_TARGET)) |
463 |
-+ |
464 |
-+LTTAG_CC_ = --tag=CC |
465 |
-+LTCLEAN_ = $(LIBTOOL) --mode=clean |
466 |
-+LTCOMPILE_ = $(LIBTOOL) --mode=compile |
467 |
-+LTINSTALL_ = $(LIBTOOL) --mode=install |
468 |
-+LTLINK_ = $(LIBTOOL) --mode=link |
469 |
-+LTUNINSTALL_ = $(LIBTOOL) --mode=uninstall |
470 |
-+ |
471 |
-+SHOBJ_CFLAGS_ = |
472 |
-+SHOBJ_LD_ = $(SHOBJ_CC) |
473 |
-+SHOBJ_LDFLAGS_ = -shared -version-info `echo $(SHLIB_MAJOR)$(SHLIB_MINOR) | sed -e 's/\./:/g'` |
474 |
-+SHLIB_XLDFLAGS_ = -rpath $(libdir) |
475 |
-+ |
476 |
-+LTTAG_CC = $(LTTAG_CC_$(SHARED_TARGET)) |
477 |
-+LTCLEAN = $(LTCLEAN_$(SHARED_TARGET)) |
478 |
-+LTCOMPILE = $(LTCOMPILE_$(SHARED_TARGET)) |
479 |
-+LTINSTALL = $(LTINSTALL_$(SHARED_TARGET)) |
480 |
-+LTLINK = $(LTLINK_$(SHARED_TARGET)) |
481 |
-+LTUNINSTALL = $(LTUNINSTALL_$(SHARED_TARGET)) |
482 |
-+ |
483 |
-+SHOBJ_CFLAGS = $(SHOBJ_CFLAGS_$(SHARED_TARGET)) |
484 |
-+SHOBJ_LD = $(SHOBJ_LD_$(SHARED_TARGET)) |
485 |
-+SHOBJ_LDFLAGS = $(SHOBJ_LDFLAGS_$(SHARED_TARGET)) |
486 |
-+SHLIB_XLDFLAGS = $(LDFLAGS) $(SHLIB_XLDFLAGS_$(SHARED_TARGET)) |
487 |
-+ |
488 |
-+.SUFFIXES: .so .lo |
489 |
- |
490 |
- .c.so: |
491 |
- ${RM} $@ |
492 |
- $(SHOBJ_CC) -c $(CCFLAGS) $(SHOBJ_CFLAGS) -o $*.o $< |
493 |
- $(MV) $*.o $@ |
494 |
- |
495 |
-+.c.lo: |
496 |
-+ $(LTCOMPILE) $(LTTAG_CC) $(SHOBJ_CC) -c $(CCFLAGS) $(SHOBJ_CFLAGS) -o $*.lo $< |
497 |
-+ |
498 |
- # The name of the main library target. |
499 |
- |
500 |
- SHARED_READLINE = $(SHLIB_LIBPREF)readline$(SHLIB_DOT)$(SHLIB_LIBVERSION) |
501 |
-@@ -141,14 +180,14 @@ |
502 |
- posixstat.h posixdir.h posixjmp.h tilde.h rlconf.h rltty.h \ |
503 |
- ansi_stdlib.h tcap.h xmalloc.h rlprivate.h rlshell.h rlmbutil.h |
504 |
- |
505 |
--SHARED_HISTOBJ = history.so histexpand.so histfile.so histsearch.so shell.so \ |
506 |
-- mbutil.so |
507 |
--SHARED_TILDEOBJ = tilde.so |
508 |
--SHARED_OBJ = readline.so vi_mode.so funmap.so keymaps.so parens.so search.so \ |
509 |
-- rltty.so complete.so bind.so isearch.so display.so signals.so \ |
510 |
-- util.so kill.so undo.so macro.so input.so callback.so terminal.so \ |
511 |
-- text.so nls.so misc.so xmalloc.so xfree.so $(SHARED_HISTOBJ) $(SHARED_TILDEOBJ) \ |
512 |
-- compat.so |
513 |
-+SHARED_HISTOBJ = history.$(SO) histexpand.$(SO) histfile.$(SO) histsearch.$(SO) shell.$(SO) \ |
514 |
-+ mbutil.$(SO) |
515 |
-+SHARED_TILDEOBJ = tilde.$(SO) |
516 |
-+SHARED_OBJ = readline.$(SO) vi_mode.$(SO) funmap.$(SO) keymaps.$(SO) parens.$(SO) search.$(SO) \ |
517 |
-+ rltty.$(SO) complete.$(SO) bind.$(SO) isearch.$(SO) display.$(SO) signals.$(SO) \ |
518 |
-+ util.$(SO) kill.$(SO) undo.$(SO) macro.$(SO) input.$(SO) callback.$(SO) terminal.$(SO) \ |
519 |
-+ text.$(SO) nls.$(SO) misc.$(SO) xmalloc.$(SO) xfree.$(SO) $(SHARED_HISTOBJ) $(SHARED_TILDEOBJ) \ |
520 |
-+ compat.$(SO) |
521 |
- |
522 |
- ########################################################################## |
523 |
- |
524 |
-@@ -156,6 +195,8 @@ |
525 |
- |
526 |
- supported: $(SHARED_LIBS) |
527 |
- |
528 |
-+libtool: libreadline.la libhistory.la |
529 |
-+ |
530 |
- unsupported: |
531 |
- @echo "Your system and compiler (${host_os}-${CC}) are not supported by the" |
532 |
- @echo "${topdir}/support/shobj-conf script." |
533 |
-@@ -164,13 +205,15 @@ |
534 |
- @echo "Please send the changes you made to bash-maintainers@×××.org" |
535 |
- @echo "for inclusion in future bash and readline releases." |
536 |
- |
537 |
-+libreadline.la \ |
538 |
- $(SHARED_READLINE): $(SHARED_OBJ) |
539 |
-- $(RM) $@ |
540 |
-- $(SHOBJ_LD) ${SHOBJ_LDFLAGS} ${SHLIB_XLDFLAGS} -o $@ $(SHARED_OBJ) $(SHLIB_LIBS) |
541 |
-+ $(LTCLEAN) $(RM) $@ |
542 |
-+ $(LTLINK) $(LTTAG_CC) $(SHOBJ_LD) ${SHOBJ_LDFLAGS} ${SHLIB_XLDFLAGS} -o $@ $(SHARED_OBJ) $(SHLIB_LIBS) |
543 |
- |
544 |
--$(SHARED_HISTORY): $(SHARED_HISTOBJ) xmalloc.so xfree.so |
545 |
-- $(RM) $@ |
546 |
-- $(SHOBJ_LD) ${SHOBJ_LDFLAGS} ${SHLIB_XLDFLAGS} -o $@ $(SHARED_HISTOBJ) xmalloc.so xfree.so $(SHLIB_LIBS) |
547 |
-+libhistory.la \ |
548 |
-+$(SHARED_HISTORY): $(SHARED_HISTOBJ) xmalloc.$(SO) xfree.$(SO) |
549 |
-+ $(LTCLEAN) $(RM) $@ |
550 |
-+ $(LTLINK) $(LTTAG_CC) $(SHOBJ_LD) ${SHOBJ_LDFLAGS} ${SHLIB_XLDFLAGS} -o $@ $(SHARED_HISTOBJ) xmalloc.$(SO) xfree.$(SO) $(SHLIB_LIBS) |
551 |
- |
552 |
- # Since tilde.c is shared between readline and bash, make sure we compile |
553 |
- # it with the right flags when it's built as part of readline |
554 |
-@@ -179,22 +222,43 @@ |
555 |
- $(SHOBJ_CC) -c $(CCFLAGS) $(SHOBJ_CFLAGS) -DREADLINE_LIBRARY -c -o tilde.o $(topdir)/tilde.c |
556 |
- $(MV) tilde.o $@ |
557 |
- |
558 |
-+tilde.lo: tilde.c |
559 |
-+ $(LTCOMPILE) $(LTTAG_CC) $(SHOBJ_CC) -c $(CCFLAGS) $(SHOBJ_CFLAGS) -DREADLINE_LIBRARY -c -o tilde.lo $(topdir)/tilde.c |
560 |
-+ |
561 |
- installdirs: $(topdir)/support/mkdirs |
562 |
- -$(SHELL) $(topdir)/support/mkdirs $(DESTDIR)$(libdir) |
563 |
- -$(SHELL) $(topdir)/support/mkdirs $(DESTDIR)$(bindir) |
564 |
- |
565 |
--install: installdirs $(SHLIB_STATUS) |
566 |
-+install: install-$(SHLIB_STATUS) |
567 |
-+ |
568 |
-+install-supported: installdirs $(SHLIB_STATUS) |
569 |
- $(SHELL) $(topdir)/support/shlib-install -O $(host_os) -V $(host_vendor) -d $(DESTDIR)$(libdir) -b $(DESTDIR)$(bindir) -i "$(INSTALL_DATA)" $(SHARED_HISTORY) |
570 |
- $(SHELL) $(topdir)/support/shlib-install -O $(host_os) -V $(host_vendor) -d $(DESTDIR)$(libdir) -b $(DESTDIR)$(bindir) -i "$(INSTALL_DATA)" $(SHARED_READLINE) |
571 |
- @echo install: you may need to run ldconfig |
572 |
- |
573 |
--uninstall: |
574 |
-+install-libtool: installdirs $(SHLIB_STATUS) |
575 |
-+ $(LTINSTALL) $(INSTALL_DATA) libhistory.la $(DESTDIR)$(libdir) |
576 |
-+ $(LTINSTALL) $(INSTALL_DATA) libreadline.la $(DESTDIR)$(libdir) |
577 |
-+ |
578 |
-+install-unsupported: |
579 |
-+ @echo install: shared libraries not supported |
580 |
-+ |
581 |
-+uninstall: uninstall-$(SHLIB_STATUS) |
582 |
-+ |
583 |
-+uninstall-supported: |
584 |
- $(SHELL) $(topdir)/support/shlib-install -O $(host_os) -V $(host_vendor) -d $(DESTDIR)$(libdir) -b $(DESTDIR)$(bindir) -U $(SHARED_HISTORY) |
585 |
- $(SHELL) $(topdir)/support/shlib-install -O $(host_os) -V $(host_vendor) -d $(DESTDIR)$(libdir) -b $(DESTDIR)$(bindir) -U $(SHARED_READLINE) |
586 |
- @echo uninstall: you may need to run ldconfig |
587 |
- |
588 |
-+uninstall-libtool: |
589 |
-+ $(LTUNINSTALL) $(RM) $(DESTDIR)$(libdir)/libhistory.la |
590 |
-+ $(LTUNINSTALL) $(RM) $(DESTDIR)$(libdir)/libreadline.la |
591 |
-+ |
592 |
-+uninstall-unsupported: |
593 |
-+ @echo uninstall: shared libraries not supported |
594 |
-+ |
595 |
- clean mostlyclean: force |
596 |
-- $(RM) $(SHARED_OBJ) $(SHARED_LIBS) |
597 |
-+ $(LTCLEAN) $(RM) $(SHARED_OBJ) $(SHARED_LIBS) libreadline.la libhistory.la |
598 |
- |
599 |
- distclean maintainer-clean: clean |
600 |
- $(RM) Makefile |
601 |
-@@ -206,178 +270,178 @@ |
602 |
- .NOEXPORT: |
603 |
- |
604 |
- # Dependencies |
605 |
--bind.so: $(topdir)/ansi_stdlib.h $(topdir)/posixstat.h |
606 |
--bind.so: $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h |
607 |
--bind.so: $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h |
608 |
--bind.so: $(topdir)/rltypedefs.h |
609 |
--bind.so: $(topdir)/tilde.h $(topdir)/history.h |
610 |
--compat.so: $(topdir)/rlstdc.h |
611 |
--callback.so: $(topdir)/rlconf.h |
612 |
--callback.so: $(topdir)/rldefs.h ${BUILD_DIR}/config.h |
613 |
--callback.so: $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h |
614 |
--callback.so: $(topdir)/rltypedefs.h |
615 |
--callback.so: $(topdir)/tilde.h |
616 |
--complete.so: $(topdir)/ansi_stdlib.h posixdir.h $(topdir)/posixstat.h |
617 |
--complete.so: $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h |
618 |
--complete.so: $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h |
619 |
--complete.so: $(topdir)/rltypedefs.h |
620 |
--complete.so: $(topdir)/tilde.h |
621 |
--display.so: $(topdir)/ansi_stdlib.h $(topdir)/posixstat.h |
622 |
--display.so: $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h |
623 |
--display.so: $(topdir)/tcap.h |
624 |
--display.so: $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h |
625 |
--display.so: $(topdir)/rltypedefs.h |
626 |
--display.so: $(topdir)/tilde.h $(topdir)/history.h |
627 |
--funmap.so: $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h |
628 |
--funmap.so: $(topdir)/rltypedefs.h |
629 |
--funmap.so: $(topdir)/rlconf.h $(topdir)/ansi_stdlib.h |
630 |
--funmap.so: ${BUILD_DIR}/config.h $(topdir)/tilde.h |
631 |
--histexpand.so: $(topdir)/ansi_stdlib.h |
632 |
--histexpand.so: $(topdir)/history.h $(topdir)/histlib.h $(topdir)/rltypedefs.h |
633 |
--histexpand.so: ${BUILD_DIR}/config.h |
634 |
--histfile.so: $(topdir)/ansi_stdlib.h |
635 |
--histfile.so: $(topdir)/history.h $(topdir)/histlib.h $(topdir)/rltypedefs.h |
636 |
--histfile.so: ${BUILD_DIR}/config.h |
637 |
--history.so: $(topdir)/ansi_stdlib.h |
638 |
--history.so: $(topdir)/history.h $(topdir)/histlib.h $(topdir)/rltypedefs.h |
639 |
--history.so: ${BUILD_DIR}/config.h |
640 |
--histsearch.so: $(topdir)/ansi_stdlib.h |
641 |
--histsearch.so: $(topdir)/history.h $(topdir)/histlib.h $(topdir)/rltypedefs.h |
642 |
--histsearch.so: ${BUILD_DIR}/config.h |
643 |
--input.so: $(topdir)/ansi_stdlib.h |
644 |
--input.so: $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h |
645 |
--input.so: $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h |
646 |
--input.so: $(topdir)/rltypedefs.h |
647 |
--input.so: $(topdir)/tilde.h |
648 |
--isearch.so: $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h |
649 |
--isearch.so: $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h |
650 |
--isearch.so: $(topdir)/rltypedefs.h |
651 |
--isearch.so: $(topdir)/ansi_stdlib.h $(topdir)/history.h $(topdir)/tilde.h |
652 |
--keymaps.so: emacs_keymap.c vi_keymap.c |
653 |
--keymaps.so: $(topdir)/keymaps.h $(topdir)/chardefs.h $(topdir)/rlconf.h |
654 |
--keymaps.so: $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h |
655 |
--keymaps.so: $(topdir)/rltypedefs.h |
656 |
--keymaps.so: ${BUILD_DIR}/config.h $(topdir)/ansi_stdlib.h $(topdir)/tilde.h |
657 |
--kill.so: $(topdir)/ansi_stdlib.h |
658 |
--kill.so: $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h |
659 |
--kill.so: $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h |
660 |
--kill.so: $(topdir)/tilde.h $(topdir)/history.h $(topdir)/rltypedefs.h |
661 |
--macro.so: $(topdir)/ansi_stdlib.h |
662 |
--macro.so: $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h |
663 |
--macro.so: $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h |
664 |
--macro.so: $(topdir)/tilde.h $(topdir)/history.h $(topdir)/rltypedefs.h |
665 |
--mbutil.so: $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h |
666 |
--mbutil.so: $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/rltypedefs.h |
667 |
--mbutil.so: $(topdir)/chardefs.h $(topdir)/rlstdc.h |
668 |
--misc.so: $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h |
669 |
--misc.so: $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h |
670 |
--misc.so: $(topdir)/rltypedefs.h |
671 |
--misc.so: $(topdir)/history.h $(topdir)/tilde.h $(topdir)/ansi_stdlib.h |
672 |
--nls.so: $(topdir)/ansi_stdlib.h |
673 |
--nls.so: $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h |
674 |
-+bind.$(SO): $(topdir)/ansi_stdlib.h $(topdir)/posixstat.h |
675 |
-+bind.$(SO): $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h |
676 |
-+bind.$(SO): $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h |
677 |
-+bind.$(SO): $(topdir)/rltypedefs.h |
678 |
-+bind.$(SO): $(topdir)/tilde.h $(topdir)/history.h |
679 |
-+compat.$(SO): $(topdir)/rlstdc.h |
680 |
-+callback.$(SO): $(topdir)/rlconf.h |
681 |
-+callback.$(SO): $(topdir)/rldefs.h ${BUILD_DIR}/config.h |
682 |
-+callback.$(SO): $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h |
683 |
-+callback.$(SO): $(topdir)/rltypedefs.h |
684 |
-+callback.$(SO): $(topdir)/tilde.h |
685 |
-+complete.$(SO): $(topdir)/ansi_stdlib.h posixdir.h $(topdir)/posixstat.h |
686 |
-+complete.$(SO): $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h |
687 |
-+complete.$(SO): $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h |
688 |
-+complete.$(SO): $(topdir)/rltypedefs.h |
689 |
-+complete.$(SO): $(topdir)/tilde.h |
690 |
-+display.$(SO): $(topdir)/ansi_stdlib.h $(topdir)/posixstat.h |
691 |
-+display.$(SO): $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h |
692 |
-+display.$(SO): $(topdir)/tcap.h |
693 |
-+display.$(SO): $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h |
694 |
-+display.$(SO): $(topdir)/rltypedefs.h |
695 |
-+display.$(SO): $(topdir)/tilde.h $(topdir)/history.h |
696 |
-+funmap.$(SO): $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h |
697 |
-+funmap.$(SO): $(topdir)/rltypedefs.h |
698 |
-+funmap.$(SO): $(topdir)/rlconf.h $(topdir)/ansi_stdlib.h |
699 |
-+funmap.$(SO): ${BUILD_DIR}/config.h $(topdir)/tilde.h |
700 |
-+histexpand.$(SO): $(topdir)/ansi_stdlib.h |
701 |
-+histexpand.$(SO): $(topdir)/history.h $(topdir)/histlib.h $(topdir)/rltypedefs.h |
702 |
-+histexpand.$(SO): ${BUILD_DIR}/config.h |
703 |
-+histfile.$(SO): $(topdir)/ansi_stdlib.h |
704 |
-+histfile.$(SO): $(topdir)/history.h $(topdir)/histlib.h $(topdir)/rltypedefs.h |
705 |
-+histfile.$(SO): ${BUILD_DIR}/config.h |
706 |
-+history.$(SO): $(topdir)/ansi_stdlib.h |
707 |
-+history.$(SO): $(topdir)/history.h $(topdir)/histlib.h $(topdir)/rltypedefs.h |
708 |
-+history.$(SO): ${BUILD_DIR}/config.h |
709 |
-+histsearch.$(SO): $(topdir)/ansi_stdlib.h |
710 |
-+histsearch.$(SO): $(topdir)/history.h $(topdir)/histlib.h $(topdir)/rltypedefs.h |
711 |
-+histsearch.$(SO): ${BUILD_DIR}/config.h |
712 |
-+input.$(SO): $(topdir)/ansi_stdlib.h |
713 |
-+input.$(SO): $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h |
714 |
-+input.$(SO): $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h |
715 |
-+input.$(SO): $(topdir)/rltypedefs.h |
716 |
-+input.$(SO): $(topdir)/tilde.h |
717 |
-+isearch.$(SO): $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h |
718 |
-+isearch.$(SO): $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h |
719 |
-+isearch.$(SO): $(topdir)/rltypedefs.h |
720 |
-+isearch.$(SO): $(topdir)/ansi_stdlib.h $(topdir)/history.h $(topdir)/tilde.h |
721 |
-+keymaps.$(SO): emacs_keymap.c vi_keymap.c |
722 |
-+keymaps.$(SO): $(topdir)/keymaps.h $(topdir)/chardefs.h $(topdir)/rlconf.h |
723 |
-+keymaps.$(SO): $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h |
724 |
-+keymaps.$(SO): $(topdir)/rltypedefs.h |
725 |
-+keymaps.$(SO): ${BUILD_DIR}/config.h $(topdir)/ansi_stdlib.h $(topdir)/tilde.h |
726 |
-+kill.$(SO): $(topdir)/ansi_stdlib.h |
727 |
-+kill.$(SO): $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h |
728 |
-+kill.$(SO): $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h |
729 |
-+kill.$(SO): $(topdir)/tilde.h $(topdir)/history.h $(topdir)/rltypedefs.h |
730 |
-+macro.$(SO): $(topdir)/ansi_stdlib.h |
731 |
-+macro.$(SO): $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h |
732 |
-+macro.$(SO): $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h |
733 |
-+macro.$(SO): $(topdir)/tilde.h $(topdir)/history.h $(topdir)/rltypedefs.h |
734 |
-+mbutil.$(SO): $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h |
735 |
-+mbutil.$(SO): $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/rltypedefs.h |
736 |
-+mbutil.$(SO): $(topdir)/chardefs.h $(topdir)/rlstdc.h |
737 |
-+misc.$(SO): $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h |
738 |
-+misc.$(SO): $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h |
739 |
-+misc.$(SO): $(topdir)/rltypedefs.h |
740 |
-+misc.$(SO): $(topdir)/history.h $(topdir)/tilde.h $(topdir)/ansi_stdlib.h |
741 |
-+nls.$(SO): $(topdir)/ansi_stdlib.h |
742 |
-+nls.$(SO): $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h |
743 |
- nls.o: $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h |
744 |
- nls.o: $(topdir)/rltypedefs.h |
745 |
- nls.o: $(topdir)/tilde.h $(topdir)/history.h $(topdir)/rlstdc.h |
746 |
--parens.so: $(topdir)/rlconf.h ${BUILD_DIR}/config.h |
747 |
--parens.so: $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h |
748 |
--parens.so: $(topdir)/rltypedefs.h |
749 |
--parens.so: $(topdir)/tilde.h |
750 |
--rltty.so: $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h |
751 |
--rltty.so: $(topdir)/rltty.h $(topdir)/tilde.h |
752 |
--rltty.so: $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h |
753 |
--rltty.so: $(topdir)/rltypedefs.h |
754 |
--search.so: $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h |
755 |
--search.so: $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h |
756 |
--search.so: $(topdir)/ansi_stdlib.h $(topdir)/history.h $(topdir)/tilde.h |
757 |
--search.so: $(topdir)/rltypedefs.h |
758 |
--signals.so: $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h |
759 |
--signals.so: $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h |
760 |
--signals.so: $(topdir)/history.h $(topdir)/tilde.h |
761 |
--signals.so: $(topdir)/rltypedefs.h |
762 |
--terminal.so: $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h |
763 |
--terminal.so: $(topdir)/tcap.h |
764 |
--terminal.so: $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h |
765 |
--terminal.so: $(topdir)/tilde.h $(topdir)/history.h |
766 |
--terminal.so: $(topdir)/rltypedefs.h |
767 |
--text.so: $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h |
768 |
--text.so: $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h |
769 |
--text.so: $(topdir)/rltypedefs.h |
770 |
--text.so: $(topdir)/history.h $(topdir)/tilde.h $(topdir)/ansi_stdlib.h |
771 |
--tilde.so: $(topdir)/ansi_stdlib.h ${BUILD_DIR}/config.h $(topdir)/tilde.h |
772 |
--undo.so: $(topdir)/ansi_stdlib.h |
773 |
--undo.so: $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h |
774 |
--undo.so: $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h |
775 |
--undo.so: $(topdir)/rltypedefs.h |
776 |
--undo.so: $(topdir)/tilde.h $(topdir)/history.h |
777 |
--util.so: $(topdir)/posixjmp.h $(topdir)/ansi_stdlib.h |
778 |
--util.so: $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h |
779 |
--util.so: $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h |
780 |
--util.so: $(topdir)/rltypedefs.h $(topdir)/tilde.h |
781 |
--vi_mode.so: $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h |
782 |
--vi_mode.so: $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h |
783 |
--vi_mode.so: $(topdir)/history.h $(topdir)/ansi_stdlib.h $(topdir)/tilde.h |
784 |
--vi_mode.so: $(topdir)/rltypedefs.h |
785 |
--xfree.so: ${BUILD_DIR}/config.h |
786 |
--xfree.so: $(topdir)/ansi_stdlib.h |
787 |
--xmalloc.so: ${BUILD_DIR}/config.h |
788 |
--xmalloc.so: $(topdir)/ansi_stdlib.h |
789 |
-- |
790 |
--bind.so: $(topdir)/rlshell.h |
791 |
--histfile.so: $(topdir)/rlshell.h |
792 |
--nls.so: $(topdir)/rlshell.h |
793 |
--readline.so: $(topdir)/rlshell.h |
794 |
--shell.so: $(topdir)/rlshell.h |
795 |
--terminal.so: $(topdir)/rlshell.h |
796 |
--histexpand.so: $(topdir)/rlshell.h |
797 |
-- |
798 |
--bind.so: $(topdir)/rlprivate.h |
799 |
--callback.so: $(topdir)/rlprivate.h |
800 |
--complete.so: $(topdir)/rlprivate.h |
801 |
--display.so: $(topdir)/rlprivate.h |
802 |
--input.so: $(topdir)/rlprivate.h |
803 |
--isearch.so: $(topdir)/rlprivate.h |
804 |
--kill.so: $(topdir)/rlprivate.h |
805 |
--macro.so: $(topdir)/rlprivate.h |
806 |
--mbutil.so: $(topdir)/rlprivate.h |
807 |
--misc.so: $(topdir)/rlprivate.h |
808 |
--nls.so: $(topdir)/rlprivate.h |
809 |
--parens.so: $(topdir)/rlprivate.h |
810 |
--readline.so: $(topdir)/rlprivate.h |
811 |
--rltty.so: $(topdir)/rlprivate.h |
812 |
--search.so: $(topdir)/rlprivate.h |
813 |
--signals.so: $(topdir)/rlprivate.h |
814 |
--terminal.so: $(topdir)/rlprivate.h |
815 |
--text.so: $(topdir)/rlprivate.h |
816 |
--undo.so: $(topdir)/rlprivate.h |
817 |
--util.so: $(topdir)/rlprivate.h |
818 |
--vi_mode.so: $(topdir)/rlprivate.h |
819 |
-- |
820 |
--bind.so: $(topdir)/xmalloc.h |
821 |
--complete.so: $(topdir)/xmalloc.h |
822 |
--display.so: $(topdir)/xmalloc.h |
823 |
--funmap.so: $(topdir)/xmalloc.h |
824 |
--histexpand.so: $(topdir)/xmalloc.h |
825 |
--histfile.so: $(topdir)/xmalloc.h |
826 |
--history.so: $(topdir)/xmalloc.h |
827 |
--input.so: $(topdir)/xmalloc.h |
828 |
--isearch.so: $(topdir)/xmalloc.h |
829 |
--keymaps.so: $(topdir)/xmalloc.h |
830 |
--kill.so: $(topdir)/xmalloc.h |
831 |
--macro.so: $(topdir)/xmalloc.h |
832 |
--mbutil.so: $(topdir)/xmalloc.h |
833 |
--misc.so: $(topdir)/xmalloc.h |
834 |
--readline.so: $(topdir)/xmalloc.h |
835 |
--savestring.so: $(topdir)/xmalloc.h |
836 |
--search.so: $(topdir)/xmalloc.h |
837 |
--shell.so: $(topdir)/xmalloc.h |
838 |
--terminal.so: $(topdir)/xmalloc.h |
839 |
--text.so: $(topdir)/xmalloc.h |
840 |
--tilde.so: $(topdir)/xmalloc.h |
841 |
--undo.so: $(topdir)/xmalloc.h |
842 |
--util.so: $(topdir)/xmalloc.h |
843 |
--vi_mode.so: $(topdir)/xmalloc.h |
844 |
--xfree.so: $(topdir)/xmalloc.h |
845 |
--xmalloc.so: $(topdir)/xmalloc.h |
846 |
-+parens.$(SO): $(topdir)/rlconf.h ${BUILD_DIR}/config.h |
847 |
-+parens.$(SO): $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h |
848 |
-+parens.$(SO): $(topdir)/rltypedefs.h |
849 |
-+parens.$(SO): $(topdir)/tilde.h |
850 |
-+rltty.$(SO): $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h |
851 |
-+rltty.$(SO): $(topdir)/rltty.h $(topdir)/tilde.h |
852 |
-+rltty.$(SO): $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h |
853 |
-+rltty.$(SO): $(topdir)/rltypedefs.h |
854 |
-+search.$(SO): $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h |
855 |
-+search.$(SO): $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h |
856 |
-+search.$(SO): $(topdir)/ansi_stdlib.h $(topdir)/history.h $(topdir)/tilde.h |
857 |
-+search.$(SO): $(topdir)/rltypedefs.h |
858 |
-+signals.$(SO): $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h |
859 |
-+signals.$(SO): $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h |
860 |
-+signals.$(SO): $(topdir)/history.h $(topdir)/tilde.h |
861 |
-+signals.$(SO): $(topdir)/rltypedefs.h |
862 |
-+terminal.$(SO): $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h |
863 |
-+terminal.$(SO): $(topdir)/tcap.h |
864 |
-+terminal.$(SO): $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h |
865 |
-+terminal.$(SO): $(topdir)/tilde.h $(topdir)/history.h |
866 |
-+terminal.$(SO): $(topdir)/rltypedefs.h |
867 |
-+text.$(SO): $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h |
868 |
-+text.$(SO): $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h |
869 |
-+text.$(SO): $(topdir)/rltypedefs.h |
870 |
-+text.$(SO): $(topdir)/history.h $(topdir)/tilde.h $(topdir)/ansi_stdlib.h |
871 |
-+tilde.$(SO): $(topdir)/ansi_stdlib.h ${BUILD_DIR}/config.h $(topdir)/tilde.h |
872 |
-+undo.$(SO): $(topdir)/ansi_stdlib.h |
873 |
-+undo.$(SO): $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h |
874 |
-+undo.$(SO): $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h |
875 |
-+undo.$(SO): $(topdir)/rltypedefs.h |
876 |
-+undo.$(SO): $(topdir)/tilde.h $(topdir)/history.h |
877 |
-+util.$(SO): $(topdir)/posixjmp.h $(topdir)/ansi_stdlib.h |
878 |
-+util.$(SO): $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h |
879 |
-+util.$(SO): $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h |
880 |
-+util.$(SO): $(topdir)/rltypedefs.h $(topdir)/tilde.h |
881 |
-+vi_mode.$(SO): $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h |
882 |
-+vi_mode.$(SO): $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h |
883 |
-+vi_mode.$(SO): $(topdir)/history.h $(topdir)/ansi_stdlib.h $(topdir)/tilde.h |
884 |
-+vi_mode.$(SO): $(topdir)/rltypedefs.h |
885 |
-+xfree.$(SO): ${BUILD_DIR}/config.h |
886 |
-+xfree.$(SO): $(topdir)/ansi_stdlib.h |
887 |
-+xmalloc.$(SO): ${BUILD_DIR}/config.h |
888 |
-+xmalloc.$(SO): $(topdir)/ansi_stdlib.h |
889 |
-+ |
890 |
-+bind.$(SO): $(topdir)/rlshell.h |
891 |
-+histfile.$(SO): $(topdir)/rlshell.h |
892 |
-+nls.$(SO): $(topdir)/rlshell.h |
893 |
-+readline.$(SO): $(topdir)/rlshell.h |
894 |
-+shell.$(SO): $(topdir)/rlshell.h |
895 |
-+terminal.$(SO): $(topdir)/rlshell.h |
896 |
-+histexpand.$(SO): $(topdir)/rlshell.h |
897 |
-+ |
898 |
-+bind.$(SO): $(topdir)/rlprivate.h |
899 |
-+callback.$(SO): $(topdir)/rlprivate.h |
900 |
-+complete.$(SO): $(topdir)/rlprivate.h |
901 |
-+display.$(SO): $(topdir)/rlprivate.h |
902 |
-+input.$(SO): $(topdir)/rlprivate.h |
903 |
-+isearch.$(SO): $(topdir)/rlprivate.h |
904 |
-+kill.$(SO): $(topdir)/rlprivate.h |
905 |
-+macro.$(SO): $(topdir)/rlprivate.h |
906 |
-+mbutil.$(SO): $(topdir)/rlprivate.h |
907 |
-+misc.$(SO): $(topdir)/rlprivate.h |
908 |
-+nls.$(SO): $(topdir)/rlprivate.h |
909 |
-+parens.$(SO): $(topdir)/rlprivate.h |
910 |
-+readline.$(SO): $(topdir)/rlprivate.h |
911 |
-+rltty.$(SO): $(topdir)/rlprivate.h |
912 |
-+search.$(SO): $(topdir)/rlprivate.h |
913 |
-+signals.$(SO): $(topdir)/rlprivate.h |
914 |
-+terminal.$(SO): $(topdir)/rlprivate.h |
915 |
-+text.$(SO): $(topdir)/rlprivate.h |
916 |
-+undo.$(SO): $(topdir)/rlprivate.h |
917 |
-+util.$(SO): $(topdir)/rlprivate.h |
918 |
-+vi_mode.$(SO): $(topdir)/rlprivate.h |
919 |
-+ |
920 |
-+bind.$(SO): $(topdir)/xmalloc.h |
921 |
-+complete.$(SO): $(topdir)/xmalloc.h |
922 |
-+display.$(SO): $(topdir)/xmalloc.h |
923 |
-+funmap.$(SO): $(topdir)/xmalloc.h |
924 |
-+histexpand.$(SO): $(topdir)/xmalloc.h |
925 |
-+histfile.$(SO): $(topdir)/xmalloc.h |
926 |
-+history.$(SO): $(topdir)/xmalloc.h |
927 |
-+input.$(SO): $(topdir)/xmalloc.h |
928 |
-+isearch.$(SO): $(topdir)/xmalloc.h |
929 |
-+keymaps.$(SO): $(topdir)/xmalloc.h |
930 |
-+kill.$(SO): $(topdir)/xmalloc.h |
931 |
-+macro.$(SO): $(topdir)/xmalloc.h |
932 |
-+mbutil.$(SO): $(topdir)/xmalloc.h |
933 |
-+misc.$(SO): $(topdir)/xmalloc.h |
934 |
-+readline.$(SO): $(topdir)/xmalloc.h |
935 |
-+savestring.$(SO): $(topdir)/xmalloc.h |
936 |
-+search.$(SO): $(topdir)/xmalloc.h |
937 |
-+shell.$(SO): $(topdir)/xmalloc.h |
938 |
-+terminal.$(SO): $(topdir)/xmalloc.h |
939 |
-+text.$(SO): $(topdir)/xmalloc.h |
940 |
-+tilde.$(SO): $(topdir)/xmalloc.h |
941 |
-+undo.$(SO): $(topdir)/xmalloc.h |
942 |
-+util.$(SO): $(topdir)/xmalloc.h |
943 |
-+vi_mode.$(SO): $(topdir)/xmalloc.h |
944 |
-+xfree.$(SO): $(topdir)/xmalloc.h |
945 |
-+xmalloc.$(SO): $(topdir)/xmalloc.h |
946 |
- |
947 |
- complete.o: $(topdir)/rlmbutil.h |
948 |
- display.o: $(topdir)/rlmbutil.h |
949 |
-@@ -391,72 +455,72 @@ |
950 |
- text.o: $(topdir)/rlmbutil.h |
951 |
- vi_mode.o: $(topdir)/rlmbutil.h |
952 |
- |
953 |
--bind.so: $(topdir)/bind.c |
954 |
--callback.so: $(topdir)/callback.c |
955 |
--compat.so: $(topdir)/compat.c |
956 |
--complete.so: $(topdir)/complete.c |
957 |
--display.so: $(topdir)/display.c |
958 |
--funmap.so: $(topdir)/funmap.c |
959 |
--input.so: $(topdir)/input.c |
960 |
--isearch.so: $(topdir)/isearch.c |
961 |
--keymaps.so: $(topdir)/keymaps.c $(topdir)/emacs_keymap.c $(topdir)/vi_keymap.c |
962 |
--kill.so: $(topdir)/kill.c |
963 |
--macro.so: $(topdir)/macro.c |
964 |
--mbutil.so: $(topdir)/mbutil.c |
965 |
--misc.so: $(topdir)/mbutil.c |
966 |
--nls.so: $(topdir)/nls.c |
967 |
--parens.so: $(topdir)/parens.c |
968 |
--readline.so: $(topdir)/readline.c |
969 |
--rltty.so: $(topdir)/rltty.c |
970 |
--savestring.so: $(topdir)/savestring.c |
971 |
--search.so: $(topdir)/search.c |
972 |
--shell.so: $(topdir)/shell.c |
973 |
--signals.so: $(topdir)/signals.c |
974 |
--terminal.so: $(topdir)/terminal.c |
975 |
--text.so: $(topdir)/text.c |
976 |
--tilde.so: $(topdir)/tilde.c |
977 |
--undo.so: $(topdir)/undo.c |
978 |
--util.so: $(topdir)/util.c |
979 |
--vi_mode.so: $(topdir)/vi_mode.c |
980 |
--xfree.so: $(topdir)/xfree.c |
981 |
--xmalloc.so: $(topdir)/xmalloc.c |
982 |
-- |
983 |
--histexpand.so: $(topdir)/histexpand.c |
984 |
--histfile.so: $(topdir)/histfile.c |
985 |
--history.so: $(topdir)/history.c |
986 |
--histsearch.so: $(topdir)/histsearch.c |
987 |
-- |
988 |
--bind.so: bind.c |
989 |
--callback.so: callback.c |
990 |
--comapt.so: compat.c |
991 |
--complete.so: complete.c |
992 |
--display.so: display.c |
993 |
--funmap.so: funmap.c |
994 |
--input.so: input.c |
995 |
--isearch.so: isearch.c |
996 |
--keymaps.so: keymaps.c emacs_keymap.c vi_keymap.c |
997 |
--kill.so: kill.c |
998 |
--macro.so: macro.c |
999 |
--mbutil.so: mbutil.c |
1000 |
--misc.so: misc.c |
1001 |
--nls.so: nls.c |
1002 |
--parens.so: parens.c |
1003 |
--readline.so: readline.c |
1004 |
--rltty.so: rltty.c |
1005 |
--savestring.so: savestring.c |
1006 |
--search.so: search.c |
1007 |
--signals.so: signals.c |
1008 |
--shell.so: shell.c |
1009 |
--terminal.so: terminal.c |
1010 |
--text.so: text.c |
1011 |
--tilde.so: tilde.c |
1012 |
--undo.so: undo.c |
1013 |
--util.so: util.c |
1014 |
--vi_mode.so: vi_mode.c |
1015 |
--xfree.so: xfree.c |
1016 |
--xmalloc.so: xmalloc.c |
1017 |
-- |
1018 |
--histexpand.so: histexpand.c |
1019 |
--histfile.so: histfile.c |
1020 |
--history.so: history.c |
1021 |
--histsearch.so: histsearch.c |
1022 |
-+bind.$(SO): $(topdir)/bind.c |
1023 |
-+callback.$(SO): $(topdir)/callback.c |
1024 |
-+compat.$(SO): $(topdir)/compat.c |
1025 |
-+complete.$(SO): $(topdir)/complete.c |
1026 |
-+display.$(SO): $(topdir)/display.c |
1027 |
-+funmap.$(SO): $(topdir)/funmap.c |
1028 |
-+input.$(SO): $(topdir)/input.c |
1029 |
-+isearch.$(SO): $(topdir)/isearch.c |
1030 |
-+keymaps.$(SO): $(topdir)/keymaps.c $(topdir)/emacs_keymap.c $(topdir)/vi_keymap.c |
1031 |
-+kill.$(SO): $(topdir)/kill.c |
1032 |
-+macro.$(SO): $(topdir)/macro.c |
1033 |
-+mbutil.$(SO): $(topdir)/mbutil.c |
1034 |
-+misc.$(SO): $(topdir)/mbutil.c |
1035 |
-+nls.$(SO): $(topdir)/nls.c |
1036 |
-+parens.$(SO): $(topdir)/parens.c |
1037 |
-+readline.$(SO): $(topdir)/readline.c |
1038 |
-+rltty.$(SO): $(topdir)/rltty.c |
1039 |
-+savestring.$(SO): $(topdir)/savestring.c |
1040 |
-+search.$(SO): $(topdir)/search.c |
1041 |
-+shell.$(SO): $(topdir)/shell.c |
1042 |
-+signals.$(SO): $(topdir)/signals.c |
1043 |
-+terminal.$(SO): $(topdir)/terminal.c |
1044 |
-+text.$(SO): $(topdir)/text.c |
1045 |
-+tilde.$(SO): $(topdir)/tilde.c |
1046 |
-+undo.$(SO): $(topdir)/undo.c |
1047 |
-+util.$(SO): $(topdir)/util.c |
1048 |
-+vi_mode.$(SO): $(topdir)/vi_mode.c |
1049 |
-+xfree.$(SO): $(topdir)/xfree.c |
1050 |
-+xmalloc.$(SO): $(topdir)/xmalloc.c |
1051 |
-+ |
1052 |
-+histexpand.$(SO): $(topdir)/histexpand.c |
1053 |
-+histfile.$(SO): $(topdir)/histfile.c |
1054 |
-+history.$(SO): $(topdir)/history.c |
1055 |
-+histsearch.$(SO): $(topdir)/histsearch.c |
1056 |
-+ |
1057 |
-+bind.$(SO): bind.c |
1058 |
-+callback.$(SO): callback.c |
1059 |
-+comapt.$(SO): compat.c |
1060 |
-+complete.$(SO): complete.c |
1061 |
-+display.$(SO): display.c |
1062 |
-+funmap.$(SO): funmap.c |
1063 |
-+input.$(SO): input.c |
1064 |
-+isearch.$(SO): isearch.c |
1065 |
-+keymaps.$(SO): keymaps.c emacs_keymap.c vi_keymap.c |
1066 |
-+kill.$(SO): kill.c |
1067 |
-+macro.$(SO): macro.c |
1068 |
-+mbutil.$(SO): mbutil.c |
1069 |
-+misc.$(SO): misc.c |
1070 |
-+nls.$(SO): nls.c |
1071 |
-+parens.$(SO): parens.c |
1072 |
-+readline.$(SO): readline.c |
1073 |
-+rltty.$(SO): rltty.c |
1074 |
-+savestring.$(SO): savestring.c |
1075 |
-+search.$(SO): search.c |
1076 |
-+signals.$(SO): signals.c |
1077 |
-+shell.$(SO): shell.c |
1078 |
-+terminal.$(SO): terminal.c |
1079 |
-+text.$(SO): text.c |
1080 |
-+tilde.$(SO): tilde.c |
1081 |
-+undo.$(SO): undo.c |
1082 |
-+util.$(SO): util.c |
1083 |
-+vi_mode.$(SO): vi_mode.c |
1084 |
-+xfree.$(SO): xfree.c |
1085 |
-+xmalloc.$(SO): xmalloc.c |
1086 |
-+ |
1087 |
-+histexpand.$(SO): histexpand.c |
1088 |
-+histfile.$(SO): histfile.c |
1089 |
-+history.$(SO): history.c |
1090 |
-+histsearch.$(SO): histsearch.c |
1091 |
---- examples/rlfe/Makefile.in.orig 2014-04-15 11:49:12 +0200 |
1092 |
-+++ examples/rlfe/Makefile.in 2014-04-15 11:49:27 +0200 |
1093 |
-@@ -49,7 +49,7 @@ |
1094 |
- all: rlfe |
1095 |
- |
1096 |
- rlfe: $(OFILES) |
1097 |
-- $(CC) $(LDFLAGS) -o $@ $(OFILES) $(LIBS) |
1098 |
-+ $(LTLINK) $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(OFILES) $(LIBS) |
1099 |
- |
1100 |
- rlfe-$(VERSION).tar.gz: |
1101 |
- tar czf $@ $(CFILES) $(HFILES) $(EXTRA_DIST) |
1102 |
|
1103 |
diff --git a/sys-libs/readline/files/readline-6.3-read-eof.patch b/sys-libs/readline/files/readline-6.3-read-eof.patch |
1104 |
new file mode 100644 |
1105 |
index 0000000000..f74aad63be |
1106 |
--- /dev/null |
1107 |
+++ b/sys-libs/readline/files/readline-6.3-read-eof.patch |
1108 |
@@ -0,0 +1,54 @@ |
1109 |
+http://lists.gnu.org/archive/html/bug-bash/2014-12/msg00152.html |
1110 |
+ |
1111 |
+*** ../bash-4.3-patched/lib/readline/readline.c 2014-10-01 13:08:28.000000000 -0400 |
1112 |
+--- lib/readline/readline.c 2014-12-20 22:37:28.000000000 -0500 |
1113 |
+*************** |
1114 |
+*** 580,592 **** |
1115 |
+ } |
1116 |
+ |
1117 |
+! /* EOF typed to a non-blank line is a <NL>. If we want to change this, |
1118 |
+! to force any existing line to be ignored when read(2) reads EOF, |
1119 |
+! for example, this is the place to change. */ |
1120 |
+ if (c == EOF && rl_end) |
1121 |
+! c = NEWLINE; |
1122 |
+ |
1123 |
+ /* The character _rl_eof_char typed to blank line, and not as the |
1124 |
+! previous character is interpreted as EOF. */ |
1125 |
+! if (((c == _rl_eof_char && lastc != c) || c == EOF) && !rl_end) |
1126 |
+ { |
1127 |
+ #if defined (READLINE_CALLBACKS) |
1128 |
+--- 587,620 ---- |
1129 |
+ } |
1130 |
+ |
1131 |
+! /* EOF typed to a non-blank line is ^D the first time, EOF the second |
1132 |
+! time in a row. This won't return any partial line read from the tty. |
1133 |
+! If we want to change this, to force any existing line to be returned |
1134 |
+! when read(2) reads EOF, for example, this is the place to change. */ |
1135 |
+ if (c == EOF && rl_end) |
1136 |
+! { |
1137 |
+! if (RL_SIG_RECEIVED ()) |
1138 |
+! { |
1139 |
+! RL_CHECK_SIGNALS (); |
1140 |
+! if (rl_signal_event_hook) |
1141 |
+! (*rl_signal_event_hook) (); /* XXX */ |
1142 |
+! } |
1143 |
+! |
1144 |
+! /* XXX - reading two consecutive EOFs returns EOF */ |
1145 |
+! if (RL_ISSTATE (RL_STATE_TERMPREPPED)) |
1146 |
+! { |
1147 |
+! if (lastc == _rl_eof_char || lastc == EOF) |
1148 |
+! rl_end = 0; |
1149 |
+! else |
1150 |
+! c = _rl_eof_char; |
1151 |
+! } |
1152 |
+! else |
1153 |
+! c = NEWLINE; |
1154 |
+! } |
1155 |
+ |
1156 |
+ /* The character _rl_eof_char typed to blank line, and not as the |
1157 |
+! previous character is interpreted as EOF. This doesn't work when |
1158 |
+! READLINE_CALLBACKS is defined, so hitting a series of ^Ds will |
1159 |
+! erase all the chars on the line and then return EOF. */ |
1160 |
+! if (((c == _rl_eof_char && lastc != c) || c == EOF) && rl_end == 0) |
1161 |
+ { |
1162 |
+ #if defined (READLINE_CALLBACKS) |
1163 |
|
1164 |
diff --git a/sys-libs/readline/readline-5.2_p14.ebuild b/sys-libs/readline/readline-5.2_p14.ebuild |
1165 |
deleted file mode 100644 |
1166 |
index b3695ca2d6..0000000000 |
1167 |
--- a/sys-libs/readline/readline-5.2_p14.ebuild |
1168 |
+++ /dev/null |
1169 |
@@ -1,76 +0,0 @@ |
1170 |
-# Copyright 1999-2017 Gentoo Foundation |
1171 |
-# Distributed under the terms of the GNU General Public License v2 |
1172 |
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-5.2_p14.ebuild,v 1.2 2010/01/05 00:54:25 vapier Exp $ |
1173 |
- |
1174 |
-# This version is just for the ABI .5 library |
1175 |
- |
1176 |
-inherit eutils multilib flag-o-matic |
1177 |
- |
1178 |
-# Official patches |
1179 |
-# See ftp://ftp.cwru.edu/pub/bash/readline-5.1-patches/ |
1180 |
-PLEVEL=${PV##*_p} |
1181 |
-MY_PV=${PV/_p*} |
1182 |
-MY_P=${PN}-${MY_PV} |
1183 |
-[[ ${PV} != *_p* ]] && PLEVEL=0 |
1184 |
-patches() { |
1185 |
- [[ ${PLEVEL} -eq 0 ]] && return 1 |
1186 |
- local opt=$1 |
1187 |
- eval set -- {1..${PLEVEL}} |
1188 |
- set -- $(printf "${PN}${MY_PV/\.}-%03d " "$@") |
1189 |
- if [[ ${opt} == -s ]] ; then |
1190 |
- echo "${@/#/${DISTDIR}/}" |
1191 |
- else |
1192 |
- local u |
1193 |
- for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${PN} ; do |
1194 |
- printf "${u}/${PN}-${MY_PV}-patches/%s " "$@" |
1195 |
- done |
1196 |
- fi |
1197 |
-} |
1198 |
- |
1199 |
-DESCRIPTION="Another cute console display library" |
1200 |
-HOMEPAGE="http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html" |
1201 |
-SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz $(patches)" |
1202 |
- |
1203 |
-LICENSE="GPL-2" |
1204 |
-SLOT="${PV:0:1}" |
1205 |
-KEYWORDS="~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
1206 |
-IUSE="" |
1207 |
- |
1208 |
-RDEPEND=">=sys-libs/ncurses-5.2-r2" |
1209 |
-DEPEND="${RDEPEND}" |
1210 |
- |
1211 |
-S=${WORKDIR}/${MY_P} |
1212 |
- |
1213 |
-src_unpack() { |
1214 |
- unpack ${MY_P}.tar.gz |
1215 |
- cd "${S}" |
1216 |
- [[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s) |
1217 |
- epatch "${FILESDIR}"/${PN}-5.0-no_rpath.patch |
1218 |
- |
1219 |
- # missing patch for 'support/shlib-install' in p12 (netbsd, aix5, interix). |
1220 |
- epatch "${FILESDIR}"/${PN}-5.2_p12-shlib-install.patch |
1221 |
- epatch "${FILESDIR}"/${PN}-5.2-interix.patch |
1222 |
- epatch "${FILESDIR}"/${PN}-5.2-ia64hpux.patch |
1223 |
- epatch "${FILESDIR}"/${PN}-5.2-aixdll.patch |
1224 |
- epatch "${FILESDIR}"/${PN}-5.2-mint.patch |
1225 |
- epatch "${FILESDIR}"/${PN}-5.2-solaris-fPIC.patch |
1226 |
- |
1227 |
- # force ncurses linking #71420 |
1228 |
- sed -i -e 's:^SHLIB_LIBS=:SHLIB_LIBS=-lncurses:' support/shobj-conf || die "sed" |
1229 |
-} |
1230 |
- |
1231 |
-src_compile() { |
1232 |
- append-flags -D_GNU_SOURCE |
1233 |
- |
1234 |
- econf \ |
1235 |
- --with-curses \ |
1236 |
- --disable-static \ |
1237 |
- --libdir="${EPREFIX}"/usr/$(get_libdir) \ |
1238 |
- || die |
1239 |
- emake -C shlib || die |
1240 |
-} |
1241 |
- |
1242 |
-src_install() { |
1243 |
- emake -C shlib DESTDIR="${D}" install || die |
1244 |
- rm -f "${ED}"/usr/lib*/*$(get_libname) |
1245 |
-} |
1246 |
|
1247 |
diff --git a/sys-libs/readline/readline-6.2_p1-r1.ebuild b/sys-libs/readline/readline-6.2_p1-r1.ebuild |
1248 |
deleted file mode 100644 |
1249 |
index e6305e4847..0000000000 |
1250 |
--- a/sys-libs/readline/readline-6.2_p1-r1.ebuild |
1251 |
+++ /dev/null |
1252 |
@@ -1,136 +0,0 @@ |
1253 |
-# Copyright 1999-2017 Gentoo Foundation |
1254 |
-# Distributed under the terms of the GNU General Public License v2 |
1255 |
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-6.2_p1-r1.ebuild,v 1.4 2012/04/30 01:36:43 vapier Exp $ |
1256 |
- |
1257 |
-inherit eutils multilib toolchain-funcs flag-o-matic libtool |
1258 |
- |
1259 |
-# Official patches |
1260 |
-# See ftp://ftp.cwru.edu/pub/bash/readline-6.0-patches/ |
1261 |
-PLEVEL=${PV##*_p} |
1262 |
-MY_PV=${PV/_p*} |
1263 |
-MY_PV=${MY_PV/_/-} |
1264 |
-MY_P=${PN}-${MY_PV} |
1265 |
-[[ ${PV} != *_p* ]] && PLEVEL=0 |
1266 |
-patches() { |
1267 |
- [[ ${PLEVEL} -eq 0 ]] && return 1 |
1268 |
- local opt=$1 |
1269 |
- eval set -- {1..${PLEVEL}} |
1270 |
- set -- $(printf "${PN}${MY_PV/\.}-%03d " "$@") |
1271 |
- if [[ ${opt} == -s ]] ; then |
1272 |
- echo "${@/#/${DISTDIR}/}" |
1273 |
- else |
1274 |
- local u |
1275 |
- for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${PN} ; do |
1276 |
- printf "${u}/${PN}-${MY_PV}-patches/%s " "$@" |
1277 |
- done |
1278 |
- fi |
1279 |
-} |
1280 |
- |
1281 |
-DESCRIPTION="Another cute console display library" |
1282 |
-HOMEPAGE="http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html" |
1283 |
-HOSTLTV="0.1.0" |
1284 |
-HOSTLT="host-libtool-${HOSTLTV}" |
1285 |
-HOSTLT_URI="http://github.com/haubi/host-libtool/releases/download/v${HOSTLTV}/${HOSTLT}.tar.gz" |
1286 |
-SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz $(patches) ${HOSTLT_URI}" |
1287 |
-HOSTLT_S=${WORKDIR}/${HOSTLT} |
1288 |
- |
1289 |
-LICENSE="GPL-3" |
1290 |
-SLOT="0" |
1291 |
-KEYWORDS="~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
1292 |
-IUSE="static-libs" |
1293 |
- |
1294 |
-RDEPEND=">=sys-libs/ncurses-5.2-r2" |
1295 |
-DEPEND="${RDEPEND}" |
1296 |
- |
1297 |
-S=${WORKDIR}/${MY_P} |
1298 |
- |
1299 |
-src_unpack() { |
1300 |
- unpack ${HOSTLT}.tar.gz |
1301 |
- S="${HOSTLT_S}" elibtoolize |
1302 |
- |
1303 |
- unpack ${MY_P}.tar.gz |
1304 |
- |
1305 |
- cd "${S}" |
1306 |
- [[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s) |
1307 |
- |
1308 |
- epatch "${FILESDIR}"/${PN}-5.0-no_rpath.patch |
1309 |
- epatch "${FILESDIR}"/${PN}-5.2-no-ignore-shlib-errors.patch #216952 |
1310 |
- |
1311 |
- epatch "${FILESDIR}"/${PN}-5.1-rlfe-extern.patch |
1312 |
- epatch "${FILESDIR}"/${PN}-5.2-rlfe-aix-eff_uid.patch |
1313 |
- epatch "${FILESDIR}"/${PN}-5.2-rlfe-hpux.patch |
1314 |
- epatch "${FILESDIR}"/${PN}-6.0-rlfe-solaris.patch |
1315 |
- epatch "${FILESDIR}"/${PN}-5.2-interix.patch |
1316 |
- epatch "${FILESDIR}"/${PN}-5.2-ia64hpux.patch |
1317 |
- epatch "${FILESDIR}"/${PN}-6.0-mint.patch |
1318 |
- epatch "${FILESDIR}"/${PN}-6.1-darwin-shlib-versioning.patch |
1319 |
- epatch "${FILESDIR}"/${PN}-6.2-libtool.patch |
1320 |
- |
1321 |
- # force ncurses linking #71420 |
1322 |
- sed -i -e 's:^SHLIB_LIBS=:SHLIB_LIBS=-lncurses:' support/shobj-conf || die "sed" |
1323 |
- |
1324 |
- # fix building under Gentoo/FreeBSD; upstream FreeBSD deprecated |
1325 |
- # objformat for years, so we don't want to rely on that. |
1326 |
- sed -i -e '/objformat/s:if .*; then:if true; then:' support/shobj-conf || die |
1327 |
- |
1328 |
- # support OSX Lion, Mountain Lion and Mavericks |
1329 |
- sed -i -e 's/darwin10\*/darwin1\[0123\]\*/g' support/shobj-conf || die |
1330 |
- |
1331 |
- ln -s ../.. examples/rlfe/readline # for local readline headers |
1332 |
-} |
1333 |
- |
1334 |
-src_compile() { |
1335 |
- cd "${HOSTLT_S}" || die |
1336 |
- econf $(use_enable static-libs static) |
1337 |
- export PATH=${HOSTLT_S}:${PATH} |
1338 |
- |
1339 |
- cd "${S}" |
1340 |
- # fix implicit decls with widechar funcs |
1341 |
- append-cppflags -D_GNU_SOURCE |
1342 |
- # http://lists.gnu.org/archive/html/bug-readline/2010-07/msg00013.html |
1343 |
- append-cppflags -Dxrealloc=_rl_realloc -Dxmalloc=_rl_malloc -Dxfree=_rl_free |
1344 |
- |
1345 |
- # This is for rlfe, but we need to make sure LDFLAGS doesn't change |
1346 |
- # so we can re-use the config cache file between the two. |
1347 |
- export LDFLAGS="-L${S}/shlib ${LDFLAGS}" # search local dirs first |
1348 |
- econf \ |
1349 |
- --cache-file="${S}"/config.cache \ |
1350 |
- --with-curses \ |
1351 |
- --disable-shared # use libtool instead |
1352 |
- emake shared || die |
1353 |
- |
1354 |
- if ! tc-is-cross-compiler ; then |
1355 |
- # code is full of AC_TRY_RUN() |
1356 |
- cd examples/rlfe |
1357 |
- econf --cache-file="${S}"/config.cache |
1358 |
- emake LTLINK='libtool --mode=link --tag=CC' || die |
1359 |
- fi |
1360 |
-} |
1361 |
- |
1362 |
-src_install() { |
1363 |
- export PATH=${HOSTLT_S}:${PATH} |
1364 |
- |
1365 |
- emake DESTDIR="${D}" install-shared || die |
1366 |
- |
1367 |
- if ! tc-is-cross-compiler; then |
1368 |
- libtool --mode=install install examples/rlfe/rlfe "${ED%/}${DESTTREE}"/bin || die |
1369 |
- fi |
1370 |
- |
1371 |
- # must come after installing rlfe, bug #455512 |
1372 |
- gen_usr_ldscript -a readline history #4411 |
1373 |
- |
1374 |
- dodoc CHANGELOG CHANGES README USAGE NEWS |
1375 |
- docinto ps |
1376 |
- dodoc doc/*.ps |
1377 |
- dohtml -r doc |
1378 |
-} |
1379 |
- |
1380 |
-pkg_preinst() { |
1381 |
- preserve_old_lib /$(get_libdir)/lib{history,readline}$(get_libname 4) #29865 |
1382 |
- preserve_old_lib /$(get_libdir)/lib{history,readline}$(get_libname 5) #29865 |
1383 |
-} |
1384 |
- |
1385 |
-pkg_postinst() { |
1386 |
- preserve_old_lib_notify /$(get_libdir)/lib{history,readline}$(get_libname 4) |
1387 |
- preserve_old_lib_notify /$(get_libdir)/lib{history,readline}$(get_libname 5) |
1388 |
-} |
1389 |
|
1390 |
diff --git a/sys-libs/readline/readline-6.3_p8-r1.ebuild b/sys-libs/readline/readline-6.3_p8-r1.ebuild |
1391 |
deleted file mode 100644 |
1392 |
index 5bd4fad69e..0000000000 |
1393 |
--- a/sys-libs/readline/readline-6.3_p8-r1.ebuild |
1394 |
+++ /dev/null |
1395 |
@@ -1,196 +0,0 @@ |
1396 |
-# Copyright 1999-2017 Gentoo Foundation |
1397 |
-# Distributed under the terms of the GNU General Public License v2 |
1398 |
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-6.3_p8-r1.ebuild,v 1.2 2014/12/29 07:42:08 polynomial-c Exp $ |
1399 |
- |
1400 |
-EAPI=4 |
1401 |
- |
1402 |
-inherit eutils multilib toolchain-funcs flag-o-matic multilib-minimal libtool |
1403 |
- |
1404 |
-# Official patches |
1405 |
-# See ftp://ftp.cwru.edu/pub/bash/readline-6.3-patches/ |
1406 |
-PLEVEL=${PV##*_p} |
1407 |
-MY_PV=${PV/_p*} |
1408 |
-MY_PV=${MY_PV/_/-} |
1409 |
-MY_P=${PN}-${MY_PV} |
1410 |
-[[ ${PV} != *_p* ]] && PLEVEL=0 |
1411 |
-patches() { |
1412 |
- [[ ${PLEVEL} -eq 0 ]] && return 1 |
1413 |
- local opt=$1 |
1414 |
- eval set -- {1..${PLEVEL}} |
1415 |
- set -- $(printf "${PN}${MY_PV/\.}-%03d " "$@") |
1416 |
- if [[ ${opt} == -s ]] ; then |
1417 |
- echo "${@/#/${DISTDIR}/}" |
1418 |
- else |
1419 |
- local u |
1420 |
- for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${PN} ; do |
1421 |
- printf "${u}/${PN}-${MY_PV}-patches/%s " "$@" |
1422 |
- done |
1423 |
- fi |
1424 |
-} |
1425 |
- |
1426 |
-DESCRIPTION="Another cute console display library" |
1427 |
-HOMEPAGE="http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html" |
1428 |
-HOSTLTV="0.1.0" |
1429 |
-HOSTLT="host-libtool-${HOSTLTV}" |
1430 |
-HOSTLT_URI="http://github.com/haubi/host-libtool/releases/download/v${HOSTLTV}/${HOSTLT}.tar.gz" |
1431 |
-SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz $(patches) ${HOSTLT_URI}" |
1432 |
-HOSTLT_S=${WORKDIR}/${HOSTLT} |
1433 |
- |
1434 |
-LICENSE="GPL-3" |
1435 |
-SLOT="0" |
1436 |
- |
1437 |
-# see bug 530890 before installing on OS X |
1438 |
-KEYWORDS="~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
1439 |
-IUSE="static-libs" |
1440 |
- |
1441 |
-RDEPEND=">=sys-libs/ncurses-5.9-r3[${MULTILIB_USEDEP}] |
1442 |
- abi_x86_32? ( |
1443 |
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] |
1444 |
- !<=app-emulation/emul-linux-x86-baselibs-20131008-r7 |
1445 |
- )" |
1446 |
-DEPEND="${RDEPEND} |
1447 |
- virtual/pkgconfig" |
1448 |
- |
1449 |
-S=${WORKDIR}/${MY_P} |
1450 |
- |
1451 |
-src_unpack() { |
1452 |
- unpack ${HOSTLT}.tar.gz |
1453 |
- S="${HOSTLT_S}" elibtoolize |
1454 |
- unpack ${MY_P}.tar.gz |
1455 |
-} |
1456 |
- |
1457 |
-src_prepare() { |
1458 |
- [[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s) |
1459 |
- |
1460 |
- epatch "${FILESDIR}"/${PN}-5.0-no_rpath.patch |
1461 |
- epatch "${FILESDIR}"/${PN}-5.1-rlfe-extern.patch |
1462 |
- epatch "${FILESDIR}"/${PN}-5.2-rlfe-aix-eff_uid.patch |
1463 |
- epatch "${FILESDIR}"/${PN}-5.2-rlfe-hpux.patch |
1464 |
- epatch "${FILESDIR}"/${PN}-5.2-ia64hpux.patch |
1465 |
- epatch "${FILESDIR}"/${PN}-6.0-mint.patch |
1466 |
- epatch "${FILESDIR}"/${PN}-6.0-rlfe-solaris.patch |
1467 |
- epatch "${FILESDIR}"/${PN}-6.1-aix-soname.patch |
1468 |
- epatch "${FILESDIR}"/${PN}-6.1-aix-expfull.patch |
1469 |
- epatch "${FILESDIR}"/${PN}-6.2-rlfe-tgoto.patch #385091 |
1470 |
- epatch "${FILESDIR}"/${PN}-6.3-libtool.patch |
1471 |
- epatch "${FILESDIR}"/${PN}-6.3-interix.patch |
1472 |
- epatch "${FILESDIR}"/${PN}-6.3-darwin-shlib-versioning.patch |
1473 |
- epatch "${FILESDIR}"/${PN}-6.3-fix-long-prompt-vi-search.patch |
1474 |
- |
1475 |
- # Force ncurses linking. #71420 |
1476 |
- # Use pkg-config to get the right values. #457558 |
1477 |
- local ncurses_libs=$($(tc-getPKG_CONFIG) ncurses --libs) |
1478 |
- sed -i \ |
1479 |
- -e "/^SHLIB_LIBS=/s:=.*:='${ncurses_libs}':" \ |
1480 |
- support/shobj-conf || die |
1481 |
- sed -i \ |
1482 |
- -e "/^[[:space:]]*LIBS=.-lncurses/s:-lncurses:${ncurses_libs}:" \ |
1483 |
- examples/rlfe/configure || die |
1484 |
- |
1485 |
- # fix building under Gentoo/FreeBSD; upstream FreeBSD deprecated |
1486 |
- # objformat for years, so we don't want to rely on that. |
1487 |
- sed -i -e '/objformat/s:if .*; then:if true; then:' support/shobj-conf || die |
1488 |
- |
1489 |
- # support more recent OS X versions |
1490 |
- sed -i -e 's/darwin10\*/darwin1\[01234\]\*/g' support/shobj-conf || die |
1491 |
- |
1492 |
- ln -s ../.. examples/rlfe/readline # for local readline headers |
1493 |
-} |
1494 |
- |
1495 |
-src_configure() { |
1496 |
- cd "${HOSTLT_S}" || die |
1497 |
- econf $(use_enable static-libs static) |
1498 |
- export PATH="${HOSTLT_S}:${PATH}" |
1499 |
- cd "${S}" |
1500 |
- |
1501 |
- # fix implicit decls with widechar funcs |
1502 |
- append-cppflags -D_GNU_SOURCE |
1503 |
- # http://lists.gnu.org/archive/html/bug-readline/2010-07/msg00013.html |
1504 |
- append-cppflags -Dxrealloc=_rl_realloc -Dxmalloc=_rl_malloc -Dxfree=_rl_free |
1505 |
- |
1506 |
- # Make sure configure picks a better ar than `ar`. #484866 |
1507 |
- export ac_cv_prog_AR=$(tc-getAR) |
1508 |
- |
1509 |
- # Force the test since we used sed above to force it. |
1510 |
- export bash_cv_termcap_lib=ncurses |
1511 |
- |
1512 |
- # Control cross-compiling cases when we know the right answer. |
1513 |
- # In cases where the C library doesn't support wide characters, readline |
1514 |
- # itself won't work correctly, so forcing the answer below should be OK. |
1515 |
- if tc-is-cross-compiler ; then |
1516 |
- export bash_cv_func_sigsetjmp='present' |
1517 |
- export bash_cv_func_ctype_nonascii='yes' |
1518 |
- export bash_cv_wcwidth_broken='no' #503312 |
1519 |
- fi |
1520 |
- |
1521 |
- # This is for rlfe, but we need to make sure LDFLAGS doesn't change |
1522 |
- # so we can re-use the config cache file between the two. |
1523 |
- append-ldflags -L. |
1524 |
- export LDFLAGS="-L${S}/shlib ${LDFLAGS}" # search local dirs first |
1525 |
- |
1526 |
- multilib-minimal_src_configure |
1527 |
-} |
1528 |
- |
1529 |
-multilib_src_configure() { |
1530 |
- ECONF_SOURCE=${S} \ |
1531 |
- econf \ |
1532 |
- --cache-file="${BUILD_DIR}"/config.cache \ |
1533 |
- --docdir="${EPREFIX}"/usr/share/doc/${PF} \ |
1534 |
- --with-curses \ |
1535 |
- --disable-shared # use libtool instead |
1536 |
- |
1537 |
- if multilib_is_native_abi && ! tc-is-cross-compiler ; then |
1538 |
- # code is full of AC_TRY_RUN() |
1539 |
- mkdir -p examples/rlfe || die |
1540 |
- cd examples/rlfe || die |
1541 |
- ECONF_SOURCE=${S}/examples/rlfe \ |
1542 |
- econf --cache-file="${BUILD_DIR}"/config.cache |
1543 |
- fi |
1544 |
-} |
1545 |
- |
1546 |
-multilib_src_compile() { |
1547 |
- emake shared || die |
1548 |
- |
1549 |
- if multilib_is_native_abi && ! tc-is-cross-compiler ; then |
1550 |
- # code is full of AC_TRY_RUN() |
1551 |
- cd examples/rlfe || die |
1552 |
- local l |
1553 |
- for l in readline history ; do |
1554 |
- ln -s ../../shlib/lib${l}$(get_libname)* lib${l}$(get_libname) |
1555 |
- ln -sf ../../lib${l}.a lib${l}.a |
1556 |
- done |
1557 |
- emake LTLINK='libtool --mode=link --tag=CC' || die |
1558 |
- fi |
1559 |
-} |
1560 |
- |
1561 |
-multilib_src_install() { |
1562 |
- export PATH="${HOSTLT_S}:${PATH}" |
1563 |
- emake DESTDIR="${D}" install-shared || die |
1564 |
- |
1565 |
- if multilib_is_native_abi ; then |
1566 |
- if ! tc-is-cross-compiler; then |
1567 |
- dobin examples/rlfe/rlfe |
1568 |
- fi |
1569 |
- |
1570 |
- # must come after installing rlfe, bug #455512 |
1571 |
- gen_usr_ldscript -a readline history #4411 |
1572 |
- fi |
1573 |
-} |
1574 |
- |
1575 |
-multilib_src_install_all() { |
1576 |
- einstalldocs |
1577 |
- dodoc USAGE |
1578 |
- dohtml -r doc/. |
1579 |
- docinto ps |
1580 |
- dodoc doc/*.ps |
1581 |
-} |
1582 |
- |
1583 |
-pkg_preinst() { |
1584 |
- preserve_old_lib /$(get_libdir)/lib{history,readline}$(get_libname 4) #29865 |
1585 |
- preserve_old_lib /$(get_libdir)/lib{history,readline}$(get_libname 5) #29865 |
1586 |
-} |
1587 |
- |
1588 |
-pkg_postinst() { |
1589 |
- preserve_old_lib_notify /$(get_libdir)/lib{history,readline}$(get_libname 4) |
1590 |
- preserve_old_lib_notify /$(get_libdir)/lib{history,readline}$(get_libname 5) |
1591 |
-} |
1592 |
|
1593 |
diff --git a/sys-libs/readline/readline-6.3_p8-r01.1.ebuild b/sys-libs/readline/readline-6.3_p8-r3.ebuild |
1594 |
similarity index 70% |
1595 |
rename from sys-libs/readline/readline-6.3_p8-r01.1.ebuild |
1596 |
rename to sys-libs/readline/readline-6.3_p8-r3.ebuild |
1597 |
index 727da907e1..7aca649098 100644 |
1598 |
--- a/sys-libs/readline/readline-6.3_p8-r01.1.ebuild |
1599 |
+++ b/sys-libs/readline/readline-6.3_p8-r3.ebuild |
1600 |
@@ -1,10 +1,9 @@ |
1601 |
# Copyright 1999-2017 Gentoo Foundation |
1602 |
# Distributed under the terms of the GNU General Public License v2 |
1603 |
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-6.3_p8-r1.ebuild,v 1.2 2014/12/29 07:42:08 polynomial-c Exp $ |
1604 |
|
1605 |
-EAPI=4 |
1606 |
+EAPI=5 |
1607 |
|
1608 |
-inherit eutils multilib toolchain-funcs flag-o-matic multilib-minimal libtool |
1609 |
+inherit eutils multilib toolchain-funcs flag-o-matic multilib-minimal libtool ltprune |
1610 |
|
1611 |
# Official patches |
1612 |
# See ftp://ftp.cwru.edu/pub/bash/readline-6.3-patches/ |
1613 |
@@ -32,18 +31,16 @@ DESCRIPTION="Another cute console display library" |
1614 |
HOMEPAGE="http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html" |
1615 |
HOSTLTV="0.1.0" |
1616 |
HOSTLT="host-libtool-${HOSTLTV}" |
1617 |
-HOSTLT_URI="http://github.com/haubi/host-libtool/releases/download/v${HOSTLTV}/${HOSTLT}.tar.gz" |
1618 |
+HOSTLT_URI="https://github.com/haubi/host-libtool/releases/download/v${HOSTLTV}/${HOSTLT}.tar.gz" |
1619 |
SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz $(patches) ${HOSTLT_URI}" |
1620 |
HOSTLT_S=${WORKDIR}/${HOSTLT} |
1621 |
|
1622 |
LICENSE="GPL-3" |
1623 |
SLOT="0" |
1624 |
- |
1625 |
-# see bug 530890 before installing on OS X |
1626 |
KEYWORDS="~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
1627 |
-IUSE="static-libs" |
1628 |
+IUSE="static-libs utils" |
1629 |
|
1630 |
-RDEPEND=">=sys-libs/ncurses-5.9-r3[${MULTILIB_USEDEP}] |
1631 |
+RDEPEND=">=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] |
1632 |
abi_x86_32? ( |
1633 |
!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] |
1634 |
!<=app-emulation/emul-linux-x86-baselibs-20131008-r7 |
1635 |
@@ -53,6 +50,25 @@ DEPEND="${RDEPEND} |
1636 |
|
1637 |
S=${WORKDIR}/${MY_P} |
1638 |
|
1639 |
+PATCHES=( |
1640 |
+ "${FILESDIR}"/${PN}-5.0-no_rpath.patch |
1641 |
+ "${FILESDIR}"/${PN}-6.2-rlfe-tgoto.patch #385091 |
1642 |
+ "${FILESDIR}"/${PN}-6.3-fix-long-prompt-vi-search.patch |
1643 |
+ "${FILESDIR}"/${PN}-6.3-read-eof.patch |
1644 |
+ |
1645 |
+ "${FILESDIR}"/${PN}-5.2-rlfe-aix-eff_uid.patch |
1646 |
+ "${FILESDIR}"/${PN}-5.2-rlfe-hpux.patch |
1647 |
+ "${FILESDIR}"/${PN}-5.2-ia64hpux.patch |
1648 |
+ "${FILESDIR}"/${PN}-6.0-mint.patch |
1649 |
+ "${FILESDIR}"/${PN}-6.0-rlfe-solaris.patch |
1650 |
+ "${FILESDIR}"/${PN}-6.1-aix-soname.patch |
1651 |
+ "${FILESDIR}"/${PN}-6.1-aix-expfull.patch |
1652 |
+ "${FILESDIR}"/${PN}-6.3-interix.patch |
1653 |
+ "${FILESDIR}"/${PN}-6.3-darwin-shlib-versioning.patch |
1654 |
+ |
1655 |
+ "${FILESDIR}"/${PN}-6.3-libtool.patch # this enables building via libtool |
1656 |
+) |
1657 |
+ |
1658 |
src_unpack() { |
1659 |
unpack ${HOSTLT}.tar.gz |
1660 |
S="${HOSTLT_S}" elibtoolize |
1661 |
@@ -61,29 +77,16 @@ src_unpack() { |
1662 |
|
1663 |
src_prepare() { |
1664 |
[[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s) |
1665 |
- |
1666 |
- epatch "${FILESDIR}"/${PN}-5.0-no_rpath.patch |
1667 |
- epatch "${FILESDIR}"/${PN}-5.1-rlfe-extern.patch |
1668 |
- epatch "${FILESDIR}"/${PN}-5.2-rlfe-aix-eff_uid.patch |
1669 |
- epatch "${FILESDIR}"/${PN}-5.2-rlfe-hpux.patch |
1670 |
- epatch "${FILESDIR}"/${PN}-5.2-ia64hpux.patch |
1671 |
- epatch "${FILESDIR}"/${PN}-6.0-mint.patch |
1672 |
- epatch "${FILESDIR}"/${PN}-6.0-rlfe-solaris.patch |
1673 |
- epatch "${FILESDIR}"/${PN}-6.1-aix-soname.patch |
1674 |
- epatch "${FILESDIR}"/${PN}-6.1-aix-expfull.patch |
1675 |
- epatch "${FILESDIR}"/${PN}-6.2-rlfe-tgoto.patch #385091 |
1676 |
- epatch "${FILESDIR}"/${PN}-6.3-libtool.patch |
1677 |
- epatch "${FILESDIR}"/${PN}-6.3-interix.patch |
1678 |
- epatch "${FILESDIR}"/${PN}-6.3-darwin-shlib-versioning.patch |
1679 |
- epatch "${FILESDIR}"/${PN}-6.3-fix-long-prompt-vi-search.patch |
1680 |
+ epatch "${PATCHES[@]}" |
1681 |
|
1682 |
# Force ncurses linking. #71420 |
1683 |
- # Use pkg-config (may vary on ABI) to get the right values. #457558 |
1684 |
+ # Use pkg-config to get the right values. #457558 |
1685 |
+ local ncurses_libs=$($(tc-getPKG_CONFIG) ncurses --libs) |
1686 |
sed -i \ |
1687 |
- -e '/^SHLIB_LIBS=/s:=.*:="${ncurses_libs}":' \ |
1688 |
+ -e "/^SHLIB_LIBS=/s:=.*:='${ncurses_libs}':" \ |
1689 |
support/shobj-conf || die |
1690 |
sed -i \ |
1691 |
- -e '/^[[:space:]]*LIBS=.-lncurses/s:-lncurses:${ncurses_libs}:' \ |
1692 |
+ -e "/^[[:space:]]*LIBS=.-lncurses/s:-lncurses:${ncurses_libs}:" \ |
1693 |
examples/rlfe/configure || die |
1694 |
|
1695 |
# fix building under Gentoo/FreeBSD; upstream FreeBSD deprecated |
1696 |
@@ -96,7 +99,7 @@ src_prepare() { |
1697 |
ln -s ../.. examples/rlfe/readline # for local readline headers |
1698 |
} |
1699 |
|
1700 |
-multilib_src_configure() { |
1701 |
+src_configure() { |
1702 |
mkdir -p "${WORKDIR}/${HOSTLT}-${ABI}" || die |
1703 |
cd "${WORKDIR}/${HOSTLT}-${ABI}" || die |
1704 |
ECONF_SOURCE="${HOSTLT_S}" econf $(use_enable static-libs static) |
1705 |
@@ -107,7 +110,7 @@ multilib_src_configure() { |
1706 |
|
1707 |
# fix implicit decls with widechar funcs |
1708 |
append-cppflags -D_GNU_SOURCE |
1709 |
- # http://lists.gnu.org/archive/html/bug-readline/2010-07/msg00013.html |
1710 |
+ # https://lists.gnu.org/archive/html/bug-readline/2010-07/msg00013.html |
1711 |
append-cppflags -Dxrealloc=_rl_realloc -Dxmalloc=_rl_malloc -Dxfree=_rl_free |
1712 |
|
1713 |
# Make sure configure picks a better ar than `ar`. #484866 |
1714 |
@@ -130,14 +133,18 @@ multilib_src_configure() { |
1715 |
append-ldflags -L. |
1716 |
export LDFLAGS="-L${BUILD_DIR}/shlib ${LDFLAGS}" # search local dirs first |
1717 |
|
1718 |
+ multilib-minimal_src_configure |
1719 |
+} |
1720 |
+ |
1721 |
+multilib_src_configure() { |
1722 |
ECONF_SOURCE=${S} \ |
1723 |
econf \ |
1724 |
--cache-file="${BUILD_DIR}"/config.cache \ |
1725 |
- --docdir="${EPREFIX}"/usr/share/doc/${PF} \ |
1726 |
+ --docdir='$(datarootdir)'/doc/${PF} \ |
1727 |
--with-curses \ |
1728 |
--disable-shared # use libtool instead |
1729 |
|
1730 |
- if multilib_is_native_abi && ! tc-is-cross-compiler ; then |
1731 |
+ if use utils && multilib_is_native_abi && ! tc-is-cross-compiler ; then |
1732 |
# code is full of AC_TRY_RUN() |
1733 |
mkdir -p examples/rlfe || die |
1734 |
cd examples/rlfe || die |
1735 |
@@ -149,9 +156,9 @@ multilib_src_configure() { |
1736 |
multilib_src_compile() { |
1737 |
export PATH="${WORKDIR}/${HOSTLT}-${ABI}:${PATH}" |
1738 |
export ncurses_libs=$($(tc-getPKG_CONFIG) ncurses --libs) |
1739 |
- emake shared || die |
1740 |
+ emake shared |
1741 |
|
1742 |
- if multilib_is_native_abi && ! tc-is-cross-compiler ; then |
1743 |
+ if use utils && multilib_is_native_abi && ! tc-is-cross-compiler ; then |
1744 |
# code is full of AC_TRY_RUN() |
1745 |
cd examples/rlfe || die |
1746 |
local l |
1747 |
@@ -159,22 +166,21 @@ multilib_src_compile() { |
1748 |
ln -s ../../shlib/lib${l}$(get_libname)* lib${l}$(get_libname) |
1749 |
ln -sf ../../lib${l}.a lib${l}.a |
1750 |
done |
1751 |
- emake LTLINK='libtool --mode=link --tag=CC' || die |
1752 |
+ emake LTLINK='libtool --mode=link --tag=CC' |
1753 |
fi |
1754 |
} |
1755 |
|
1756 |
multilib_src_install() { |
1757 |
export PATH="${WORKDIR}/${HOSTLT}-${ABI}:${PATH}" |
1758 |
export ncurses_libs=$($(tc-getPKG_CONFIG) ncurses --libs) |
1759 |
- emake DESTDIR="${D}" install-shared || die |
1760 |
+ emake DESTDIR="${D}" install-shared |
1761 |
|
1762 |
if multilib_is_native_abi ; then |
1763 |
- if ! tc-is-cross-compiler; then |
1764 |
+ gen_usr_ldscript -a readline history #4411 |
1765 |
+ |
1766 |
+ if use utils && ! tc-is-cross-compiler; then |
1767 |
dobin examples/rlfe/rlfe |
1768 |
fi |
1769 |
- |
1770 |
- # must come after installing rlfe, bug #455512 |
1771 |
- gen_usr_ldscript -a readline history #4411 |
1772 |
fi |
1773 |
} |
1774 |
|
1775 |
@@ -184,14 +190,14 @@ multilib_src_install_all() { |
1776 |
dohtml -r doc/. |
1777 |
docinto ps |
1778 |
dodoc doc/*.ps |
1779 |
+ |
1780 |
+ prune_libtool_files --all |
1781 |
} |
1782 |
|
1783 |
pkg_preinst() { |
1784 |
preserve_old_lib /$(get_libdir)/lib{history,readline}$(get_libname 4) #29865 |
1785 |
- preserve_old_lib /$(get_libdir)/lib{history,readline}$(get_libname 5) #29865 |
1786 |
} |
1787 |
|
1788 |
pkg_postinst() { |
1789 |
preserve_old_lib_notify /$(get_libdir)/lib{history,readline}$(get_libname 4) |
1790 |
- preserve_old_lib_notify /$(get_libdir)/lib{history,readline}$(get_libname 5) |
1791 |
} |