Bernd Wurst commited on 2007-03-08 23:17:29
Zeige 41 geänderte Dateien mit 0 Einfügungen und 3281 Löschungen.
... | ... |
@@ -1,144 +0,0 @@ |
1 |
-# ChangeLog for dev-lang/erlang |
|
2 |
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 |
|
3 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/ChangeLog,v 1.30 2006/05/27 04:27:43 mkennedy Exp $ |
|
4 |
- |
|
5 |
-*erlang-11.2.0 (27 May 2006) |
|
6 |
- |
|
7 |
- 27 May 2006; Matthew Kennedy <mkennedy@gentoo.org> +erlang-11.2.0.ebuild: |
|
8 |
- New upstream version. |
|
9 |
- |
|
10 |
-*erlang-10.2.10 (10 Apr 2006) |
|
11 |
- |
|
12 |
- 10 Apr 2006; Matthew Kennedy <mkennedy@gentoo.org> |
|
13 |
- +files/glibc-2.4-fix.patch, +erlang-10.2.10.ebuild: |
|
14 |
- Include GLIBC 2.4 build fix; Resolves Bug #122383; Please see |
|
15 |
- http://www.erlang.org/ml-archive/erlang-questions/200601/msg00500.html for |
|
16 |
- more information on the GLIBC build fix. |
|
17 |
- |
|
18 |
- 07 Mar 2006; Mike Frysinger <vapier@gentoo.org> erlang-8b.ebuild, |
|
19 |
- erlang-9c.ebuild, erlang-9c-r1.ebuild, erlang-9c-r2.ebuild, |
|
20 |
- erlang-9c-r3.ebuild, erlang-10.2.0.ebuild, erlang-10.2.5.ebuild, |
|
21 |
- erlang-10.2.6.ebuild, erlang-10.2.7.ebuild: |
|
22 |
- Add support for modular X #121067. |
|
23 |
- |
|
24 |
- 28 Jan 2006; Simon Stelling <blubb@gentoo.org> +files/erlang-9c.patch, |
|
25 |
- -files/erlang-9c.patch.gz, erlang-9c-r1.ebuild: |
|
26 |
- no need to gzip smallish patches |
|
27 |
- |
|
28 |
- 03 Dec 2005; Fernando J. Pereda <ferdy@gentoo.org> erlang-10.2.7.ebuild: |
|
29 |
- marked ~alpha wrt bug #91132 |
|
30 |
- |
|
31 |
-*erlang-10.2.7 (29 Oct 2005) |
|
32 |
- |
|
33 |
- 29 Oct 2005; Matthew Kennedy <mkennedy@gentoo.org> |
|
34 |
- +files/erlang-10.2.7-export-TARGET.patch, |
|
35 |
- +files/10.2.7-manpage-emacs-gentoo.patch, +erlang-10.2.7.ebuild: |
|
36 |
- New upstream version; Added epoll support and condition support for |
|
37 |
- dev-lang/tk via X USE flag; Resolves Bug #106208. |
|
38 |
- |
|
39 |
- 05 Sep 2005; Jason Wever <weeve@gentoo.org> erlang-10.2.5.ebuild: |
|
40 |
- Stable on SPARC. |
|
41 |
- |
|
42 |
- 03 Sep 2005; Michael Hanselmann <hansmi@gentoo.org> erlang-10.2.5.ebuild: |
|
43 |
- Stable on ppc. |
|
44 |
- |
|
45 |
-*erlang-10.2.5 (24 Aug 2005) |
|
46 |
- |
|
47 |
- 24 Aug 2005; Mike Frysinger <vapier@gentoo.org> +erlang-10.2.5.ebuild: |
|
48 |
- Add a version which works with wings #97798. |
|
49 |
- |
|
50 |
- 18 Jul 2005; Matthew Kennedy <mkennedy@gentoo.org> |
|
51 |
- +files/10.2.6-manpage-emacs-gentoo.patch, files/50erlang-gentoo.el, |
|
52 |
- metadata.xml, erlang-10.2.6.ebuild: |
|
53 |
- Added Emacs Herd to metadata.xml. |
|
54 |
- |
|
55 |
- 18 Jul 2005; Matthew Kennedy <mkennedy@gentoo.org> |
|
56 |
- +files/10.2.6-manpage-emacs-gentoo.patch, files/50erlang-gentoo.el, |
|
57 |
- erlang-10.2.6.ebuild: |
|
58 |
- Support man-page documentation in Emacs erlang-mode; Install Erlang |
|
59 |
- man-pages and HTML documentation via "doc" USE flag; Add missing |
|
60 |
- dependencies for Java and ODBC support via "odbc" and "java" USE flags; |
|
61 |
- Rename Erlang man-pages with "erl" suffix to avoid namespace collision; New |
|
62 |
- upstream version. |
|
63 |
- |
|
64 |
-*erlang-10.2.6 (02 Jul 2005) |
|
65 |
- |
|
66 |
- 02 Jul 2005; Mike Frysinger <vapier@gentoo.org> +erlang-10.2.6.ebuild: |
|
67 |
- Version bump. |
|
68 |
- |
|
69 |
- 02 Jul 2005; Mike Frysinger <vapier@gentoo.org> |
|
70 |
- +files/erlang-10.2.6-export-TARGET.patch, erlang-10.2.0.ebuild: |
|
71 |
- Fix host detection #94090 by Matthew Kennedy. |
|
72 |
- |
|
73 |
- 30 May 2005; Sven Wegener <swegener@gentoo.org> erlang-9c-r2.ebuild, |
|
74 |
- erlang-9c-r3.ebuild, erlang-10.2.0.ebuild: |
|
75 |
- Moved from gcc.eclass to toolchain-funcs.eclass, bug #92745. |
|
76 |
- |
|
77 |
- 21 Apr 2005; Herbie Hopkins <herbs@gentoo.org> erlang-10.2.0.ebuild: |
|
78 |
- Small multilib issue, fixes bug #89938 |
|
79 |
- |
|
80 |
- 20 Mar 2005; Matthew Kennedy <mkennedy@gentoo.org> |
|
81 |
- +files/50erlang-gentoo.el, erlang-10.2.0.ebuild: |
|
82 |
- USE support for "emacs"; Resolves Bug #78557 |
|
83 |
- |
|
84 |
-*erlang-10.2.0 (07 Oct 2004) |
|
85 |
- |
|
86 |
- 07 Oct 2004; George Shapovalov <george@gentoo.org> erlang-10.2.0.ebuild : |
|
87 |
- new version out, adjusted versioning scheme as was previously discussed |
|
88 |
- (retaining 1st number, then letters A->1, B->2, ... and adding the "revision") |
|
89 |
- thus this corresponds to R10B-0 |
|
90 |
- also adjusted openssl dependency to point to >=0.9.7d |
|
91 |
- |
|
92 |
-*erlang-9c-r3 (02 Aug 2004) |
|
93 |
- |
|
94 |
- 02 Aug 2004; George Shapovalov <george@gentoo.org> erlang-9c-r3.ebuild : |
|
95 |
- fixed some stray ${D}'s in wrappers (#58901), added support for ~amd64 |
|
96 |
- |
|
97 |
- 30 Mar 2004; Donnie Berkholz <spyderous@gentoo.org>; erlang-8b.ebuild, |
|
98 |
- erlang-9c-r1.ebuild, erlang-9c-r2.ebuild, erlang-9c.ebuild: |
|
99 |
- Change x11-base/xfree dependency to virtual/x11. |
|
100 |
- |
|
101 |
-*erlang-9c-r2 (21 Feb 2004) |
|
102 |
- |
|
103 |
- 21 Feb 2004; Mike Frysinger <vapier@gentoo.org> : |
|
104 |
- Version bump #26420. |
|
105 |
- |
|
106 |
-*erlang-9c-r1 (01 Jul 2003) |
|
107 |
- |
|
108 |
- 28 Jul 2003; Mike Frysinger <vapier@gentoo.org> : |
|
109 |
- Added 'addpredict' to /dev/pts to fix issues w/emerging in XTerm #25366. |
|
110 |
- |
|
111 |
- 03 Jul 2003; George Shapovalov <george@gentoo.org> erlang-9c-r1.ebuild : |
|
112 |
- incorporated fix for weird install on some systems from #20625 |
|
113 |
- Thanks to Claes Wikstrom <klacke@hyber.org> for the patch |
|
114 |
- |
|
115 |
- 01 Jul 2003; George Shapovalov <george@gentoo.org> erlang-9c-r1.ebuild : |
|
116 |
- incorporated patch to make erlang read nsswitch.conf in |
|
117 |
- addition to host.conf (#22836) |
|
118 |
- Thanks to Claes Wikstrom <klacke@hyber.org> for the patch |
|
119 |
- |
|
120 |
-*erlang-9c (09 May 2003) |
|
121 |
- |
|
122 |
- 19 Jun 2003; Mike Frysinger <vapier@gentoo.org> : |
|
123 |
- Cleaned up and made the ebuild more 'portage' like ... changed sed cmds to dosed |
|
124 |
- |
|
125 |
- 09 May 2003; George Shapovalov <george@gentoo.org> erlang-9c.ebuild : |
|
126 |
- new version (#20625), original versio n is R9B-1, 9c seems to be the only approximation |
|
127 |
- that works and is considered newer by portage |
|
128 |
- (anyway, 'B' seems to be invariant in upstream naming scheme) |
|
129 |
- Thanks to Claes Wikstrom <klacke@hyber.org> for an update. |
|
130 |
- |
|
131 |
-*erlang-9b (07 Jan 2003) |
|
132 |
- |
|
133 |
- 07 Jan 2003; George Shapovalov <george@gentoo.org> erlang-8b.ebuild, erlang-9b.ebuild : |
|
134 |
- new version, |
|
135 |
- cleaned up erlang-8b.ebuild and added IUSE |
|
136 |
- |
|
137 |
-*erlang-8b (01 Nov 2002) |
|
138 |
- |
|
139 |
- 19 Jun 2003; Mike Frysinger <vapier@gentoo.org> : |
|
140 |
- Cleaned up and made the ebuild more 'portage' like ... changed sed cmds to dosed |
|
141 |
- |
|
142 |
- 01 Nov 2002; George Shapovalov <george@gentoo.org> erlang-8b.ebuild : |
|
143 |
- Erlang is a programming language, runtime environment and a large collection of |
|
144 |
- libraries. Ebuild submitted by Charlie Mac <charzilla@yahoo.com> |
... | ... |
@@ -1,174 +0,0 @@ |
1 |
-AUX 10.2.6-manpage-emacs-gentoo.patch 1348 RMD160 9b71f1253a400a8a8e99db0a1761d10a40e19e7a SHA1 c02e5a195ae42de5e26547e8f9ba13c5bf198b8b SHA256 3c8981e860600447c077a090fbafb2467fbf9da6e15f43825c7f2e9b8702adbb |
|
2 |
-MD5 34433096e1c6e84b5dbb4a50a4e3c2e8 files/10.2.6-manpage-emacs-gentoo.patch 1348 |
|
3 |
-RMD160 9b71f1253a400a8a8e99db0a1761d10a40e19e7a files/10.2.6-manpage-emacs-gentoo.patch 1348 |
|
4 |
-SHA256 3c8981e860600447c077a090fbafb2467fbf9da6e15f43825c7f2e9b8702adbb files/10.2.6-manpage-emacs-gentoo.patch 1348 |
|
5 |
-AUX 10.2.7-manpage-emacs-gentoo.patch 1348 RMD160 9b71f1253a400a8a8e99db0a1761d10a40e19e7a SHA1 c02e5a195ae42de5e26547e8f9ba13c5bf198b8b SHA256 3c8981e860600447c077a090fbafb2467fbf9da6e15f43825c7f2e9b8702adbb |
|
6 |
-MD5 34433096e1c6e84b5dbb4a50a4e3c2e8 files/10.2.7-manpage-emacs-gentoo.patch 1348 |
|
7 |
-RMD160 9b71f1253a400a8a8e99db0a1761d10a40e19e7a files/10.2.7-manpage-emacs-gentoo.patch 1348 |
|
8 |
-SHA256 3c8981e860600447c077a090fbafb2467fbf9da6e15f43825c7f2e9b8702adbb files/10.2.7-manpage-emacs-gentoo.patch 1348 |
|
9 |
-AUX 50erlang-gentoo.el 140 RMD160 fd086fc5e1c15e5c8753315cf0a2759e8f3cc666 SHA1 1c63a3fe5e4c348c9357ab1089c067f335488312 SHA256 2f494178e3e64af141398b4deac5d7f148b47d3cbc1cd8ec083229092f4aa3df |
|
10 |
-MD5 28397dc6ef4a633a8084ce44fbb1c6f3 files/50erlang-gentoo.el 140 |
|
11 |
-RMD160 fd086fc5e1c15e5c8753315cf0a2759e8f3cc666 files/50erlang-gentoo.el 140 |
|
12 |
-SHA256 2f494178e3e64af141398b4deac5d7f148b47d3cbc1cd8ec083229092f4aa3df files/50erlang-gentoo.el 140 |
|
13 |
-AUX 9c.patch 2005 RMD160 be4d3dd5ea72f653d95c517dfdf9275263b009d2 SHA1 6fb3de09cf5293fa449e5e7662eb1bdb45271c9b SHA256 634f9ef95cae47ab27f464802bbc144606ff6e24d318da0cb1276ada5568fd78 |
|
14 |
-MD5 e61c0249e23b7e44ef3629ea5dc5997a files/9c.patch 2005 |
|
15 |
-RMD160 be4d3dd5ea72f653d95c517dfdf9275263b009d2 files/9c.patch 2005 |
|
16 |
-SHA256 634f9ef95cae47ab27f464802bbc144606ff6e24d318da0cb1276ada5568fd78 files/9c.patch 2005 |
|
17 |
-AUX erlang-10.2.6-export-TARGET.patch 242 RMD160 5f8443e482920358c6c13f85b1c554977bfcc950 SHA1 5c1b5d3c0ab48e7845eceba5ac99944847304962 SHA256 8e8ae39cb84c3196fbb773275f0aaaf68fb07fade632682f1866d2185b4dd54b |
|
18 |
-MD5 b1f610dc1caa7c176d7da4919bcabba9 files/erlang-10.2.6-export-TARGET.patch 242 |
|
19 |
-RMD160 5f8443e482920358c6c13f85b1c554977bfcc950 files/erlang-10.2.6-export-TARGET.patch 242 |
|
20 |
-SHA256 8e8ae39cb84c3196fbb773275f0aaaf68fb07fade632682f1866d2185b4dd54b files/erlang-10.2.6-export-TARGET.patch 242 |
|
21 |
-AUX erlang-10.2.7-export-TARGET.patch 242 RMD160 5f8443e482920358c6c13f85b1c554977bfcc950 SHA1 5c1b5d3c0ab48e7845eceba5ac99944847304962 SHA256 8e8ae39cb84c3196fbb773275f0aaaf68fb07fade632682f1866d2185b4dd54b |
|
22 |
-MD5 b1f610dc1caa7c176d7da4919bcabba9 files/erlang-10.2.7-export-TARGET.patch 242 |
|
23 |
-RMD160 5f8443e482920358c6c13f85b1c554977bfcc950 files/erlang-10.2.7-export-TARGET.patch 242 |
|
24 |
-SHA256 8e8ae39cb84c3196fbb773275f0aaaf68fb07fade632682f1866d2185b4dd54b files/erlang-10.2.7-export-TARGET.patch 242 |
|
25 |
-AUX erlang-11.2.1-epoll.patch 15000 RMD160 6cbc83d781d108a328cd27d2f86d57fbc5396e54 SHA1 6900220b1c1a570753ec1aa4885e62157284b9da SHA256 969a8d741ab616c1d2e802c165761f2c0ef63cf9af1cab4e83c1594040458a3b |
|
26 |
-MD5 d104d725d289fc6fc7c1e0e78b7c9bb5 files/erlang-11.2.1-epoll.patch 15000 |
|
27 |
-RMD160 6cbc83d781d108a328cd27d2f86d57fbc5396e54 files/erlang-11.2.1-epoll.patch 15000 |
|
28 |
-SHA256 969a8d741ab616c1d2e802c165761f2c0ef63cf9af1cab4e83c1594040458a3b files/erlang-11.2.1-epoll.patch 15000 |
|
29 |
-AUX erlang-11.2.2-epoll.patch 15000 RMD160 6cbc83d781d108a328cd27d2f86d57fbc5396e54 SHA1 6900220b1c1a570753ec1aa4885e62157284b9da SHA256 969a8d741ab616c1d2e802c165761f2c0ef63cf9af1cab4e83c1594040458a3b |
|
30 |
-MD5 d104d725d289fc6fc7c1e0e78b7c9bb5 files/erlang-11.2.2-epoll.patch 15000 |
|
31 |
-RMD160 6cbc83d781d108a328cd27d2f86d57fbc5396e54 files/erlang-11.2.2-epoll.patch 15000 |
|
32 |
-SHA256 969a8d741ab616c1d2e802c165761f2c0ef63cf9af1cab4e83c1594040458a3b files/erlang-11.2.2-epoll.patch 15000 |
|
33 |
-AUX erlang-9c.patch 4868 RMD160 7655db2531fdeb393ba34e608cd0eaa4a78da9b5 SHA1 30c81ecd5353f0476fce40bc2d7b01a21b5162da SHA256 8224e0f7d8252e12cf26b545d5f1d32002e2335190a6e038fa06e0d6569fd2df |
|
34 |
-MD5 162a0f246dd57cae2c3a6908d8446944 files/erlang-9c.patch 4868 |
|
35 |
-RMD160 7655db2531fdeb393ba34e608cd0eaa4a78da9b5 files/erlang-9c.patch 4868 |
|
36 |
-SHA256 8224e0f7d8252e12cf26b545d5f1d32002e2335190a6e038fa06e0d6569fd2df files/erlang-9c.patch 4868 |
|
37 |
-AUX glibc-2.4-fix.patch 452 RMD160 af22ca793fe2f0d025c1eafa75547e4b7093f24c SHA1 a9615310895912a7be3acad23169455fea9e9bcd SHA256 c9d20e483847f580848c75c0d7464af5afce641dba75383b2f3adf6a10b6094b |
|
38 |
-MD5 734a6808d937b508338553b3ac819cd3 files/glibc-2.4-fix.patch 452 |
|
39 |
-RMD160 af22ca793fe2f0d025c1eafa75547e4b7093f24c files/glibc-2.4-fix.patch 452 |
|
40 |
-SHA256 c9d20e483847f580848c75c0d7464af5afce641dba75383b2f3adf6a10b6094b files/glibc-2.4-fix.patch 452 |
|
41 |
-AUX otp_src_R10B-10_epoll.patch 14980 RMD160 a57b6f4f740b0110fb5560745cd2ea06b7dcd42e SHA1 e33d712fde0ebd5219c260c72faaf4fba4a7eacf SHA256 31575efd5a91bd2a97178e4f2c15e6ae248e96b327d2b6b9c9847229a2e52e62 |
|
42 |
-MD5 c93c2f99b47f2289eee32fe186796fc1 files/otp_src_R10B-10_epoll.patch 14980 |
|
43 |
-RMD160 a57b6f4f740b0110fb5560745cd2ea06b7dcd42e files/otp_src_R10B-10_epoll.patch 14980 |
|
44 |
-SHA256 31575efd5a91bd2a97178e4f2c15e6ae248e96b327d2b6b9c9847229a2e52e62 files/otp_src_R10B-10_epoll.patch 14980 |
|
45 |
-AUX supervisor-dict.patch 3094 RMD160 9f078cc94e2f8f0d216c71543135db98cab33161 SHA1 4417b09d5cf421866216295311b8f98f51de49c3 SHA256 ad1c26ff1012dae094c3f2be0094d71400ebe779e71a6986c066f7be9afd874d |
|
46 |
-MD5 a914a94dd3897731221c703f5b645293 files/supervisor-dict.patch 3094 |
|
47 |
-RMD160 9f078cc94e2f8f0d216c71543135db98cab33161 files/supervisor-dict.patch 3094 |
|
48 |
-SHA256 ad1c26ff1012dae094c3f2be0094d71400ebe779e71a6986c066f7be9afd874d files/supervisor-dict.patch 3094 |
|
49 |
-DIST otp_doc_html_R10B-10.tar.gz 4655081 RMD160 d11108d871ab7f164c7e4dd1000cd8cdca7cb64d SHA1 3373386714efbc2c1c9f5b849931d55c62d3972d SHA256 2373d6935b44b64a137bf8ba198dca3fb782d0c072735b172ae4420c380a5d9c |
|
50 |
-DIST otp_doc_html_R10B-5.tar.gz 4591317 |
|
51 |
-DIST otp_doc_html_R10B-6.tar.gz 4602685 RMD160 f9ecb2ed8d6d0583e340d719ec56a3e670e9856b SHA1 1635042dfc0cdef0ed45aa389387d08747336b8b SHA256 50174508e8507c18b1b5e80805f70fdf680db4b9b81cd9bf2cc8e1ac020e910b |
|
52 |
-DIST otp_doc_html_R10B-7.tar.gz 4601134 RMD160 4cba94ec7162b35696bd471b2c32cf26935f3d6b SHA1 1b3c2f153a6fbecbcec86d0078745332bce6b9b9 SHA256 d69aa07cfe3851da1c4d558cbd7a17cafc7546b396f7ab07c68a18e44cc40e71 |
|
53 |
-DIST otp_doc_html_R11B-0.tar.gz 4662110 RMD160 ec39aa3e693a0b836b8ca9c360c14c2612c1b813 SHA1 263d7941e67b0a8db079251cb938823a5f2da4ba SHA256 68cb74d5979dd2ea75c03e892e7ce1446eff27af37d9bdd4fd9778a433a19f68 |
|
54 |
-DIST otp_doc_html_R11B-1.tar.gz 4717809 RMD160 2a7425f55245b12037a02082ace85411c04c5bb6 SHA1 1c1734482ebce4fab096b24ac8b91d33966a47cd SHA256 225212891e2290d0ea21e489445113d7f79ad51e4b3e3e4f0042f8876383a7bc |
|
55 |
-DIST otp_doc_html_R11B-2.tar.gz 4739895 RMD160 82a4ab769566705333e059d920861d05be31754b SHA1 44a6006bf5437566ce770a4a3a2bf6c9e015e656 SHA256 588514c6b96b33dbaffd40aa5b51b9c0be65d02b6e81644c53b4c705a866db47 |
|
56 |
-DIST otp_doc_man_R10B-10.tar.gz 594690 RMD160 b56260b7349cd4751ca56ec15fdc5515041b130b SHA1 a59f09e9656979642a2b83cc1e9c3889ecec5031 SHA256 8ecfc9b627200f59c35591a743e03a587258ddcdd39052a0b2cb58b80f6fc20b |
|
57 |
-DIST otp_doc_man_R10B-5.tar.gz 597252 |
|
58 |
-DIST otp_doc_man_R10B-6.tar.gz 601812 RMD160 82f414e454b3bca56c828e5ddb1bf59f42f945e6 SHA1 42bdf4b603d5b68a600c666e9a8178a7c9d12250 SHA256 639b60c7950724566fd0d7df59b0faa683d678cd5929a138592a6affb9c6b36a |
|
59 |
-DIST otp_doc_man_R10B-7.tar.gz 601650 RMD160 d5f33c5e35b79222fa5b57cbe736a983fa0d0316 SHA1 70cf18f8bfba75c2e5d96f4ad68af4981cda5de7 SHA256 5bd1ba759245a5c41e7d25121c5e5ab58d0d04935eceb0960a8fb5d0bab3297d |
|
60 |
-DIST otp_doc_man_R11B-0.tar.gz 624684 RMD160 38d9218391147e192d21c438d436c98d7c0f982a SHA1 b093fc8c9349a744c42b2ac70d00166adb7d2bb0 SHA256 09b93f43b6bb048d3b66296e94bb6379dbac11217e2ffbe074c2492fe777ee39 |
|
61 |
-DIST otp_doc_man_R11B-1.tar.gz 627132 RMD160 666899dedc72f22387d478ffe4a1f313c57bdb01 SHA1 28f1318964946634996f146770cc9a2be0c20953 SHA256 706e7da589cddee06b9d0a24a09e2105ae719bbfb8b6a08fe55ae45d5dbf4bd6 |
|
62 |
-DIST otp_doc_man_R11B-2.tar.gz 632153 RMD160 90b37a71ed29f14ec0d14a520aef47ed7b7ccad0 SHA1 5e09c0dcea2956d8b2cdc2a6ab846d9a922cefe3 SHA256 643fb8210a2059b2c283c17601a0d5893f5cf409f05ed4852fbf2b0607693ac9 |
|
63 |
-DIST otp_src_R10B-0.tar.gz 9296524 |
|
64 |
-DIST otp_src_R10B-10.tar.gz 9445437 RMD160 b0e24e89241a21d5f3304791b505ab133db8fca5 SHA1 b08e93540d0f7b532a27fcb12f832759af07ac29 SHA256 bd87e1b09f1f3d694fc32ef4d27372e25c95ce35b383c7747ab40c27471c28ac |
|
65 |
-DIST otp_src_R10B-10_epoll.patch 15359 RMD160 40a1282c6223081b4d2d9c06b30bc16163aa495f SHA1 021ed43a2ebb9d0ff13c9c3ffbf0e8f3d9aa81f7 SHA256 7b8bbad71649e9b00f9f8639b0fe06060428aa4015eb6164e78d18a0b2508a5b |
|
66 |
-DIST otp_src_R10B-5.tar.gz 9996505 |
|
67 |
-DIST otp_src_R10B-6.tar.gz 10037987 RMD160 009dcaa078ee6045e352bc700e581ea222058f4e SHA1 6869b8f57c2f6b0e3b1764891e7c7279e5b6a5f0 SHA256 7c6d02954b8f84e68224677eaa829a234c3aafc26ec94655e574a8028d1d40bf |
|
68 |
-DIST otp_src_R10B-7.tar.gz 10058423 RMD160 b97700467f855110ff1beb4e7725bb716f6a4b2e SHA1 f1a741a682b2849d5c44103259b2247634c7a1fe SHA256 7b0f96596c031a79b0f975423f0535ddba1a8d86868bb28ac3f5383709c30bf1 |
|
69 |
-DIST otp_src_R10B-7_epoll.patch 14823 RMD160 559303afe1be7c9797146b33490f0bd7c567f804 SHA1 1ac7bf7435c76844ce40c9ed8a7e56e3e40102c0 SHA256 275ac0cd6a20f329b8c32937b08a1aea118b0073536b8910495c806191474c0e |
|
70 |
-DIST otp_src_R11B-0.tar.gz 10844070 RMD160 cb2c163f9404feea9b56a5adddb3bdd505e0b494 SHA1 83b620810e5eb8440b4b18809558b8c42c9ad5b0 SHA256 1806ea681b72be216e5365b29479dcb5253f0d828c021282711f5eae984c9f11 |
|
71 |
-DIST otp_src_R11B-1.tar.gz 11144896 RMD160 db658f8221c4226f52c88ff56d2f68afbe47bac2 SHA1 5831578f1c189a2cdf23b19b045be19589cd918f SHA256 d5a8530dfee0b2348c4ad0107409fa73ac3233f31e2300ece625a2abd9eb4da7 |
|
72 |
-DIST otp_src_R11B-2.tar.gz 11244153 RMD160 989bab054992ba23666756379950082cd41adb00 SHA1 09885c9b0902caa4570de950d76284943232fb6d SHA256 3dd483ee568c31655361474aa54a28cf11575c3b1b984f0b7a6980e083a8e44b |
|
73 |
-DIST otp_src_R8B-2.tar.gz 10905100 |
|
74 |
-DIST otp_src_R9B-1.tar.gz 8455643 |
|
75 |
-DIST otp_src_R9C-0.tar.gz 8229056 |
|
76 |
-EBUILD erlang-10.2.0.ebuild 2352 RMD160 cd0ae744aff89f3a7af60e2f8ee0e106c561929f SHA1 3ee96823dad2abd7dd31b3cfd221e1be7b820056 SHA256 e5c62cfa064f03cf0cb7a0a05bd2da37964fdbb1f254345e62671a589024c3d6 |
|
77 |
-MD5 542d1404253f2b21edd106a562bba760 erlang-10.2.0.ebuild 2352 |
|
78 |
-RMD160 cd0ae744aff89f3a7af60e2f8ee0e106c561929f erlang-10.2.0.ebuild 2352 |
|
79 |
-SHA256 e5c62cfa064f03cf0cb7a0a05bd2da37964fdbb1f254345e62671a589024c3d6 erlang-10.2.0.ebuild 2352 |
|
80 |
-EBUILD erlang-10.2.10.ebuild 3519 RMD160 506bd57ab1d8cbeb8b6f51760b2112d3d4e33279 SHA1 eb9a53a6326c40253994869031732b15f05fb95a SHA256 28bc2aaddd2f00f95fdd27d2b90ae9bd455bb73ba64b4ed6d1a632aef26095ca |
|
81 |
-MD5 bcb00e535032b08fe3b702977231e23d erlang-10.2.10.ebuild 3519 |
|
82 |
-RMD160 506bd57ab1d8cbeb8b6f51760b2112d3d4e33279 erlang-10.2.10.ebuild 3519 |
|
83 |
-SHA256 28bc2aaddd2f00f95fdd27d2b90ae9bd455bb73ba64b4ed6d1a632aef26095ca erlang-10.2.10.ebuild 3519 |
|
84 |
-EBUILD erlang-10.2.5.ebuild 2925 RMD160 88db440410a862002970318029e845f2c99ae355 SHA1 449defaac5382bb338708a526787339c49ebde95 SHA256 27234a1ed6d213a2e2a3e347586f4fe37eae2b570afcd43c4fe035613dc5c83d |
|
85 |
-MD5 15afcfd348a07f127785257e8c876b8d erlang-10.2.5.ebuild 2925 |
|
86 |
-RMD160 88db440410a862002970318029e845f2c99ae355 erlang-10.2.5.ebuild 2925 |
|
87 |
-SHA256 27234a1ed6d213a2e2a3e347586f4fe37eae2b570afcd43c4fe035613dc5c83d erlang-10.2.5.ebuild 2925 |
|
88 |
-EBUILD erlang-10.2.6.ebuild 3001 RMD160 7e77fa1ebc8614165368d46977378854a4d98f8d SHA1 9db5d8233b546602e2cbbbb440820d262a23db92 SHA256 3bb6d57e339639c02fbc432d1a9356b43b9802e27162e5875f78bd32006e7404 |
|
89 |
-MD5 a1bd577d0e801e8ced64a3a0431f44a4 erlang-10.2.6.ebuild 3001 |
|
90 |
-RMD160 7e77fa1ebc8614165368d46977378854a4d98f8d erlang-10.2.6.ebuild 3001 |
|
91 |
-SHA256 3bb6d57e339639c02fbc432d1a9356b43b9802e27162e5875f78bd32006e7404 erlang-10.2.6.ebuild 3001 |
|
92 |
-EBUILD erlang-10.2.7.ebuild 3124 RMD160 bc44aff74fd8d9471b89f0fb71de31ae5471af94 SHA1 c243758903e1e4dace9711ff47eee4ef863dcaab SHA256 626a4673a6560c4f36e47db591723b90330dcf717f4af7208eaeaf8bfc781346 |
|
93 |
-MD5 1cbc40873f79fdd2c6b856f4581404e0 erlang-10.2.7.ebuild 3124 |
|
94 |
-RMD160 bc44aff74fd8d9471b89f0fb71de31ae5471af94 erlang-10.2.7.ebuild 3124 |
|
95 |
-SHA256 626a4673a6560c4f36e47db591723b90330dcf717f4af7208eaeaf8bfc781346 erlang-10.2.7.ebuild 3124 |
|
96 |
-EBUILD erlang-11.2.0.ebuild 3095 RMD160 4b91d9211da14eb53ddb2daa959fbaac342bf057 SHA1 f49df17344674a86407868a04939db4fb9f57a1b SHA256 7f8d715ad55943f9be1c2e13a8d2fc66bc215c63496e9a47b0758f3147983704 |
|
97 |
-MD5 73648a818a005bca3e299394e5a9f6f1 erlang-11.2.0.ebuild 3095 |
|
98 |
-RMD160 4b91d9211da14eb53ddb2daa959fbaac342bf057 erlang-11.2.0.ebuild 3095 |
|
99 |
-SHA256 7f8d715ad55943f9be1c2e13a8d2fc66bc215c63496e9a47b0758f3147983704 erlang-11.2.0.ebuild 3095 |
|
100 |
-EBUILD erlang-11.2.1.ebuild 4386 RMD160 e6bb63cbc1765618bddbefa3a7121dd5328ed6f6 SHA1 e8912d12b05b3053288de1659d9009c3abe3d532 SHA256 c469d34c7d443ef6c2a6da1a2cb64e275ba6bfb38fe3778b9c62f4c5c9399308 |
|
101 |
-MD5 db457411e4737ec4d9fdad7fc9354cfc erlang-11.2.1.ebuild 4386 |
|
102 |
-RMD160 e6bb63cbc1765618bddbefa3a7121dd5328ed6f6 erlang-11.2.1.ebuild 4386 |
|
103 |
-SHA256 c469d34c7d443ef6c2a6da1a2cb64e275ba6bfb38fe3778b9c62f4c5c9399308 erlang-11.2.1.ebuild 4386 |
|
104 |
-EBUILD erlang-11.2.2.ebuild 4387 RMD160 c752df46206f7fe27f13ca525db1b52eae75b640 SHA1 21b6facc9f297517dd8d2c94957577ca32267506 SHA256 3276790c60d6a398e8573729b9cdac07aee0a1196486811480bb116c15cad077 |
|
105 |
-MD5 22f50e05bfa1508f5bded459efa75eed erlang-11.2.2.ebuild 4387 |
|
106 |
-RMD160 c752df46206f7fe27f13ca525db1b52eae75b640 erlang-11.2.2.ebuild 4387 |
|
107 |
-SHA256 3276790c60d6a398e8573729b9cdac07aee0a1196486811480bb116c15cad077 erlang-11.2.2.ebuild 4387 |
|
108 |
-EBUILD erlang-8b.ebuild 1156 RMD160 855ecd0626e2ff23974ea805c1142c7e2ef692aa SHA1 e8e54f8e2a1e94e08114d4a28a628c03b24197b6 SHA256 04b5d937a3a8d543c36d41c43353c3c75e707350e4a4446de2c8a3c99a712195 |
|
109 |
-MD5 683010b6283d166c1ffcf64bab32e6d2 erlang-8b.ebuild 1156 |
|
110 |
-RMD160 855ecd0626e2ff23974ea805c1142c7e2ef692aa erlang-8b.ebuild 1156 |
|
111 |
-SHA256 04b5d937a3a8d543c36d41c43353c3c75e707350e4a4446de2c8a3c99a712195 erlang-8b.ebuild 1156 |
|
112 |
-EBUILD erlang-9c-r1.ebuild 1661 RMD160 6f681c2ccb1b1d2e90f182661f27a5999f4e50d8 SHA1 3c796022ade7bfa0db1506d4c11b0180c01c457d SHA256 2bf25512b0061ff092e9ec8cb1e8bde825a8588925130c5d4d75e9e45ca41287 |
|
113 |
-MD5 40d7fe2f32b59b83ecabe9eb2aa2ecc3 erlang-9c-r1.ebuild 1661 |
|
114 |
-RMD160 6f681c2ccb1b1d2e90f182661f27a5999f4e50d8 erlang-9c-r1.ebuild 1661 |
|
115 |
-SHA256 2bf25512b0061ff092e9ec8cb1e8bde825a8588925130c5d4d75e9e45ca41287 erlang-9c-r1.ebuild 1661 |
|
116 |
-EBUILD erlang-9c-r2.ebuild 1786 RMD160 cfcd3af93fa8a45da4068303b6bfebad8d076264 SHA1 42672bce4031943e9f7145406be7a83279ce867b SHA256 7f1e9e7f8260d6975d9a58df64cc2c42ac4fddf41e0c93f0cc89e0beb9ed55db |
|
117 |
-MD5 42753c3aa0334123ff5edc1ad619ca8c erlang-9c-r2.ebuild 1786 |
|
118 |
-RMD160 cfcd3af93fa8a45da4068303b6bfebad8d076264 erlang-9c-r2.ebuild 1786 |
|
119 |
-SHA256 7f1e9e7f8260d6975d9a58df64cc2c42ac4fddf41e0c93f0cc89e0beb9ed55db erlang-9c-r2.ebuild 1786 |
|
120 |
-EBUILD erlang-9c-r3.ebuild 1800 RMD160 debb9e17889fa48c887afe438a170d9e0de77d83 SHA1 c5cc806bd6f09f933d2f70f2248e1465fe206658 SHA256 112af80656ddcccd23198372158126e2dbcca81677d0c75e18bba55a3e6310d3 |
|
121 |
-MD5 7fcfff1a0fb1d70d1e5dae58da82a634 erlang-9c-r3.ebuild 1800 |
|
122 |
-RMD160 debb9e17889fa48c887afe438a170d9e0de77d83 erlang-9c-r3.ebuild 1800 |
|
123 |
-SHA256 112af80656ddcccd23198372158126e2dbcca81677d0c75e18bba55a3e6310d3 erlang-9c-r3.ebuild 1800 |
|
124 |
-EBUILD erlang-9c.ebuild 1483 RMD160 2bbe9f2b29faf2a47774ccc57c09aa556e730ab0 SHA1 419ce5c5c9819b590146594c95915a87a79c864a SHA256 765a1170c983ef37cf1e2199fcc9a28c2d544f20bcb27f0eb29294c584975895 |
|
125 |
-MD5 b782da2a4fc77372e754ee4f55ebd2c5 erlang-9c.ebuild 1483 |
|
126 |
-RMD160 2bbe9f2b29faf2a47774ccc57c09aa556e730ab0 erlang-9c.ebuild 1483 |
|
127 |
-SHA256 765a1170c983ef37cf1e2199fcc9a28c2d544f20bcb27f0eb29294c584975895 erlang-9c.ebuild 1483 |
|
128 |
-MISC ChangeLog 5711 RMD160 28681780418b6c9c4cf793c136d6fd5c71868b2d SHA1 48d629e412d63f72642a1215586f2b39085d0203 SHA256 7ed09af34a15c6c41c0bc460806f413ff15bd7baa826380efdd2e3ae3615f005 |
|
129 |
-MD5 783780d58b49638cbed3ffeee0629d1a ChangeLog 5711 |
|
130 |
-RMD160 28681780418b6c9c4cf793c136d6fd5c71868b2d ChangeLog 5711 |
|
131 |
-SHA256 7ed09af34a15c6c41c0bc460806f413ff15bd7baa826380efdd2e3ae3615f005 ChangeLog 5711 |
|
132 |
-MISC metadata.xml 402 RMD160 3d4e0e7953d95f43de89f62eacb37969caa29336 SHA1 2a45564353e8d0c2b9555294a6a269e56e0b6056 SHA256 c713a207afd5d65ef21d1c1e5fd3b867ce063dd9e46fc53db0734ad19f59ffe7 |
|
133 |
-MD5 aea374917adc11a2d42b0b9d1bba3598 metadata.xml 402 |
|
134 |
-RMD160 3d4e0e7953d95f43de89f62eacb37969caa29336 metadata.xml 402 |
|
135 |
-SHA256 c713a207afd5d65ef21d1c1e5fd3b867ce063dd9e46fc53db0734ad19f59ffe7 metadata.xml 402 |
|
136 |
-MD5 f3de2b6ca821b977f0e1811a1f0a1409 files/digest-erlang-10.2.0 67 |
|
137 |
-RMD160 877faf9cd01c7a7440a297f7b007fb33e4b7f302 files/digest-erlang-10.2.0 67 |
|
138 |
-SHA256 832c2c2b7cd5c257619e0d01729a9ce468b3d29df63b68c7ddcbe70426716364 files/digest-erlang-10.2.0 67 |
|
139 |
-MD5 58cc2440a6ff67f439916c4fe3ccb0bd files/digest-erlang-10.2.10 1033 |
|
140 |
-RMD160 a68ccbb17a0b86b4d58f311a553432e6ddfc0b01 files/digest-erlang-10.2.10 1033 |
|
141 |
-SHA256 4d9f8f7bb59eda00418e74cd3e1cae2dc90af7c6837f1dc699e5c4a5649ff318 files/digest-erlang-10.2.10 1033 |
|
142 |
-MD5 915a9f490e6f58cafe26c3f6f6aeb54d files/digest-erlang-10.2.5 209 |
|
143 |
-RMD160 045e0d32ec7f5516361ca930e8d68462aee1ba26 files/digest-erlang-10.2.5 209 |
|
144 |
-SHA256 7601e79f68cf8dfa93db26685ccb85edae1727a764211f9826aa34bf337235e2 files/digest-erlang-10.2.5 209 |
|
145 |
-MD5 a22d2e1e881a0d4df95b19d9d2a9cf13 files/digest-erlang-10.2.6 768 |
|
146 |
-RMD160 ad4161b8ea9ad8b05ffe3db06961582ae40aa26a files/digest-erlang-10.2.6 768 |
|
147 |
-SHA256 0c38a6330afc282000aaebd1c608c3dc81102a7bb89dad470f6f7a248a9e39ec files/digest-erlang-10.2.6 768 |
|
148 |
-MD5 55b2f80ec276b667beffebf7379472a4 files/digest-erlang-10.2.7 1024 |
|
149 |
-RMD160 88d05c6358e85f42a6dca6782eefb23a25813abd files/digest-erlang-10.2.7 1024 |
|
150 |
-SHA256 fdc9306a98f51ef7ce56e27a02a1d3cd8c731dcb0cf13288bffb69defe4e765d files/digest-erlang-10.2.7 1024 |
|
151 |
-MD5 55f6d7fce64d2a93c7e12cf660fef842 files/digest-erlang-11.2.0 768 |
|
152 |
-RMD160 89cbc1d9eaf296b693e9263b38ad33fcbcdb3e38 files/digest-erlang-11.2.0 768 |
|
153 |
-SHA256 aefeb78184742c0047cf00a4dc2f67accb7d28988a5b8f95d27e1009f4e1ff75 files/digest-erlang-11.2.0 768 |
|
154 |
-MD5 8886bf905361bef7627acee2a1c8bb98 files/digest-erlang-11.2.1 768 |
|
155 |
-RMD160 7483ae4810f0ccdebd46d1a0b7e325df96111976 files/digest-erlang-11.2.1 768 |
|
156 |
-SHA256 3fd426daec26afe9200caae2e6721a80fce6acc5d1c11f85817230dd78949248 files/digest-erlang-11.2.1 768 |
|
157 |
-MD5 5f903efdd3245f02ca8ff7ae339abb1c files/digest-erlang-11.2.2 768 |
|
158 |
-RMD160 7336169350690cbdd0b6971d80e741593134cafb files/digest-erlang-11.2.2 768 |
|
159 |
-SHA256 4f2b1667397c5abd23d28c6b9927ff68d2774a3bb814bc7cd5341c6e48061166 files/digest-erlang-11.2.2 768 |
|
160 |
-MD5 0ef311d4fbeb2b5e16aab201dcf37297 files/digest-erlang-8b 67 |
|
161 |
-RMD160 02584b25d0f2422b143b52c97cb7d9710a59302c files/digest-erlang-8b 67 |
|
162 |
-SHA256 ccef6072b284e0abaf10bc416c61168f2a295c99a49ec27c7277df013cdc2437 files/digest-erlang-8b 67 |
|
163 |
-MD5 9a235de49a6c0988f033448fdac8a0a8 files/digest-erlang-9c 66 |
|
164 |
-RMD160 628f19219fe35bbed12a603f2d6a8ef4006fc500 files/digest-erlang-9c 66 |
|
165 |
-SHA256 0d228671e3832721d333a82cbf11b3e22fea8fab4eedb308c3af20dd59b69a66 files/digest-erlang-9c 66 |
|
166 |
-MD5 9a235de49a6c0988f033448fdac8a0a8 files/digest-erlang-9c-r1 66 |
|
167 |
-RMD160 628f19219fe35bbed12a603f2d6a8ef4006fc500 files/digest-erlang-9c-r1 66 |
|
168 |
-SHA256 0d228671e3832721d333a82cbf11b3e22fea8fab4eedb308c3af20dd59b69a66 files/digest-erlang-9c-r1 66 |
|
169 |
-MD5 ae2205c16664d70f5ea47d249b2e566f files/digest-erlang-9c-r2 66 |
|
170 |
-RMD160 bc09b0c487f2580aba706e7f35f84e0109479325 files/digest-erlang-9c-r2 66 |
|
171 |
-SHA256 1e4ffb97ef49da9eecdb6affebda54e8e22b9c2707a099edeff382531b3b95c1 files/digest-erlang-9c-r2 66 |
|
172 |
-MD5 ae2205c16664d70f5ea47d249b2e566f files/digest-erlang-9c-r3 66 |
|
173 |
-RMD160 bc09b0c487f2580aba706e7f35f84e0109479325 files/digest-erlang-9c-r3 66 |
|
174 |
-SHA256 1e4ffb97ef49da9eecdb6affebda54e8e22b9c2707a099edeff382531b3b95c1 files/digest-erlang-9c-r3 66 |
... | ... |
@@ -1,87 +0,0 @@ |
1 |
-# Copyright 1999-2006 Gentoo Foundation |
|
2 |
-# Distributed under the terms of the GNU General Public License v2 |
|
3 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-10.2.0.ebuild,v 1.8 2006/03/07 23:14:21 vapier Exp $ |
|
4 |
- |
|
5 |
-inherit eutils toolchain-funcs flag-o-matic elisp-common |
|
6 |
- |
|
7 |
-#erlang uses a really weird versioning scheme which caused quite a few problems already |
|
8 |
-#Thus we do a slight modification converting all letters to digits to make it more sane (see e.g. #26420) |
|
9 |
-#the next line selects the right source. |
|
10 |
-MY_P=otp_src_R10B |
|
11 |
-MyDate="2004-10-05" |
|
12 |
-#apparently erlang people also started to stamp sources with a release date |
|
13 |
-DESCRIPTION="Erlang programming language, runtime environment, and large collection of libraries" |
|
14 |
-HOMEPAGE="http://www.erlang.org/" |
|
15 |
-SRC_URI="http://www.erlang.org/download/${MY_P}-0.tar.gz" |
|
16 |
- |
|
17 |
-LICENSE="EPL" |
|
18 |
-SLOT="0" |
|
19 |
-KEYWORDS="~x86 ~ppc ~sparc ~amd64" |
|
20 |
-IUSE="X ssl emacs" |
|
21 |
- |
|
22 |
-DEPEND=">=dev-lang/perl-5.6.1 |
|
23 |
- ssl? ( >=dev-libs/openssl-0.9.7d ) |
|
24 |
- emacs? ( virtual/emacs )" |
|
25 |
- |
|
26 |
-S=${WORKDIR}/${MY_P}_${MyDate} |
|
27 |
- |
|
28 |
-SITEFILE=50erlang-gentoo.el |
|
29 |
- |
|
30 |
-src_unpack() { |
|
31 |
- unpack ${A} |
|
32 |
- cd "${S}" |
|
33 |
- epatch "${FILESDIR}"/${PN}-10.2.6-export-TARGET.patch |
|
34 |
-} |
|
35 |
- |
|
36 |
-src_compile() { |
|
37 |
- [ "`gcc-fullversion`" == "3.3.2" ] && filter-mfpmath sse |
|
38 |
- [ "`gcc-fullversion`" == "3.3.3" ] && filter-mfpmath sse |
|
39 |
- addpredict /dev/pty # Bug #25366 |
|
40 |
- |
|
41 |
- econf --enable-threads || die |
|
42 |
- make || die |
|
43 |
- |
|
44 |
- if use emacs; then |
|
45 |
- pushd ${D}/lib/tools/emacs |
|
46 |
- elisp-compile *.el |
|
47 |
- popd |
|
48 |
- fi |
|
49 |
-} |
|
50 |
- |
|
51 |
-src_install() { |
|
52 |
- ERL_LIBDIR="/usr/$(get_libdir)/erlang" |
|
53 |
- |
|
54 |
- make INSTALL_PREFIX=${D} install || die |
|
55 |
- dodoc AUTHORS EPLICENCE README |
|
56 |
- |
|
57 |
- dosym ${ERL_LIBDIR}/bin/erl /usr/bin/erl |
|
58 |
- dosym ${ERL_LIBDIR}/bin/erlc /usr/bin/erlc |
|
59 |
- dosym ${ERL_LIBDIR}/bin/ecc /usr/bin/ecc |
|
60 |
- dosym ${ERL_LIBDIR}/bin/elink /usr/bin/elink |
|
61 |
- dosym ${ERL_LIBDIR}/bin/ear /usr/bin/ear |
|
62 |
- dosym ${ERL_LIBDIR}/bin/escript /usr/bin/escript |
|
63 |
- |
|
64 |
- ## Remove ${D} from the following files |
|
65 |
- dosed ${ERL_LIBDIR}/bin/erl |
|
66 |
- dosed ${ERL_LIBDIR}/bin/start |
|
67 |
- cd ${ERL_LIBDIR}/erts-* |
|
68 |
- grep -rle ${D} ${D}/${ERL_LIBDIR}/erts-* | xargs sed -i -e "s:${D}::g" |
|
69 |
- |
|
70 |
- ## Clean up the no longer needed files |
|
71 |
- rm ${D}/${ERL_LIBDIR}/Install |
|
72 |
- |
|
73 |
- if use emacs; then |
|
74 |
- pushd ${S} |
|
75 |
- elisp-install erlang lib/tools/emacs/*.el |
|
76 |
- elisp-site-file-install ${FILESDIR}/${SITEFILE} |
|
77 |
- popd |
|
78 |
- fi |
|
79 |
-} |
|
80 |
- |
|
81 |
-pkg_postinst() { |
|
82 |
- use emacs && elisp-site-regen |
|
83 |
-} |
|
84 |
- |
|
85 |
-pkg_postrm() { |
|
86 |
- use emacs && elisp-site-regen |
|
87 |
-} |
... | ... |
@@ -1,116 +0,0 @@ |
1 |
-# Copyright 1999-2006 Gentoo Foundation |
|
2 |
-# Distributed under the terms of the GNU General Public License v2 |
|
3 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-10.2.10.ebuild,v 1.1 2006/04/10 20:42:54 mkennedy Exp $ |
|
4 |
- |
|
5 |
-inherit eutils multilib flag-o-matic elisp-common versionator |
|
6 |
- |
|
7 |
-#erlang uses a really weird versioning scheme which caused quite a few problems already |
|
8 |
-#Thus we do a slight modification converting all letters to digits to make it more sane (see e.g. #26420) |
|
9 |
-#the next line selects the right source. |
|
10 |
-MY_PV="R$(get_major_version)B-$(get_version_component_range 3)" |
|
11 |
-# ATTN!! Take care when processing the C, etc version! |
|
12 |
-MY_P=otp_src_${MY_PV} |
|
13 |
-DESCRIPTION="Erlang programming language, runtime environment, and large collection of libraries" |
|
14 |
-HOMEPAGE="http://www.erlang.org/" |
|
15 |
-SRC_URI="http://www.erlang.org/download/${MY_P}.tar.gz |
|
16 |
- doc? ( http://erlang.org/download/otp_doc_man_${MY_PV}.tar.gz |
|
17 |
- http://erlang.org/download/otp_doc_html_${MY_PV}.tar.gz ) |
|
18 |
- http://developer.sipphone.com/ejabberd/erlang_epoll_patch/otp_src_${MY_PV}_epoll.patch" |
|
19 |
- |
|
20 |
-LICENSE="EPL" |
|
21 |
-SLOT="0" |
|
22 |
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86" |
|
23 |
-IUSE="doc emacs java odbc ssl tcltk" |
|
24 |
- |
|
25 |
-RDEPEND=">=dev-lang/perl-5.6.1 |
|
26 |
- ssl? ( >=dev-libs/openssl-0.9.7d ) |
|
27 |
- emacs? ( virtual/emacs ) |
|
28 |
- java? ( >=virtual/jdk-1.2 ) |
|
29 |
- odbc? ( dev-db/unixODBC )" |
|
30 |
-DEPEND="${RDEPEND} |
|
31 |
- tcltk? ( dev-lang/tk )" |
|
32 |
- |
|
33 |
-S=${WORKDIR}/${MY_P} |
|
34 |
- |
|
35 |
-SITEFILE=50erlang-gentoo.el |
|
36 |
- |
|
37 |
-src_unpack() { |
|
38 |
- unpack ${A} |
|
39 |
- cd "${S}" |
|
40 |
- epatch "${FILESDIR}/${PN}-10.2.7-export-TARGET.patch" |
|
41 |
- epatch "${FILESDIR}/10.2.7-manpage-emacs-gentoo.patch" |
|
42 |
- use odbc || sed -i 's: odbc : :' lib/Makefile |
|
43 |
- epatch "${DISTDIR}"/otp_src_${MY_PV}_epoll.patch |
|
44 |
- epatch "${FILESDIR}"/supervisor-dict.patch |
|
45 |
- # Patch for glibc-2.4 first noted in Bug #128254 -- NOTE this is a |
|
46 |
- # compile time fix, runtime still requires testing, see |
|
47 |
- # http://www.erlang.org/ml-archive/erlang-questions/200601/msg00500.html |
|
48 |
- epatch "${FILESDIR}/glibc-2.4-fix.patch" |
|
49 |
-} |
|
50 |
- |
|
51 |
-src_compile() { |
|
52 |
- use java || export JAVAC=false |
|
53 |
- econf \ |
|
54 |
- --enable-threads \ |
|
55 |
- --enable-kernel-poll \ |
|
56 |
- $(use_with ssl) \ |
|
57 |
- || die |
|
58 |
- make || die |
|
59 |
- |
|
60 |
- if use emacs ; then |
|
61 |
- pushd lib/tools/emacs |
|
62 |
- elisp-compile *.el |
|
63 |
- popd |
|
64 |
- fi |
|
65 |
-} |
|
66 |
- |
|
67 |
-src_install() { |
|
68 |
- local ERL_LIBDIR=/usr/$(get_libdir)/erlang |
|
69 |
- |
|
70 |
- make INSTALL_PREFIX="${D}" install || die |
|
71 |
- dodoc AUTHORS EPLICENCE README |
|
72 |
- |
|
73 |
- dosym ${ERL_LIBDIR}/bin/erl /usr/bin/erl |
|
74 |
- dosym ${ERL_LIBDIR}/bin/erlc /usr/bin/erlc |
|
75 |
- dosym ${ERL_LIBDIR}/bin/ecc /usr/bin/ecc |
|
76 |
- dosym ${ERL_LIBDIR}/bin/elink /usr/bin/elink |
|
77 |
- dosym ${ERL_LIBDIR}/bin/ear /usr/bin/ear |
|
78 |
- dosym ${ERL_LIBDIR}/bin/escript /usr/bin/escript |
|
79 |
- |
|
80 |
- ## Remove ${D} from the following files |
|
81 |
- dosed ${ERL_LIBDIR}/bin/erl |
|
82 |
- dosed ${ERL_LIBDIR}/bin/start |
|
83 |
- cd ${ERL_LIBDIR}/erts-* |
|
84 |
- grep -rle "${D}" "${D}"/${ERL_LIBDIR}/erts-* | xargs sed -i -e "s:${D}::g" |
|
85 |
- |
|
86 |
- ## Clean up the no longer needed files |
|
87 |
- rm "${D}"/${ERL_LIBDIR}/Install |
|
88 |
- |
|
89 |
- if use doc ; then |
|
90 |
- for file in "${WORKDIR}"/man/man*/*.[1-9]; do |
|
91 |
- # Avoid namespace collisions |
|
92 |
- local newfile=${file}erl |
|
93 |
- cp $file $newfile |
|
94 |
- # Man page processing tools expect a capitalized "SEE ALSO" section |
|
95 |
- # header |
|
96 |
- sed -i -e 's,\.SH See Also,\.SH SEE ALSO,g' $newfile |
|
97 |
- doman ${newfile} |
|
98 |
- done |
|
99 |
- dohtml -A README,erl,hrl,c,h,kwc,info -r "${WORKDIR}"/doc "${WORKDIR}"/lib "${WORKDIR}"/erts-* |
|
100 |
- fi |
|
101 |
- |
|
102 |
- if use emacs ; then |
|
103 |
- pushd "${S}" |
|
104 |
- elisp-install erlang lib/tools/emacs/*.{el,elc} |
|
105 |
- elisp-site-file-install "${FILESDIR}"/${SITEFILE} |
|
106 |
- popd |
|
107 |
- fi |
|
108 |
-} |
|
109 |
- |
|
110 |
-pkg_postinst() { |
|
111 |
- use emacs && elisp-site-regen |
|
112 |
-} |
|
113 |
- |
|
114 |
-pkg_postrm() { |
|
115 |
- use emacs && elisp-site-regen |
|
116 |
-} |
... | ... |
@@ -1,107 +0,0 @@ |
1 |
-# Copyright 1999-2006 Gentoo Foundation |
|
2 |
-# Distributed under the terms of the GNU General Public License v2 |
|
3 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-10.2.5.ebuild,v 1.5 2006/03/07 23:14:21 vapier Exp $ |
|
4 |
- |
|
5 |
-inherit eutils multilib flag-o-matic elisp-common |
|
6 |
- |
|
7 |
-#erlang uses a really weird versioning scheme which caused quite a few problems already |
|
8 |
-#Thus we do a slight modification converting all letters to digits to make it more sane (see e.g. #26420) |
|
9 |
-#the next line selects the right source. |
|
10 |
-MY_PV=R10B-5 |
|
11 |
-MY_P=otp_src_${MY_PV} |
|
12 |
-DESCRIPTION="Erlang programming language, runtime environment, and large collection of libraries" |
|
13 |
-HOMEPAGE="http://www.erlang.org/" |
|
14 |
-SRC_URI="http://www.erlang.org/download/${MY_P}.tar.gz |
|
15 |
- doc? ( http://erlang.org/download/otp_doc_man_${MY_PV}.tar.gz |
|
16 |
- http://erlang.org/download/otp_doc_html_${MY_PV}.tar.gz )" |
|
17 |
- |
|
18 |
-LICENSE="EPL" |
|
19 |
-SLOT="0" |
|
20 |
-KEYWORDS="~amd64 ppc sparc x86" |
|
21 |
-IUSE="doc emacs java odbc ssl X" |
|
22 |
- |
|
23 |
-RDEPEND=">=dev-lang/perl-5.6.1 |
|
24 |
- ssl? ( >=dev-libs/openssl-0.9.7d ) |
|
25 |
- emacs? ( virtual/emacs ) |
|
26 |
- java? ( >=virtual/jdk-1.2 ) |
|
27 |
- odbc? ( dev-db/unixODBC )" |
|
28 |
-DEPEND="${RDEPEND} |
|
29 |
- dev-lang/tk" |
|
30 |
- |
|
31 |
-S=${WORKDIR}/${MY_P} |
|
32 |
- |
|
33 |
-SITEFILE=50erlang-gentoo.el |
|
34 |
- |
|
35 |
-src_unpack() { |
|
36 |
- unpack ${A} |
|
37 |
- cd "${S}" |
|
38 |
- epatch "${FILESDIR}"/${PN}-10.2.6-export-TARGET.patch |
|
39 |
- epatch "${FILESDIR}"/10.2.6-manpage-emacs-gentoo.patch |
|
40 |
- use odbc || sed -i 's: odbc : :' lib/Makefile |
|
41 |
-} |
|
42 |
- |
|
43 |
-src_compile() { |
|
44 |
- use java || export JAVAC=false |
|
45 |
- econf \ |
|
46 |
- --enable-threads \ |
|
47 |
- $(use_with ssl) \ |
|
48 |
- || die |
|
49 |
- make || die |
|
50 |
- |
|
51 |
- if use emacs ; then |
|
52 |
- pushd lib/tools/emacs |
|
53 |
- elisp-compile *.el |
|
54 |
- popd |
|
55 |
- fi |
|
56 |
-} |
|
57 |
- |
|
58 |
-src_install() { |
|
59 |
- local ERL_LIBDIR=/usr/$(get_libdir)/erlang |
|
60 |
- |
|
61 |
- make INSTALL_PREFIX="${D}" install || die |
|
62 |
- dodoc AUTHORS EPLICENCE README |
|
63 |
- |
|
64 |
- dosym ${ERL_LIBDIR}/bin/erl /usr/bin/erl |
|
65 |
- dosym ${ERL_LIBDIR}/bin/erlc /usr/bin/erlc |
|
66 |
- dosym ${ERL_LIBDIR}/bin/ecc /usr/bin/ecc |
|
67 |
- dosym ${ERL_LIBDIR}/bin/elink /usr/bin/elink |
|
68 |
- dosym ${ERL_LIBDIR}/bin/ear /usr/bin/ear |
|
69 |
- dosym ${ERL_LIBDIR}/bin/escript /usr/bin/escript |
|
70 |
- |
|
71 |
- ## Remove ${D} from the following files |
|
72 |
- dosed ${ERL_LIBDIR}/bin/erl |
|
73 |
- dosed ${ERL_LIBDIR}/bin/start |
|
74 |
- cd ${ERL_LIBDIR}/erts-* |
|
75 |
- grep -rle "${D}" "${D}"/${ERL_LIBDIR}/erts-* | xargs sed -i -e "s:${D}::g" |
|
76 |
- |
|
77 |
- ## Clean up the no longer needed files |
|
78 |
- rm "${D}"/${ERL_LIBDIR}/Install |
|
79 |
- |
|
80 |
- if use doc ; then |
|
81 |
- for file in "${WORKDIR}"/man/man*/*.[1-9]; do |
|
82 |
- # Avoid namespace collisions |
|
83 |
- local newfile=${file}erl |
|
84 |
- cp $file $newfile |
|
85 |
- # Man page processing tools expect a capitalized "SEE ALSO" section |
|
86 |
- # header |
|
87 |
- sed -i -e 's,\.SH See Also,\.SH SEE ALSO,g' $newfile |
|
88 |
- doman ${newfile} |
|
89 |
- done |
|
90 |
- dohtml -A README,erl,hrl,c,h,kwc,info -r "${WORKDIR}"/doc "${WORKDIR}"/lib "${WORKDIR}"/erts-* |
|
91 |
- fi |
|
92 |
- |
|
93 |
- if use emacs ; then |
|
94 |
- pushd "${S}" |
|
95 |
- elisp-install erlang lib/tools/emacs/*.{el,elc} |
|
96 |
- elisp-site-file-install "${FILESDIR}"/${SITEFILE} |
|
97 |
- popd |
|
98 |
- fi |
|
99 |
-} |
|
100 |
- |
|
101 |
-pkg_postinst() { |
|
102 |
- use emacs && elisp-site-regen |
|
103 |
-} |
|
104 |
- |
|
105 |
-pkg_postrm() { |
|
106 |
- use emacs && elisp-site-regen |
|
107 |
-} |
... | ... |
@@ -1,109 +0,0 @@ |
1 |
-# Copyright 1999-2006 Gentoo Foundation |
|
2 |
-# Distributed under the terms of the GNU General Public License v2 |
|
3 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-10.2.6.ebuild,v 1.6 2006/03/07 23:14:21 vapier Exp $ |
|
4 |
- |
|
5 |
-inherit eutils multilib flag-o-matic elisp-common |
|
6 |
- |
|
7 |
-#erlang uses a really weird versioning scheme which caused quite a few problems already |
|
8 |
-#Thus we do a slight modification converting all letters to digits to make it more sane (see e.g. #26420) |
|
9 |
-#the next line selects the right source. |
|
10 |
-MY_PV=R10B-6 |
|
11 |
-MY_P=otp_src_${MY_PV} |
|
12 |
-DESCRIPTION="Erlang programming language, runtime environment, and large collection of libraries" |
|
13 |
-HOMEPAGE="http://www.erlang.org/" |
|
14 |
-SRC_URI="http://www.erlang.org/download/${MY_P}.tar.gz |
|
15 |
- doc? ( http://erlang.org/download/otp_doc_man_${MY_PV}.tar.gz |
|
16 |
- http://erlang.org/download/otp_doc_html_${MY_PV}.tar.gz )" |
|
17 |
- |
|
18 |
-LICENSE="EPL" |
|
19 |
-SLOT="0" |
|
20 |
-KEYWORDS="~amd64 ~ppc ~sparc x86" |
|
21 |
-IUSE="doc emacs java odbc ssl X" |
|
22 |
- |
|
23 |
-RDEPEND=">=dev-lang/perl-5.6.1 |
|
24 |
- ssl? ( >=dev-libs/openssl-0.9.7d ) |
|
25 |
- emacs? ( virtual/emacs ) |
|
26 |
- java? ( >=virtual/jdk-1.2 ) |
|
27 |
- odbc? ( dev-db/unixODBC )" |
|
28 |
-DEPEND="${RDEPEND} |
|
29 |
- " |
|
30 |
- |
|
31 |
-S=${WORKDIR}/${MY_P} |
|
32 |
- |
|
33 |
-SITEFILE=50erlang-gentoo.el |
|
34 |
- |
|
35 |
-src_unpack() { |
|
36 |
- unpack ${A} |
|
37 |
- cd "${S}" |
|
38 |
- epatch "${FILESDIR}"/${P}-export-TARGET.patch |
|
39 |
- epatch "${FILESDIR}"/${PV}-manpage-emacs-gentoo.patch |
|
40 |
- epatch "${FILESDIR}"/supervisor-dict.patch |
|
41 |
- epatch "${DISTDIR}"/otp_src_${MY_PV}_epoll.patch |
|
42 |
- use odbc || sed -i 's: odbc : :' lib/Makefile |
|
43 |
-} |
|
44 |
- |
|
45 |
-src_compile() { |
|
46 |
- use java || export JAVAC=false |
|
47 |
- econf \ |
|
48 |
- --enable-threads \ |
|
49 |
- $(use_with ssl) \ |
|
50 |
- || die |
|
51 |
- make || die |
|
52 |
- |
|
53 |
- if use emacs ; then |
|
54 |
- pushd lib/tools/emacs |
|
55 |
- elisp-compile *.el |
|
56 |
- popd |
|
57 |
- fi |
|
58 |
-} |
|
59 |
- |
|
60 |
-src_install() { |
|
61 |
- local ERL_LIBDIR=/usr/$(get_libdir)/erlang |
|
62 |
- |
|
63 |
- make INSTALL_PREFIX="${D}" install || die |
|
64 |
- dodoc AUTHORS EPLICENCE README |
|
65 |
- |
|
66 |
- dosym ${ERL_LIBDIR}/bin/erl /usr/bin/erl |
|
67 |
- dosym ${ERL_LIBDIR}/bin/erlc /usr/bin/erlc |
|
68 |
- dosym ${ERL_LIBDIR}/bin/ecc /usr/bin/ecc |
|
69 |
- dosym ${ERL_LIBDIR}/bin/elink /usr/bin/elink |
|
70 |
- dosym ${ERL_LIBDIR}/bin/ear /usr/bin/ear |
|
71 |
- dosym ${ERL_LIBDIR}/bin/escript /usr/bin/escript |
|
72 |
- |
|
73 |
- ## Remove ${D} from the following files |
|
74 |
- dosed ${ERL_LIBDIR}/bin/erl |
|
75 |
- dosed ${ERL_LIBDIR}/bin/start |
|
76 |
- cd ${ERL_LIBDIR}/erts-* |
|
77 |
- grep -rle "${D}" "${D}"/${ERL_LIBDIR}/erts-* | xargs sed -i -e "s:${D}::g" |
|
78 |
- |
|
79 |
- ## Clean up the no longer needed files |
|
80 |
- rm "${D}"/${ERL_LIBDIR}/Install |
|
81 |
- |
|
82 |
- if use doc ; then |
|
83 |
- for file in "${WORKDIR}"/man/man*/*.[1-9]; do |
|
84 |
- # Avoid namespace collisions |
|
85 |
- local newfile=${file}erl |
|
86 |
- cp $file $newfile |
|
87 |
- # Man page processing tools expect a capitalized "SEE ALSO" section |
|
88 |
- # header |
|
89 |
- sed -i -e 's,\.SH See Also,\.SH SEE ALSO,g' $newfile |
|
90 |
- doman ${newfile} |
|
91 |
- done |
|
92 |
- dohtml -A README,erl,hrl,c,h,kwc,info -r "${WORKDIR}"/doc "${WORKDIR}"/lib "${WORKDIR}"/erts-* |
|
93 |
- fi |
|
94 |
- |
|
95 |
- if use emacs ; then |
|
96 |
- pushd "${S}" |
|
97 |
- elisp-install erlang lib/tools/emacs/*.{el,elc} |
|
98 |
- elisp-site-file-install "${FILESDIR}"/${SITEFILE} |
|
99 |
- popd |
|
100 |
- fi |
|
101 |
-} |
|
102 |
- |
|
103 |
-pkg_postinst() { |
|
104 |
- use emacs && elisp-site-regen |
|
105 |
-} |
|
106 |
- |
|
107 |
-pkg_postrm() { |
|
108 |
- use emacs && elisp-site-regen |
|
109 |
-} |
... | ... |
@@ -1,110 +0,0 @@ |
1 |
-# Copyright 1999-2006 Gentoo Foundation |
|
2 |
-# Distributed under the terms of the GNU General Public License v2 |
|
3 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-10.2.7.ebuild,v 1.3 2006/03/07 23:14:21 vapier Exp $ |
|
4 |
- |
|
5 |
-inherit eutils multilib flag-o-matic elisp-common |
|
6 |
- |
|
7 |
-#erlang uses a really weird versioning scheme which caused quite a few problems already |
|
8 |
-#Thus we do a slight modification converting all letters to digits to make it more sane (see e.g. #26420) |
|
9 |
-#the next line selects the right source. |
|
10 |
-MY_PV=R10B-7 |
|
11 |
-MY_P=otp_src_${MY_PV} |
|
12 |
-DESCRIPTION="Erlang programming language, runtime environment, and large collection of libraries" |
|
13 |
-HOMEPAGE="http://www.erlang.org/" |
|
14 |
-SRC_URI="http://www.erlang.org/download/${MY_P}.tar.gz |
|
15 |
- doc? ( http://erlang.org/download/otp_doc_man_${MY_PV}.tar.gz |
|
16 |
- http://erlang.org/download/otp_doc_html_${MY_PV}.tar.gz ) |
|
17 |
- http://developer.sipphone.com/ejabberd/erlang_epoll_patch/otp_src_${MY_PV}_epoll.patch" |
|
18 |
- |
|
19 |
-LICENSE="EPL" |
|
20 |
-SLOT="0" |
|
21 |
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86" |
|
22 |
-IUSE="doc emacs java odbc ssl tcltk" |
|
23 |
- |
|
24 |
-RDEPEND=">=dev-lang/perl-5.6.1 |
|
25 |
- ssl? ( >=dev-libs/openssl-0.9.7d ) |
|
26 |
- emacs? ( virtual/emacs ) |
|
27 |
- java? ( >=virtual/jdk-1.2 ) |
|
28 |
- odbc? ( dev-db/unixODBC )" |
|
29 |
-DEPEND="${RDEPEND} |
|
30 |
- tcltk? ( dev-lang/tk )" |
|
31 |
- |
|
32 |
-S=${WORKDIR}/${MY_P} |
|
33 |
- |
|
34 |
-SITEFILE=50erlang-gentoo.el |
|
35 |
- |
|
36 |
-src_unpack() { |
|
37 |
- unpack ${A} |
|
38 |
- cd "${S}" |
|
39 |
- epatch "${FILESDIR}"/${P}-export-TARGET.patch |
|
40 |
- epatch "${FILESDIR}"/${PV}-manpage-emacs-gentoo.patch |
|
41 |
-# epatch "${FILESDIR}"/supervisor-dict.patch |
|
42 |
- use odbc || sed -i 's: odbc : :' lib/Makefile |
|
43 |
- epatch "${DISTDIR}"/otp_src_${MY_PV}_epoll.patch |
|
44 |
-} |
|
45 |
- |
|
46 |
-src_compile() { |
|
47 |
- use java || export JAVAC=false |
|
48 |
- econf \ |
|
49 |
- --enable-threads \ |
|
50 |
- $(use_with ssl) \ |
|
51 |
- || die |
|
52 |
- make || die |
|
53 |
- |
|
54 |
- if use emacs ; then |
|
55 |
- pushd lib/tools/emacs |
|
56 |
- elisp-compile *.el |
|
57 |
- popd |
|
58 |
- fi |
|
59 |
-} |
|
60 |
- |
|
61 |
-src_install() { |
|
62 |
- local ERL_LIBDIR=/usr/$(get_libdir)/erlang |
|
63 |
- |
|
64 |
- make INSTALL_PREFIX="${D}" install || die |
|
65 |
- dodoc AUTHORS EPLICENCE README |
|
66 |
- |
|
67 |
- dosym ${ERL_LIBDIR}/bin/erl /usr/bin/erl |
|
68 |
- dosym ${ERL_LIBDIR}/bin/erlc /usr/bin/erlc |
|
69 |
- dosym ${ERL_LIBDIR}/bin/ecc /usr/bin/ecc |
|
70 |
- dosym ${ERL_LIBDIR}/bin/elink /usr/bin/elink |
|
71 |
- dosym ${ERL_LIBDIR}/bin/ear /usr/bin/ear |
|
72 |
- dosym ${ERL_LIBDIR}/bin/escript /usr/bin/escript |
|
73 |
- |
|
74 |
- ## Remove ${D} from the following files |
|
75 |
- dosed ${ERL_LIBDIR}/bin/erl |
|
76 |
- dosed ${ERL_LIBDIR}/bin/start |
|
77 |
- cd ${ERL_LIBDIR}/erts-* |
|
78 |
- grep -rle "${D}" "${D}"/${ERL_LIBDIR}/erts-* | xargs sed -i -e "s:${D}::g" |
|
79 |
- |
|
80 |
- ## Clean up the no longer needed files |
|
81 |
- rm "${D}"/${ERL_LIBDIR}/Install |
|
82 |
- |
|
83 |
- if use doc ; then |
|
84 |
- for file in "${WORKDIR}"/man/man*/*.[1-9]; do |
|
85 |
- # Avoid namespace collisions |
|
86 |
- local newfile=${file}erl |
|
87 |
- cp $file $newfile |
|
88 |
- # Man page processing tools expect a capitalized "SEE ALSO" section |
|
89 |
- # header |
|
90 |
- sed -i -e 's,\.SH See Also,\.SH SEE ALSO,g' $newfile |
|
91 |
- doman ${newfile} |
|
92 |
- done |
|
93 |
- dohtml -A README,erl,hrl,c,h,kwc,info -r "${WORKDIR}"/doc "${WORKDIR}"/lib "${WORKDIR}"/erts-* |
|
94 |
- fi |
|
95 |
- |
|
96 |
- if use emacs ; then |
|
97 |
- pushd "${S}" |
|
98 |
- elisp-install erlang lib/tools/emacs/*.{el,elc} |
|
99 |
- elisp-site-file-install "${FILESDIR}"/${SITEFILE} |
|
100 |
- popd |
|
101 |
- fi |
|
102 |
-} |
|
103 |
- |
|
104 |
-pkg_postinst() { |
|
105 |
- use emacs && elisp-site-regen |
|
106 |
-} |
|
107 |
- |
|
108 |
-pkg_postrm() { |
|
109 |
- use emacs && elisp-site-regen |
|
110 |
-} |
... | ... |
@@ -1,109 +0,0 @@ |
1 |
-# Copyright 1999-2006 Gentoo Foundation |
|
2 |
-# Distributed under the terms of the GNU General Public License v2 |
|
3 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-11.2.0.ebuild,v 1.1 2006/05/27 04:27:43 mkennedy Exp $ |
|
4 |
- |
|
5 |
-inherit eutils multilib flag-o-matic elisp-common versionator |
|
6 |
- |
|
7 |
-#erlang uses a really weird versioning scheme which caused quite a few problems already |
|
8 |
-#Thus we do a slight modification converting all letters to digits to make it more sane (see e.g. #26420) |
|
9 |
-#the next line selects the right source. |
|
10 |
-MY_PV="R$(get_major_version)B-$(get_version_component_range 3)" |
|
11 |
-# ATTN!! Take care when processing the C, etc version! |
|
12 |
-MY_P=otp_src_${MY_PV} |
|
13 |
-DESCRIPTION="Erlang programming language, runtime environment, and large collection of libraries" |
|
14 |
-HOMEPAGE="http://www.erlang.org/" |
|
15 |
-SRC_URI="http://www.erlang.org/download/${MY_P}.tar.gz |
|
16 |
- doc? ( http://erlang.org/download/otp_doc_man_${MY_PV}.tar.gz |
|
17 |
- http://erlang.org/download/otp_doc_html_${MY_PV}.tar.gz )" |
|
18 |
- |
|
19 |
-LICENSE="EPL" |
|
20 |
-SLOT="0" |
|
21 |
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86" |
|
22 |
-IUSE="doc emacs java odbc ssl tcltk" |
|
23 |
- |
|
24 |
-RDEPEND=">=dev-lang/perl-5.6.1 |
|
25 |
- ssl? ( >=dev-libs/openssl-0.9.7d ) |
|
26 |
- emacs? ( virtual/emacs ) |
|
27 |
- java? ( >=virtual/jdk-1.2 ) |
|
28 |
- odbc? ( dev-db/unixODBC )" |
|
29 |
-DEPEND="${RDEPEND} |
|
30 |
- tcltk? ( dev-lang/tk )" |
|
31 |
- |
|
32 |
-S=${WORKDIR}/${MY_P} |
|
33 |
- |
|
34 |
-SITEFILE=50erlang-gentoo.el |
|
35 |
- |
|
36 |
-src_unpack() { |
|
37 |
- unpack ${A} |
|
38 |
- cd "${S}" |
|
39 |
- epatch "${FILESDIR}/${PN}-10.2.7-export-TARGET.patch" |
|
40 |
- epatch "${FILESDIR}/10.2.7-manpage-emacs-gentoo.patch" |
|
41 |
- use odbc || sed -i 's: odbc : :' lib/Makefile |
|
42 |
-} |
|
43 |
- |
|
44 |
-src_compile() { |
|
45 |
- use java || export JAVAC=false |
|
46 |
- econf \ |
|
47 |
- --enable-threads \ |
|
48 |
- --enable-kernel-poll \ |
|
49 |
- $(use_with ssl) \ |
|
50 |
- || die |
|
51 |
- make || die |
|
52 |
- |
|
53 |
- if use emacs ; then |
|
54 |
- pushd lib/tools/emacs |
|
55 |
- elisp-compile *.el |
|
56 |
- popd |
|
57 |
- fi |
|
58 |
-} |
|
59 |
- |
|
60 |
-src_install() { |
|
61 |
- local ERL_LIBDIR=/usr/$(get_libdir)/erlang |
|
62 |
- |
|
63 |
- make INSTALL_PREFIX="${D}" install || die |
|
64 |
- dodoc AUTHORS EPLICENCE README |
|
65 |
- |
|
66 |
- dosym ${ERL_LIBDIR}/bin/erl /usr/bin/erl |
|
67 |
- dosym ${ERL_LIBDIR}/bin/erlc /usr/bin/erlc |
|
68 |
- dosym ${ERL_LIBDIR}/bin/ecc /usr/bin/ecc |
|
69 |
- dosym ${ERL_LIBDIR}/bin/elink /usr/bin/elink |
|
70 |
- dosym ${ERL_LIBDIR}/bin/ear /usr/bin/ear |
|
71 |
- dosym ${ERL_LIBDIR}/bin/escript /usr/bin/escript |
|
72 |
- |
|
73 |
- ## Remove ${D} from the following files |
|
74 |
- dosed ${ERL_LIBDIR}/bin/erl |
|
75 |
- dosed ${ERL_LIBDIR}/bin/start |
|
76 |
- cd ${ERL_LIBDIR}/erts-* |
|
77 |
- grep -rle "${D}" "${D}"/${ERL_LIBDIR}/erts-* | xargs sed -i -e "s:${D}::g" |
|
78 |
- |
|
79 |
- ## Clean up the no longer needed files |
|
80 |
- rm "${D}"/${ERL_LIBDIR}/Install |
|
81 |
- |
|
82 |
- if use doc ; then |
|
83 |
- for file in "${WORKDIR}"/man/man*/*.[1-9]; do |
|
84 |
- # Avoid namespace collisions |
|
85 |
- local newfile=${file}erl |
|
86 |
- cp $file $newfile |
|
87 |
- # Man page processing tools expect a capitalized "SEE ALSO" section |
|
88 |
- # header |
|
89 |
- sed -i -e 's,\.SH See Also,\.SH SEE ALSO,g' $newfile |
|
90 |
- doman ${newfile} |
|
91 |
- done |
|
92 |
- dohtml -A README,erl,hrl,c,h,kwc,info -r "${WORKDIR}"/doc "${WORKDIR}"/lib "${WORKDIR}"/erts-* |
|
93 |
- fi |
|
94 |
- |
|
95 |
- if use emacs ; then |
|
96 |
- pushd "${S}" |
|
97 |
- elisp-install erlang lib/tools/emacs/*.{el,elc} |
|
98 |
- elisp-site-file-install "${FILESDIR}"/${SITEFILE} |
|
99 |
- popd |
|
100 |
- fi |
|
101 |
-} |
|
102 |
- |
|
103 |
-pkg_postinst() { |
|
104 |
- use emacs && elisp-site-regen |
|
105 |
-} |
|
106 |
- |
|
107 |
-pkg_postrm() { |
|
108 |
- use emacs && elisp-site-regen |
|
109 |
-} |
... | ... |
@@ -1,162 +0,0 @@ |
1 |
-# Copyright 1999-2006 Gentoo Foundation |
|
2 |
-# Distributed under the terms of the GNU General Public License v2 |
|
3 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-11.2.0.ebuild,v 1.1 2006/05/27 04:27:43 mkennedy Exp $ |
|
4 |
- |
|
5 |
-inherit eutils multilib flag-o-matic elisp-common versionator |
|
6 |
- |
|
7 |
-#erlang uses a really weird versioning scheme which caused quite a few problems already |
|
8 |
-#Thus we do a slight modification converting all letters to digits to make it more sane (see e.g. #26420) |
|
9 |
-#the next line selects the right source. |
|
10 |
-MY_PV="R$(get_major_version)B-$(get_version_component_range 3)" |
|
11 |
-# ATTN!! Take care when processing the C, etc version! |
|
12 |
-MY_P=otp_src_${MY_PV} |
|
13 |
-DESCRIPTION="Erlang programming language, runtime environment, and large collection of libraries" |
|
14 |
-HOMEPAGE="http://www.erlang.org/" |
|
15 |
-SRC_URI="http://www.erlang.org/download/${MY_P}.tar.gz |
|
16 |
- doc? ( http://erlang.org/download/otp_doc_man_${MY_PV}.tar.gz |
|
17 |
- http://erlang.org/download/otp_doc_html_${MY_PV}.tar.gz )" |
|
18 |
- |
|
19 |
-LICENSE="EPL" |
|
20 |
-SLOT="0" |
|
21 |
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86" |
|
22 |
-IUSE="doc emacs java odbc ssl tcltk smp kernel-poll hipe threads" |
|
23 |
- |
|
24 |
-RDEPEND=">=dev-lang/perl-5.6.1 |
|
25 |
- ssl? ( >=dev-libs/openssl-0.9.7d ) |
|
26 |
- emacs? ( virtual/emacs ) |
|
27 |
- java? ( >=virtual/jdk-1.2 ) |
|
28 |
- odbc? ( dev-db/unixODBC )" |
|
29 |
-DEPEND="${RDEPEND} |
|
30 |
- tcltk? ( dev-lang/tk )" |
|
31 |
- |
|
32 |
-S=${WORKDIR}/${MY_P} |
|
33 |
- |
|
34 |
-SITEFILE=50erlang-gentoo.el |
|
35 |
- |
|
36 |
-src_unpack() { |
|
37 |
- unpack ${A} |
|
38 |
- cd "${S}" |
|
39 |
- epatch "${FILESDIR}/${PN}-10.2.7-export-TARGET.patch" |
|
40 |
- epatch "${FILESDIR}/10.2.7-manpage-emacs-gentoo.patch" |
|
41 |
- epatch "${FILESDIR}/${PN}-${PV}-epoll.patch" |
|
42 |
-# epatch "${FILESDIR}/supervisor-dict.patch" |
|
43 |
- use odbc || sed -i 's: odbc : :' lib/Makefile |
|
44 |
-} |
|
45 |
- |
|
46 |
-src_compile() { |
|
47 |
- if use java ; then |
|
48 |
- ewarn "Enabling : java" |
|
49 |
- else |
|
50 |
- ewarn "Disabling : java" |
|
51 |
- export JAVAC=false |
|
52 |
- fi |
|
53 |
- |
|
54 |
- if use ssl ; then |
|
55 |
- ewarn "Enabling : ssl" |
|
56 |
- else |
|
57 |
- ewarn "Disabling : ssl" |
|
58 |
- fi |
|
59 |
- |
|
60 |
- if use threads ; then |
|
61 |
- ewarn "Enabling : threads" |
|
62 |
- else |
|
63 |
- ewarn "Disabling : threads" |
|
64 |
- fi |
|
65 |
- |
|
66 |
- ECONF_EXTRA= |
|
67 |
- if use hipe ; then |
|
68 |
- ewarn "Enabling : hipe" |
|
69 |
- ECONF_EXTRA="${ECONF_EXTRA} --enable-hipe" |
|
70 |
- else |
|
71 |
- ewarn "Disabling : hipe" |
|
72 |
- ECONF_EXTRA="${ECONF_EXTRA} --disable-hipe" |
|
73 |
- fi |
|
74 |
- if use smp ; then |
|
75 |
- ewarn "Enabling : smp-support" |
|
76 |
- ECONF_EXTRA="${ECONF_EXTRA} --enable-smp-support --disable-kernel-poll" |
|
77 |
-# ECONF_EXTRA="${ECONF_EXTRA} --enable-smp-support" |
|
78 |
-# ECONF_EXTRA="${ECONF_EXTRA} --disable-kernel-poll" |
|
79 |
- if use kernel-poll ; then |
|
80 |
- ewarn |
|
81 |
- ewarn "Alert : Currently you can only compile Erlang using kernel-poll OR smp!" |
|
82 |
- ewarn |
|
83 |
- ebeep 3 |
|
84 |
- fi |
|
85 |
- ewarn "Disabling : kernel-poll" |
|
86 |
- else |
|
87 |
- ewarn "Disabling : smp-support" |
|
88 |
- ECONF_EXTRA="${ECONF_EXTRA} --disable-smp-support" |
|
89 |
- if use kernel-poll ; then |
|
90 |
- ewarn "Enabling : kernel-poll" |
|
91 |
- ECONF_EXTRA="${ECONF_EXTRA} --enable-kernel-poll" |
|
92 |
- else |
|
93 |
- ewarn "Disabling : kernel-poll" |
|
94 |
- ECONF_EXTRA="${ECONF_EXTRA} --disable-kernel-poll" |
|
95 |
- fi |
|
96 |
- fi |
|
97 |
- |
|
98 |
- econf \ |
|
99 |
- $(use_enable threads) \ |
|
100 |
- $(use_with ssl) \ |
|
101 |
- ${ECONF_EXTRA} \ |
|
102 |
- || die |
|
103 |
- |
|
104 |
- make || die |
|
105 |
- |
|
106 |
- if use emacs ; then |
|
107 |
- pushd lib/tools/emacs |
|
108 |
- elisp-compile *.el |
|
109 |
- popd |
|
110 |
- fi |
|
111 |
-} |
|
112 |
- |
|
113 |
-src_install() { |
|
114 |
- local ERL_LIBDIR=/usr/$(get_libdir)/erlang |
|
115 |
- |
|
116 |
- make INSTALL_PREFIX="${D}" install || die |
|
117 |
- dodoc AUTHORS EPLICENCE README |
|
118 |
- |
|
119 |
- dosym ${ERL_LIBDIR}/bin/erl /usr/bin/erl |
|
120 |
- dosym ${ERL_LIBDIR}/bin/erlc /usr/bin/erlc |
|
121 |
- dosym ${ERL_LIBDIR}/bin/ecc /usr/bin/ecc |
|
122 |
- dosym ${ERL_LIBDIR}/bin/elink /usr/bin/elink |
|
123 |
- dosym ${ERL_LIBDIR}/bin/ear /usr/bin/ear |
|
124 |
- dosym ${ERL_LIBDIR}/bin/escript /usr/bin/escript |
|
125 |
- |
|
126 |
- ## Remove ${D} from the following files |
|
127 |
- dosed ${ERL_LIBDIR}/bin/erl |
|
128 |
- dosed ${ERL_LIBDIR}/bin/start |
|
129 |
- cd ${ERL_LIBDIR}/erts-* |
|
130 |
- grep -rle "${D}" "${D}"/${ERL_LIBDIR}/erts-* | xargs sed -i -e "s:${D}::g" |
|
131 |
- |
|
132 |
- ## Clean up the no longer needed files |
|
133 |
- rm "${D}"/${ERL_LIBDIR}/Install |
|
134 |
- |
|
135 |
- if use doc ; then |
|
136 |
- for file in "${WORKDIR}"/man/man*/*.[1-9]; do |
|
137 |
- # Avoid namespace collisions |
|
138 |
- local newfile=${file}erl |
|
139 |
- cp $file $newfile |
|
140 |
- # Man page processing tools expect a capitalized "SEE ALSO" section |
|
141 |
- # header |
|
142 |
- sed -i -e 's,\.SH See Also,\.SH SEE ALSO,g' $newfile |
|
143 |
- doman ${newfile} |
|
144 |
- done |
|
145 |
- dohtml -A README,erl,hrl,c,h,kwc,info -r "${WORKDIR}"/doc "${WORKDIR}"/lib "${WORKDIR}"/erts-* |
|
146 |
- fi |
|
147 |
- |
|
148 |
- if use emacs ; then |
|
149 |
- pushd "${S}" |
|
150 |
- elisp-install erlang lib/tools/emacs/*.{el,elc} |
|
151 |
- elisp-site-file-install "${FILESDIR}"/${SITEFILE} |
|
152 |
- popd |
|
153 |
- fi |
|
154 |
-} |
|
155 |
- |
|
156 |
-pkg_postinst() { |
|
157 |
- use emacs && elisp-site-regen |
|
158 |
-} |
|
159 |
- |
|
160 |
-pkg_postrm() { |
|
161 |
- use emacs && elisp-site-regen |
|
162 |
-} |
... | ... |
@@ -1,162 +0,0 @@ |
1 |
-# Copyright 1999-2006 Gentoo Foundation |
|
2 |
-# Distributed under the terms of the GNU General Public License v2 |
|
3 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-11.2.0.ebuild,v 1.1 2006/05/27 04:27:43 mkennedy Exp $ |
|
4 |
- |
|
5 |
-inherit eutils multilib flag-o-matic elisp-common versionator |
|
6 |
- |
|
7 |
-#erlang uses a really weird versioning scheme which caused quite a few problems already |
|
8 |
-#Thus we do a slight modification converting all letters to digits to make it more sane (see e.g. #26420) |
|
9 |
-#the next line selects the right source. |
|
10 |
-MY_PV="R$(get_major_version)B-$(get_version_component_range 3)" |
|
11 |
-# ATTN!! Take care when processing the C, etc version! |
|
12 |
-MY_P=otp_src_${MY_PV} |
|
13 |
-DESCRIPTION="Erlang programming language, runtime environment, and large collection of libraries" |
|
14 |
-HOMEPAGE="http://www.erlang.org/" |
|
15 |
-SRC_URI="http://www.erlang.org/download/${MY_P}.tar.gz |
|
16 |
- doc? ( http://erlang.org/download/otp_doc_man_${MY_PV}.tar.gz |
|
17 |
- http://erlang.org/download/otp_doc_html_${MY_PV}.tar.gz )" |
|
18 |
- |
|
19 |
-LICENSE="EPL" |
|
20 |
-SLOT="0" |
|
21 |
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86" |
|
22 |
-IUSE="doc emacs java odbc ssl tcltk smp kernel-poll hipe threads" |
|
23 |
- |
|
24 |
-RDEPEND=">=dev-lang/perl-5.6.1 |
|
25 |
- ssl? ( >=dev-libs/openssl-0.9.7d ) |
|
26 |
- emacs? ( virtual/emacs ) |
|
27 |
- java? ( >=virtual/jdk-1.2 ) |
|
28 |
- odbc? ( dev-db/unixODBC )" |
|
29 |
-DEPEND="${RDEPEND} |
|
30 |
- tcltk? ( dev-lang/tk )" |
|
31 |
- |
|
32 |
-S=${WORKDIR}/${MY_P} |
|
33 |
- |
|
34 |
-SITEFILE=50erlang-gentoo.el |
|
35 |
- |
|
36 |
-src_unpack() { |
|
37 |
- unpack ${A} |
|
38 |
- cd "${S}" |
|
39 |
- epatch "${FILESDIR}/${PN}-10.2.7-export-TARGET.patch" |
|
40 |
- epatch "${FILESDIR}/10.2.7-manpage-emacs-gentoo.patch" |
|
41 |
-# epatch "${FILESDIR}/${PN}-${PV}-epoll.patch" |
|
42 |
-# epatch "${FILESDIR}/supervisor-dict.patch" |
|
43 |
- use odbc || sed -i 's: odbc : :' lib/Makefile |
|
44 |
-} |
|
45 |
- |
|
46 |
-src_compile() { |
|
47 |
- if use java ; then |
|
48 |
- ewarn "Enabling : java" |
|
49 |
- else |
|
50 |
- ewarn "Disabling : java" |
|
51 |
- export JAVAC=false |
|
52 |
- fi |
|
53 |
- |
|
54 |
- if use ssl ; then |
|
55 |
- ewarn "Enabling : ssl" |
|
56 |
- else |
|
57 |
- ewarn "Disabling : ssl" |
|
58 |
- fi |
|
59 |
- |
|
60 |
- if use threads ; then |
|
61 |
- ewarn "Enabling : threads" |
|
62 |
- else |
|
63 |
- ewarn "Disabling : threads" |
|
64 |
- fi |
|
65 |
- |
|
66 |
- ECONF_EXTRA= |
|
67 |
- if use hipe ; then |
|
68 |
- ewarn "Enabling : hipe" |
|
69 |
- ECONF_EXTRA="${ECONF_EXTRA} --enable-hipe" |
|
70 |
- else |
|
71 |
- ewarn "Disabling : hipe" |
|
72 |
- ECONF_EXTRA="${ECONF_EXTRA} --disable-hipe" |
|
73 |
- fi |
|
74 |
- if use smp ; then |
|
75 |
- ewarn "Enabling : smp-support" |
|
76 |
- ECONF_EXTRA="${ECONF_EXTRA} --enable-smp-support --disable-kernel-poll" |
|
77 |
-# ECONF_EXTRA="${ECONF_EXTRA} --enable-smp-support" |
|
78 |
-# ECONF_EXTRA="${ECONF_EXTRA} --disable-kernel-poll" |
|
79 |
- if use kernel-poll ; then |
|
80 |
- ewarn |
|
81 |
- ewarn "Alert : Currently you can only compile Erlang using kernel-poll OR smp!" |
|
82 |
- ewarn |
|
83 |
- ebeep 3 |
|
84 |
- fi |
|
85 |
- ewarn "Disabling : kernel-poll" |
|
86 |
- else |
|
87 |
- ewarn "Disabling : smp-support" |
|
88 |
- ECONF_EXTRA="${ECONF_EXTRA} --disable-smp-support" |
|
89 |
- if use kernel-poll ; then |
|
90 |
- ewarn "Enabling : kernel-poll" |
|
91 |
- ECONF_EXTRA="${ECONF_EXTRA} --enable-kernel-poll" |
|
92 |
- else |
|
93 |
- ewarn "Disabling : kernel-poll" |
|
94 |
- ECONF_EXTRA="${ECONF_EXTRA} --disable-kernel-poll" |
|
95 |
- fi |
|
96 |
- fi |
|
97 |
- |
|
98 |
- econf \ |
|
99 |
- $(use_enable threads) \ |
|
100 |
- $(use_with ssl) \ |
|
101 |
- ${ECONF_EXTRA} \ |
|
102 |
- || die |
|
103 |
- |
|
104 |
- make || die |
|
105 |
- |
|
106 |
- if use emacs ; then |
|
107 |
- pushd lib/tools/emacs |
|
108 |
- elisp-compile *.el |
|
109 |
- popd |
|
110 |
- fi |
|
111 |
-} |
|
112 |
- |
|
113 |
-src_install() { |
|
114 |
- local ERL_LIBDIR=/usr/$(get_libdir)/erlang |
|
115 |
- |
|
116 |
- make INSTALL_PREFIX="${D}" install || die |
|
117 |
- dodoc AUTHORS EPLICENCE README |
|
118 |
- |
|
119 |
- dosym ${ERL_LIBDIR}/bin/erl /usr/bin/erl |
|
120 |
- dosym ${ERL_LIBDIR}/bin/erlc /usr/bin/erlc |
|
121 |
- dosym ${ERL_LIBDIR}/bin/ecc /usr/bin/ecc |
|
122 |
- dosym ${ERL_LIBDIR}/bin/elink /usr/bin/elink |
|
123 |
- dosym ${ERL_LIBDIR}/bin/ear /usr/bin/ear |
|
124 |
- dosym ${ERL_LIBDIR}/bin/escript /usr/bin/escript |
|
125 |
- |
|
126 |
- ## Remove ${D} from the following files |
|
127 |
- dosed ${ERL_LIBDIR}/bin/erl |
|
128 |
- dosed ${ERL_LIBDIR}/bin/start |
|
129 |
- cd ${ERL_LIBDIR}/erts-* |
|
130 |
- grep -rle "${D}" "${D}"/${ERL_LIBDIR}/erts-* | xargs sed -i -e "s:${D}::g" |
|
131 |
- |
|
132 |
- ## Clean up the no longer needed files |
|
133 |
- rm "${D}"/${ERL_LIBDIR}/Install |
|
134 |
- |
|
135 |
- if use doc ; then |
|
136 |
- for file in "${WORKDIR}"/man/man*/*.[1-9]; do |
|
137 |
- # Avoid namespace collisions |
|
138 |
- local newfile=${file}erl |
|
139 |
- cp $file $newfile |
|
140 |
- # Man page processing tools expect a capitalized "SEE ALSO" section |
|
141 |
- # header |
|
142 |
- sed -i -e 's,\.SH See Also,\.SH SEE ALSO,g' $newfile |
|
143 |
- doman ${newfile} |
|
144 |
- done |
|
145 |
- dohtml -A README,erl,hrl,c,h,kwc,info -r "${WORKDIR}"/doc "${WORKDIR}"/lib "${WORKDIR}"/erts-* |
|
146 |
- fi |
|
147 |
- |
|
148 |
- if use emacs ; then |
|
149 |
- pushd "${S}" |
|
150 |
- elisp-install erlang lib/tools/emacs/*.{el,elc} |
|
151 |
- elisp-site-file-install "${FILESDIR}"/${SITEFILE} |
|
152 |
- popd |
|
153 |
- fi |
|
154 |
-} |
|
155 |
- |
|
156 |
-pkg_postinst() { |
|
157 |
- use emacs && elisp-site-regen |
|
158 |
-} |
|
159 |
- |
|
160 |
-pkg_postrm() { |
|
161 |
- use emacs && elisp-site-regen |
|
162 |
-} |
... | ... |
@@ -1,43 +0,0 @@ |
1 |
-# Copyright 1999-2006 Gentoo Foundation |
|
2 |
-# Distributed under the terms of the GNU General Public License v2 |
|
3 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-8b.ebuild,v 1.11 2006/03/07 23:14:21 vapier Exp $ |
|
4 |
- |
|
5 |
-MY_P=otp_src_R8B-2 |
|
6 |
-DESCRIPTION="Erlang programming language, runtime environment, and large collection of libraries" |
|
7 |
-HOMEPAGE="http://www.erlang.org/" |
|
8 |
-SRC_URI="http://www.erlang.org/download/${MY_P}.tar.gz" |
|
9 |
- |
|
10 |
-LICENSE="EPL" |
|
11 |
-SLOT="0" |
|
12 |
-KEYWORDS="x86 ppc sparc" |
|
13 |
-IUSE="X ssl" |
|
14 |
- |
|
15 |
-DEPEND=">=dev-lang/perl-5.6.1 |
|
16 |
- ssl? ( >=dev-libs/openssl-0.9.6d )" |
|
17 |
- |
|
18 |
-S=${WORKDIR}/${MY_P} |
|
19 |
- |
|
20 |
-addpredict /dev/pty # Bug #25366 |
|
21 |
- |
|
22 |
-src_compile() { |
|
23 |
- econf --enable-threads || die "./configure failed" |
|
24 |
- make || die |
|
25 |
-} |
|
26 |
- |
|
27 |
-src_install() { |
|
28 |
- ERL_LIBDIR="/usr/lib/erlang" |
|
29 |
- |
|
30 |
- make INSTALL_PREFIX=${D} install || die |
|
31 |
- dodoc AUTHORS EPLICENCE README |
|
32 |
- |
|
33 |
- dosym ${ERL_LIBDIR}/bin/erl /usr/bin/erl |
|
34 |
- dosym ${ERL_LIBDIR}/bin/erlc /usr/bin/erlc |
|
35 |
- dosym ${ERL_LIBDIR}/erts-5.1.2/bin/epmd ${ERL_LIBDIR}/bin/ |
|
36 |
- |
|
37 |
- ## Remove ${D} from the /usr/lib/erlang/bin/erl and start script |
|
38 |
- dosed ${ERL_LIBDIR}/bin/erl |
|
39 |
- dosed ${ERL_LIBDIR}/bin/start |
|
40 |
- |
|
41 |
- ## Clean up the no longer needed |
|
42 |
- rm ${D}/${ERL_LIBDIR}/Install |
|
43 |
-} |
... | ... |
@@ -1,62 +0,0 @@ |
1 |
-# Copyright 1999-2006 Gentoo Foundation |
|
2 |
-# Distributed under the terms of the GNU General Public License v2 |
|
3 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-9c-r1.ebuild,v 1.9 2006/03/07 23:14:21 vapier Exp $ |
|
4 |
- |
|
5 |
-inherit eutils |
|
6 |
- |
|
7 |
-MY_P=otp_src_R9B-1 |
|
8 |
-DESCRIPTION="Erlang programming language, runtime environment, and large collection of libraries" |
|
9 |
-HOMEPAGE="http://www.erlang.org/" |
|
10 |
-SRC_URI="http://www.erlang.org/download/${MY_P}.tar.gz" |
|
11 |
- |
|
12 |
-LICENSE="EPL" |
|
13 |
-SLOT="0" |
|
14 |
-KEYWORDS="x86 ~ppc ~sparc" |
|
15 |
-IUSE="X ssl" |
|
16 |
- |
|
17 |
-DEPEND=">=dev-lang/perl-5.6.1 |
|
18 |
- ssl? ( >=dev-libs/openssl-0.9.6d )" |
|
19 |
- |
|
20 |
-S=${WORKDIR}/${MY_P} |
|
21 |
- |
|
22 |
-addpredict /dev/pty # Bug #25366 |
|
23 |
- |
|
24 |
-src_unpack(){ |
|
25 |
- unpack ${A} |
|
26 |
- cd ${S} |
|
27 |
- #combines nsswitch.conf parsing and a fix for strange install behaviour on some systems |
|
28 |
- epatch ${FILESDIR}/${P}.patch |
|
29 |
-} |
|
30 |
- |
|
31 |
-src_compile() { |
|
32 |
- econf --enable-threads || die "./configure failed" |
|
33 |
- make || die |
|
34 |
-} |
|
35 |
- |
|
36 |
-src_install() { |
|
37 |
- ERL_LIBDIR="/usr/lib/erlang" |
|
38 |
- |
|
39 |
- make INSTALL_PREFIX=${D} install || die |
|
40 |
- dodoc AUTHORS EPLICENCE README |
|
41 |
- |
|
42 |
- dosym ${ERL_LIBDIR}/bin/erl /usr/bin/erl |
|
43 |
- dosym ${ERL_LIBDIR}/bin/erlc /usr/bin/erlc |
|
44 |
- dosym ${ERL_LIBDIR}/bin/ecc /usr/bin/ecc |
|
45 |
- dosym ${ERL_LIBDIR}/bin/elink /usr/bin/elink |
|
46 |
- dosym ${ERL_LIBDIR}/bin/ear /usr/bin/ear |
|
47 |
- dosym ${ERL_LIBDIR}/bin/escript /usr/bin/escript |
|
48 |
- |
|
49 |
- ## Remove ${D} from the following files |
|
50 |
- dosed ${ERL_LIBDIR}/bin/erl |
|
51 |
- dosed ${ERL_LIBDIR}/bin/start |
|
52 |
- dosed ${ERL_LIBDIR}/bin/ecc |
|
53 |
- dosed ${ERL_LIBDIR}/bin/ear |
|
54 |
- dosed ${ERL_LIBDIR}/bin/elink |
|
55 |
- dosed ${ERL_LIBDIR}/bin/escript |
|
56 |
- dosed ${ERL_LIBDIR}/bin/esh |
|
57 |
- dosed ${ERL_LIBDIR}/erts-*/bin/erl |
|
58 |
- dosed ${ERL_LIBDIR}/erts-*/bin/start |
|
59 |
- |
|
60 |
- ## Clean up the no longer needed files |
|
61 |
- rm ${D}/${ERL_LIBDIR}/Install |
|
62 |
-} |
... | ... |
@@ -1,63 +0,0 @@ |
1 |
-# Copyright 1999-2006 Gentoo Foundation |
|
2 |
-# Distributed under the terms of the GNU General Public License v2 |
|
3 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-9c-r2.ebuild,v 1.7 2006/03/07 23:14:21 vapier Exp $ |
|
4 |
- |
|
5 |
-inherit eutils toolchain-funcs flag-o-matic |
|
6 |
- |
|
7 |
-MY_P=otp_src_R9C-0 |
|
8 |
-DESCRIPTION="Erlang programming language, runtime environment, and large collection of libraries" |
|
9 |
-HOMEPAGE="http://www.erlang.org/" |
|
10 |
-SRC_URI="http://www.erlang.org/download/${MY_P}.tar.gz" |
|
11 |
- |
|
12 |
-LICENSE="EPL" |
|
13 |
-SLOT="0" |
|
14 |
-KEYWORDS="x86 ppc sparc" |
|
15 |
-IUSE="X ssl" |
|
16 |
- |
|
17 |
-DEPEND=">=dev-lang/perl-5.6.1 |
|
18 |
- ssl? ( >=dev-libs/openssl-0.9.6d )" |
|
19 |
- |
|
20 |
-S=${WORKDIR}/${MY_P} |
|
21 |
- |
|
22 |
-src_unpack(){ |
|
23 |
- unpack ${A} |
|
24 |
- cd ${S} |
|
25 |
- # combines nsswit ch.conf parsing and a fix for strange install behaviour on some systems |
|
26 |
- epatch ${FILESDIR}/${PV}.patch |
|
27 |
-} |
|
28 |
- |
|
29 |
-src_compile() { |
|
30 |
- [ "`gcc-fullversion`" == "3.3.2" ] && filter-mfpmath sse |
|
31 |
- [ "`gcc-fullversion`" == "3.3.3" ] && filter-mfpmath sse |
|
32 |
- addpredict /dev/pty # Bug #25366 |
|
33 |
- econf --enable-threads || die |
|
34 |
- make || die |
|
35 |
-} |
|
36 |
- |
|
37 |
-src_install() { |
|
38 |
- ERL_LIBDIR="/usr/lib/erlang" |
|
39 |
- |
|
40 |
- make INSTALL_PREFIX=${D} install || die |
|
41 |
- dodoc AUTHORS EPLICENCE README |
|
42 |
- |
|
43 |
- dosym ${ERL_LIBDIR}/bin/erl /usr/bin/erl |
|
44 |
- dosym ${ERL_LIBDIR}/bin/erlc /usr/bin/erlc |
|
45 |
- dosym ${ERL_LIBDIR}/bin/ecc /usr/bin/ecc |
|
46 |
- dosym ${ERL_LIBDIR}/bin/elink /usr/bin/elink |
|
47 |
- dosym ${ERL_LIBDIR}/bin/ear /usr/bin/ear |
|
48 |
- dosym ${ERL_LIBDIR}/bin/escript /usr/bin/escript |
|
49 |
- |
|
50 |
- ## Remove ${D} from the following files |
|
51 |
- dosed ${ERL_LIBDIR}/bin/erl |
|
52 |
- dosed ${ERL_LIBDIR}/bin/start |
|
53 |
- dosed ${ERL_LIBDIR}/bin/ecc |
|
54 |
- dosed ${ERL_LIBDIR}/bin/ear |
|
55 |
- dosed ${ERL_LIBDIR}/bin/elink |
|
56 |
- dosed ${ERL_LIBDIR}/bin/escript |
|
57 |
- dosed ${ERL_LIBDIR}/bin/esh |
|
58 |
- dosed ${ERL_LIBDIR}/erts-*/bin/erl |
|
59 |
- dosed ${ERL_LIBDIR}/erts-*/bin/start |
|
60 |
- |
|
61 |
- ## Clean up the no longer needed files |
|
62 |
- rm ${D}/${ERL_LIBDIR}/Install |
|
63 |
-} |
... | ... |
@@ -1,62 +0,0 @@ |
1 |
-# Copyright 1999-2006 Gentoo Foundation |
|
2 |
-# Distributed under the terms of the GNU General Public License v2 |
|
3 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-9c-r3.ebuild,v 1.3 2006/03/07 23:14:21 vapier Exp $ |
|
4 |
- |
|
5 |
-inherit eutils toolchain-funcs flag-o-matic |
|
6 |
- |
|
7 |
-MY_P=otp_src_R9C-0 |
|
8 |
-DESCRIPTION="Erlang programming language, runtime environment, and large collection of libraries" |
|
9 |
-HOMEPAGE="http://www.erlang.org/" |
|
10 |
-SRC_URI="http://www.erlang.org/download/${MY_P}.tar.gz" |
|
11 |
- |
|
12 |
-LICENSE="EPL" |
|
13 |
-SLOT="0" |
|
14 |
-KEYWORDS="-*" |
|
15 |
-#KEYWORDS="~x86 ~ppc ~sparc ~amd64" |
|
16 |
-IUSE="X ssl" |
|
17 |
- |
|
18 |
-DEPEND=">=dev-lang/perl-5.6.1 |
|
19 |
- ssl? ( >=dev-libs/openssl-0.9.6d )" |
|
20 |
- |
|
21 |
-S=${WORKDIR}/${MY_P} |
|
22 |
- |
|
23 |
-src_unpack(){ |
|
24 |
- unpack ${A} |
|
25 |
- cd ${S} |
|
26 |
- # combines nsswit ch.conf parsing and a fix for strange install behaviour on some systems |
|
27 |
- epatch ${FILESDIR}/${PV}.patch |
|
28 |
-} |
|
29 |
- |
|
30 |
-src_compile() { |
|
31 |
- [ "`gcc-fullversion`" == "3.3.2" ] && filter-mfpmath sse |
|
32 |
- [ "`gcc-fullversion`" == "3.3.3" ] && filter-mfpmath sse |
|
33 |
- addpredict /dev/pty # Bug #25366 |
|
34 |
- |
|
35 |
- #erlang configure seems to "misdetect" CHOST on amd64 |
|
36 |
- [ "${ARCH}" = "amd64" ] && CHOST="x86_64-unknown-linux-gnu" |
|
37 |
- econf --enable-threads || die |
|
38 |
- make || die |
|
39 |
-} |
|
40 |
- |
|
41 |
-src_install() { |
|
42 |
- ERL_LIBDIR="/usr/lib/erlang" |
|
43 |
- |
|
44 |
- make INSTALL_PREFIX=${D} install || die |
|
45 |
- dodoc AUTHORS EPLICENCE README |
|
46 |
- |
|
47 |
- dosym ${ERL_LIBDIR}/bin/erl /usr/bin/erl |
|
48 |
- dosym ${ERL_LIBDIR}/bin/erlc /usr/bin/erlc |
|
49 |
- dosym ${ERL_LIBDIR}/bin/ecc /usr/bin/ecc |
|
50 |
- dosym ${ERL_LIBDIR}/bin/elink /usr/bin/elink |
|
51 |
- dosym ${ERL_LIBDIR}/bin/ear /usr/bin/ear |
|
52 |
- dosym ${ERL_LIBDIR}/bin/escript /usr/bin/escript |
|
53 |
- |
|
54 |
- ## Remove ${D} from the following files |
|
55 |
- dosed ${ERL_LIBDIR}/bin/erl |
|
56 |
- dosed ${ERL_LIBDIR}/bin/start |
|
57 |
- cd ${ERL_LIBDIR}/erts-* |
|
58 |
- grep -rle ${D} ${D}/${ERL_LIBDIR}/erts-* | xargs sed -i -e "s:${D}::g" |
|
59 |
- |
|
60 |
- ## Clean up the no longer needed files |
|
61 |
- rm ${D}/${ERL_LIBDIR}/Install |
|
62 |
-} |
... | ... |
@@ -1,53 +0,0 @@ |
1 |
-# Copyright 1999-2006 Gentoo Foundation |
|
2 |
-# Distributed under the terms of the GNU General Public License v2 |
|
3 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-9c.ebuild,v 1.7 2006/03/07 23:14:21 vapier Exp $ |
|
4 |
- |
|
5 |
-MY_P=otp_src_R9B-1 |
|
6 |
-DESCRIPTION="Erlang programming language, runtime environment, and large collection of libraries" |
|
7 |
-HOMEPAGE="http://www.erlang.org/" |
|
8 |
-SRC_URI="http://www.erlang.org/download/${MY_P}.tar.gz" |
|
9 |
- |
|
10 |
-LICENSE="EPL" |
|
11 |
-SLOT="0" |
|
12 |
-KEYWORDS="x86 ~ppc ~sparc" |
|
13 |
-IUSE="X ssl" |
|
14 |
- |
|
15 |
-DEPEND=">=dev-lang/perl-5.6.1 |
|
16 |
- ssl? ( >=dev-libs/openssl-0.9.6d )" |
|
17 |
- |
|
18 |
-S=${WORKDIR}/${MY_P} |
|
19 |
- |
|
20 |
-addpredict /dev/pty # Bug #25366 |
|
21 |
- |
|
22 |
-src_compile() { |
|
23 |
- econf --enable-threads || die "./configure failed" |
|
24 |
- make || die |
|
25 |
-} |
|
26 |
- |
|
27 |
-src_install() { |
|
28 |
- ERL_LIBDIR="/usr/lib/erlang" |
|
29 |
- |
|
30 |
- make INSTALL_PREFIX=${D} install || die |
|
31 |
- dodoc AUTHORS EPLICENCE README |
|
32 |
- |
|
33 |
- dosym ${ERL_LIBDIR}/bin/erl /usr/bin/erl |
|
34 |
- dosym ${ERL_LIBDIR}/bin/erlc /usr/bin/erlc |
|
35 |
- dosym ${ERL_LIBDIR}/bin/ecc /usr/bin/ecc |
|
36 |
- dosym ${ERL_LIBDIR}/bin/elink /usr/bin/elink |
|
37 |
- dosym ${ERL_LIBDIR}/bin/ear /usr/bin/ear |
|
38 |
- dosym ${ERL_LIBDIR}/bin/escript /usr/bin/escript |
|
39 |
- |
|
40 |
- ## Remove ${D} from the following files |
|
41 |
- dosed ${ERL_LIBDIR}/bin/erl |
|
42 |
- dosed ${ERL_LIBDIR}/bin/start |
|
43 |
- dosed ${ERL_LIBDIR}/bin/ecc |
|
44 |
- dosed ${ERL_LIBDIR}/bin/ear |
|
45 |
- dosed ${ERL_LIBDIR}/bin/elink |
|
46 |
- dosed ${ERL_LIBDIR}/bin/escript |
|
47 |
- dosed ${ERL_LIBDIR}/bin/esh |
|
48 |
- dosed ${ERL_LIBDIR}/erts-*/bin/erl |
|
49 |
- dosed ${ERL_LIBDIR}/erts-*/bin/start |
|
50 |
- |
|
51 |
- ## Clean up the no longer needed files |
|
52 |
- rm ${D}/${ERL_LIBDIR}/Install |
|
53 |
-} |
... | ... |
@@ -1,31 +0,0 @@ |
1 |
-diff -ur otp_src_R10B-6.orig/lib/tools/emacs/erlang.el otp_src_R10B-6/lib/tools/emacs/erlang.el |
|
2 |
---- otp_src_R10B-6.orig/lib/tools/emacs/erlang.el 2004-09-30 02:05:50.000000000 -0500 |
|
3 |
-+++ otp_src_R10B-6/lib/tools/emacs/erlang.el 2005-07-18 13:52:13.000000000 -0500 |
|
4 |
-@@ -2518,7 +2518,7 @@ |
|
5 |
- |
|
6 |
- (defun erlang-man-make-menu-item (file) |
|
7 |
- "Create a menu item containing the name of the man page." |
|
8 |
-- (and (string-match ".*/\\([^/]+\\)\\.[^.]$" file) |
|
9 |
-+ (and (string-match ".*/\\([^/]+\\)\\.[0-9]erl\\.gz$" file) |
|
10 |
- (let ((page (substring file (match-beginning 1) (match-end 1)))) |
|
11 |
- (list (capitalize page) |
|
12 |
- (list 'lambda '() |
|
13 |
-@@ -2529,7 +2529,7 @@ |
|
14 |
- |
|
15 |
- (defun erlang-man-get-files (dir) |
|
16 |
- "Return files in directory DIR." |
|
17 |
-- (directory-files dir t ".*\\.[0-9]\\'")) |
|
18 |
-+ (directory-files dir t ".*\\.[0-9]erl\\.gz\\'")) |
|
19 |
- |
|
20 |
- |
|
21 |
- (defun erlang-man-module (&optional module) |
|
22 |
-@@ -2690,7 +2690,7 @@ |
|
23 |
- (error nil)) |
|
24 |
- (if file |
|
25 |
- (let ((process-environment (copy-sequence process-environment))) |
|
26 |
-- (if (string-match "\\(.*\\)/man[^/]*/\\([^/]+\\)\\.[^.]$" file) |
|
27 |
-+ (if (string-match "\\(.*\\)/man[^/]*/\\([^/]+\\)\\.[0-9]erl.gz$" file) |
|
28 |
- (let ((dir (substring file (match-beginning 1) (match-end 1))) |
|
29 |
- (page (substring file (match-beginning 2) (match-end 2)))) |
|
30 |
- (if (fboundp 'setenv) |
|
31 |
-Only in otp_src_R10B-6/lib/tools/emacs: erlang.el~ |
... | ... |
@@ -1,31 +0,0 @@ |
1 |
-diff -ur otp_src_R10B-6.orig/lib/tools/emacs/erlang.el otp_src_R10B-6/lib/tools/emacs/erlang.el |
|
2 |
---- otp_src_R10B-6.orig/lib/tools/emacs/erlang.el 2004-09-30 02:05:50.000000000 -0500 |
|
3 |
-+++ otp_src_R10B-6/lib/tools/emacs/erlang.el 2005-07-18 13:52:13.000000000 -0500 |
|
4 |
-@@ -2518,7 +2518,7 @@ |
|
5 |
- |
|
6 |
- (defun erlang-man-make-menu-item (file) |
|
7 |
- "Create a menu item containing the name of the man page." |
|
8 |
-- (and (string-match ".*/\\([^/]+\\)\\.[^.]$" file) |
|
9 |
-+ (and (string-match ".*/\\([^/]+\\)\\.[0-9]erl\\.gz$" file) |
|
10 |
- (let ((page (substring file (match-beginning 1) (match-end 1)))) |
|
11 |
- (list (capitalize page) |
|
12 |
- (list 'lambda '() |
|
13 |
-@@ -2529,7 +2529,7 @@ |
|
14 |
- |
|
15 |
- (defun erlang-man-get-files (dir) |
|
16 |
- "Return files in directory DIR." |
|
17 |
-- (directory-files dir t ".*\\.[0-9]\\'")) |
|
18 |
-+ (directory-files dir t ".*\\.[0-9]erl\\.gz\\'")) |
|
19 |
- |
|
20 |
- |
|
21 |
- (defun erlang-man-module (&optional module) |
|
22 |
-@@ -2690,7 +2690,7 @@ |
|
23 |
- (error nil)) |
|
24 |
- (if file |
|
25 |
- (let ((process-environment (copy-sequence process-environment))) |
|
26 |
-- (if (string-match "\\(.*\\)/man[^/]*/\\([^/]+\\)\\.[^.]$" file) |
|
27 |
-+ (if (string-match "\\(.*\\)/man[^/]*/\\([^/]+\\)\\.[0-9]erl.gz$" file) |
|
28 |
- (let ((dir (substring file (match-beginning 1) (match-end 1))) |
|
29 |
- (page (substring file (match-beginning 2) (match-end 2)))) |
|
30 |
- (if (fboundp 'setenv) |
|
31 |
-Only in otp_src_R10B-6/lib/tools/emacs: erlang.el~ |
... | ... |
@@ -1,55 +0,0 @@ |
1 |
-diff -ru otp_src_R9B-1-orig/lib/kernel/src/inet_config.erl otp_src_R9B-1/lib/kernel/src/inet_config.erl |
|
2 |
---- otp_src_R9B-1-orig/lib/kernel/src/inet_config.erl 2002-10-09 07:39:22.000000000 -0700 |
|
3 |
-+++ otp_src_R9B-1/lib/kernel/src/inet_config.erl 2003-07-03 17:43:37.000000000 -0700 |
|
4 |
-@@ -82,8 +82,13 @@ |
|
5 |
- 'bsd/os' -> |
|
6 |
- load_resolv(filename:join(Etc,"irs.conf"), host_conf_bsdos); |
|
7 |
- linux -> |
|
8 |
-- load_resolv(filename:join(Etc,"host.conf"),host_conf_linux), |
|
9 |
-- |
|
10 |
-+ case load_resolv(filename:join(Etc,"host.conf"),host_conf_linux) of |
|
11 |
-+ ok -> |
|
12 |
-+ ok; |
|
13 |
-+ _Other -> |
|
14 |
-+ load_resolv(filename:join(Etc,"nsswitch.conf"), nsswitch_conf) |
|
15 |
-+ end, |
|
16 |
-+ |
|
17 |
- % It may be the case that the domain name was not set |
|
18 |
- % because the hostname was short. But we can now look it |
|
19 |
- % up and get the long name and the domain name from it. |
|
20 |
-@@ -296,10 +301,12 @@ |
|
21 |
- case apply(inet_parse, Func, [File,{chars,Bin}]) of |
|
22 |
- {ok, Ls} -> inet_db:add_rc_list(Ls); |
|
23 |
- {error, Reason} -> |
|
24 |
-- error("parse error in file ~s: ~p", [File, Reason]) |
|
25 |
-+ error("parse error in file ~s: ~p", [File, Reason]), |
|
26 |
-+ {error, Reason} |
|
27 |
- end; |
|
28 |
- Error -> |
|
29 |
-- warning("file not found ~s~n", [File]) |
|
30 |
-+ warning("file not found ~s~n", [File]), |
|
31 |
-+ Error |
|
32 |
- end. |
|
33 |
- |
|
34 |
- %% |
|
35 |
-diff -ru otp_src_R9B-1-orig/lib/megaco/src/text/Makefile otp_src_R9B-1/lib/megaco/src/text/Makefile |
|
36 |
---- otp_src_R9B-1-orig/lib/megaco/src/text/Makefile 2002-11-28 05:50:00.000000000 -0800 |
|
37 |
-+++ otp_src_R9B-1/lib/megaco/src/text/Makefile 2003-07-03 17:44:41.000000000 -0700 |
|
38 |
-@@ -48,10 +48,15 @@ |
|
39 |
- $(INTERNAL_YRL_FILES:%.yrl=%.erl) |
|
40 |
- |
|
41 |
- BEAM_TARGET_FILES = \ |
|
42 |
-- $(INTERNAL_YRL_FILES:%.yrl=$(EBIN)/%.$(EMULATOR)) \ |
|
43 |
- $(MODULES:%=$(EBIN)/%.$(EMULATOR)) |
|
44 |
- |
|
45 |
--TARGET_FILES = $(ERL_TARGET_FILES) $(BEAM_TARGET_FILES) |
|
46 |
-+YRL_BEAM_TARGET_FILES = \ |
|
47 |
-+ $(INTERNAL_YRL_FILES:%.yrl=$(EBIN)/%.$(EMULATOR)) |
|
48 |
-+ |
|
49 |
-+ |
|
50 |
-+ |
|
51 |
-+TARGET_FILES = $(ERL_TARGET_FILES) $(BEAM_TARGET_FILES) $(YRL_BEAM_TARGETS) |
|
52 |
-+ |
|
53 |
- |
|
54 |
- |
|
55 |
- # ---------------------------------------------------- |
... | ... |
@@ -1 +0,0 @@ |
1 |
-MD5 e6b776520521d92fe019d116de181ce4 otp_src_R10B-0.tar.gz 9296524 |
... | ... |
@@ -1,12 +0,0 @@ |
1 |
-MD5 d6e9655ff07af642025b0465c5e7e1a6 otp_doc_html_R10B-10.tar.gz 4655081 |
|
2 |
-RMD160 d11108d871ab7f164c7e4dd1000cd8cdca7cb64d otp_doc_html_R10B-10.tar.gz 4655081 |
|
3 |
-SHA256 2373d6935b44b64a137bf8ba198dca3fb782d0c072735b172ae4420c380a5d9c otp_doc_html_R10B-10.tar.gz 4655081 |
|
4 |
-MD5 207e00bcaf5a9428bd86e3973f9b699f otp_doc_man_R10B-10.tar.gz 594690 |
|
5 |
-RMD160 b56260b7349cd4751ca56ec15fdc5515041b130b otp_doc_man_R10B-10.tar.gz 594690 |
|
6 |
-SHA256 8ecfc9b627200f59c35591a743e03a587258ddcdd39052a0b2cb58b80f6fc20b otp_doc_man_R10B-10.tar.gz 594690 |
|
7 |
-MD5 c1405c885f07d661b7362b822d571586 otp_src_R10B-10.tar.gz 9445437 |
|
8 |
-RMD160 b0e24e89241a21d5f3304791b505ab133db8fca5 otp_src_R10B-10.tar.gz 9445437 |
|
9 |
-SHA256 bd87e1b09f1f3d694fc32ef4d27372e25c95ce35b383c7747ab40c27471c28ac otp_src_R10B-10.tar.gz 9445437 |
|
10 |
-MD5 280f7ff43d4651ff637216800e16e493 otp_src_R10B-10_epoll.patch 15359 |
|
11 |
-RMD160 40a1282c6223081b4d2d9c06b30bc16163aa495f otp_src_R10B-10_epoll.patch 15359 |
|
12 |
-SHA256 7b8bbad71649e9b00f9f8639b0fe06060428aa4015eb6164e78d18a0b2508a5b otp_src_R10B-10_epoll.patch 15359 |
... | ... |
@@ -1,9 +0,0 @@ |
1 |
-MD5 9f50340fd1c25af5d5a6fcf9f14b2e49 otp_doc_html_R10B-6.tar.gz 4602685 |
|
2 |
-RMD160 f9ecb2ed8d6d0583e340d719ec56a3e670e9856b otp_doc_html_R10B-6.tar.gz 4602685 |
|
3 |
-SHA256 50174508e8507c18b1b5e80805f70fdf680db4b9b81cd9bf2cc8e1ac020e910b otp_doc_html_R10B-6.tar.gz 4602685 |
|
4 |
-MD5 0243d2ff01fb2bac03115bcbe2284b20 otp_doc_man_R10B-6.tar.gz 601812 |
|
5 |
-RMD160 82f414e454b3bca56c828e5ddb1bf59f42f945e6 otp_doc_man_R10B-6.tar.gz 601812 |
|
6 |
-SHA256 639b60c7950724566fd0d7df59b0faa683d678cd5929a138592a6affb9c6b36a otp_doc_man_R10B-6.tar.gz 601812 |
|
7 |
-MD5 6463f70b40e2a6c3587e54653add8414 otp_src_R10B-6.tar.gz 10037987 |
|
8 |
-RMD160 009dcaa078ee6045e352bc700e581ea222058f4e otp_src_R10B-6.tar.gz 10037987 |
|
9 |
-SHA256 7c6d02954b8f84e68224677eaa829a234c3aafc26ec94655e574a8028d1d40bf otp_src_R10B-6.tar.gz 10037987 |
... | ... |
@@ -1,12 +0,0 @@ |
1 |
-MD5 c73010c3d6c929c4474b8b8b38a4925c otp_doc_html_R10B-7.tar.gz 4601134 |
|
2 |
-RMD160 4cba94ec7162b35696bd471b2c32cf26935f3d6b otp_doc_html_R10B-7.tar.gz 4601134 |
|
3 |
-SHA256 d69aa07cfe3851da1c4d558cbd7a17cafc7546b396f7ab07c68a18e44cc40e71 otp_doc_html_R10B-7.tar.gz 4601134 |
|
4 |
-MD5 53b251d1a690d5a97434c6a5b0086921 otp_doc_man_R10B-7.tar.gz 601650 |
|
5 |
-RMD160 d5f33c5e35b79222fa5b57cbe736a983fa0d0316 otp_doc_man_R10B-7.tar.gz 601650 |
|
6 |
-SHA256 5bd1ba759245a5c41e7d25121c5e5ab58d0d04935eceb0960a8fb5d0bab3297d otp_doc_man_R10B-7.tar.gz 601650 |
|
7 |
-MD5 fc039c62862ebae141e27370401aaab0 otp_src_R10B-7.tar.gz 10058423 |
|
8 |
-RMD160 b97700467f855110ff1beb4e7725bb716f6a4b2e otp_src_R10B-7.tar.gz 10058423 |
|
9 |
-SHA256 7b0f96596c031a79b0f975423f0535ddba1a8d86868bb28ac3f5383709c30bf1 otp_src_R10B-7.tar.gz 10058423 |
|
10 |
-MD5 37b6e5972b2cbf536dbbf55fe61c6251 otp_src_R10B-7_epoll.patch 14823 |
|
11 |
-RMD160 559303afe1be7c9797146b33490f0bd7c567f804 otp_src_R10B-7_epoll.patch 14823 |
|
12 |
-SHA256 275ac0cd6a20f329b8c32937b08a1aea118b0073536b8910495c806191474c0e otp_src_R10B-7_epoll.patch 14823 |
... | ... |
@@ -1,9 +0,0 @@ |
1 |
-MD5 8d163f4d16c98ba2e979688842a55a9f otp_doc_html_R11B-0.tar.gz 4662110 |
|
2 |
-RMD160 ec39aa3e693a0b836b8ca9c360c14c2612c1b813 otp_doc_html_R11B-0.tar.gz 4662110 |
|
3 |
-SHA256 68cb74d5979dd2ea75c03e892e7ce1446eff27af37d9bdd4fd9778a433a19f68 otp_doc_html_R11B-0.tar.gz 4662110 |
|
4 |
-MD5 172591538db42e81b814a77f30da4fa4 otp_doc_man_R11B-0.tar.gz 624684 |
|
5 |
-RMD160 38d9218391147e192d21c438d436c98d7c0f982a otp_doc_man_R11B-0.tar.gz 624684 |
|
6 |
-SHA256 09b93f43b6bb048d3b66296e94bb6379dbac11217e2ffbe074c2492fe777ee39 otp_doc_man_R11B-0.tar.gz 624684 |
|
7 |
-MD5 367d9d3ba979cd278b78d6d0393982ba otp_src_R11B-0.tar.gz 10844070 |
|
8 |
-RMD160 cb2c163f9404feea9b56a5adddb3bdd505e0b494 otp_src_R11B-0.tar.gz 10844070 |
|
9 |
-SHA256 1806ea681b72be216e5365b29479dcb5253f0d828c021282711f5eae984c9f11 otp_src_R11B-0.tar.gz 10844070 |
... | ... |
@@ -1,9 +0,0 @@ |
1 |
-MD5 f5d3b25821f6d0763defd09f1dd4f51f otp_doc_html_R11B-1.tar.gz 4717809 |
|
2 |
-RMD160 2a7425f55245b12037a02082ace85411c04c5bb6 otp_doc_html_R11B-1.tar.gz 4717809 |
|
3 |
-SHA256 225212891e2290d0ea21e489445113d7f79ad51e4b3e3e4f0042f8876383a7bc otp_doc_html_R11B-1.tar.gz 4717809 |
|
4 |
-MD5 dbd2d3da878fed7474b7a9aa03e13c7d otp_doc_man_R11B-1.tar.gz 627132 |
|
5 |
-RMD160 666899dedc72f22387d478ffe4a1f313c57bdb01 otp_doc_man_R11B-1.tar.gz 627132 |
|
6 |
-SHA256 706e7da589cddee06b9d0a24a09e2105ae719bbfb8b6a08fe55ae45d5dbf4bd6 otp_doc_man_R11B-1.tar.gz 627132 |
|
7 |
-MD5 1fe3707d9bed898bc51444cb529fdd79 otp_src_R11B-1.tar.gz 11144896 |
|
8 |
-RMD160 db658f8221c4226f52c88ff56d2f68afbe47bac2 otp_src_R11B-1.tar.gz 11144896 |
|
9 |
-SHA256 d5a8530dfee0b2348c4ad0107409fa73ac3233f31e2300ece625a2abd9eb4da7 otp_src_R11B-1.tar.gz 11144896 |
... | ... |
@@ -1,9 +0,0 @@ |
1 |
-MD5 e2c45ced77ec63b9b1dd95c8f5396f7d otp_doc_html_R11B-2.tar.gz 4739895 |
|
2 |
-RMD160 82a4ab769566705333e059d920861d05be31754b otp_doc_html_R11B-2.tar.gz 4739895 |
|
3 |
-SHA256 588514c6b96b33dbaffd40aa5b51b9c0be65d02b6e81644c53b4c705a866db47 otp_doc_html_R11B-2.tar.gz 4739895 |
|
4 |
-MD5 c81023f591c1bace836de3aa874f3c2a otp_doc_man_R11B-2.tar.gz 632153 |
|
5 |
-RMD160 90b37a71ed29f14ec0d14a520aef47ed7b7ccad0 otp_doc_man_R11B-2.tar.gz 632153 |
|
6 |
-SHA256 643fb8210a2059b2c283c17601a0d5893f5cf409f05ed4852fbf2b0607693ac9 otp_doc_man_R11B-2.tar.gz 632153 |
|
7 |
-MD5 7d7cca1d2f392a8a317cb4c0bd904726 otp_src_R11B-2.tar.gz 11244153 |
|
8 |
-RMD160 989bab054992ba23666756379950082cd41adb00 otp_src_R11B-2.tar.gz 11244153 |
|
9 |
-SHA256 3dd483ee568c31655361474aa54a28cf11575c3b1b984f0b7a6980e083a8e44b otp_src_R11B-2.tar.gz 11244153 |
... | ... |
@@ -1 +0,0 @@ |
1 |
-MD5 c7f06d2a4d7f52655b630d99d301f0a1 otp_src_R8B-2.tar.gz 10905100 |
... | ... |
@@ -1 +0,0 @@ |
1 |
-MD5 37ac7d5e4e9fa7730775e590f4796bbf otp_src_R9B-1.tar.gz 8455643 |
... | ... |
@@ -1 +0,0 @@ |
1 |
-MD5 37ac7d5e4e9fa7730775e590f4796bbf otp_src_R9B-1.tar.gz 8455643 |
... | ... |
@@ -1 +0,0 @@ |
1 |
-MD5 d40842cf79ca65007de5ad54d3c50d18 otp_src_R9C-0.tar.gz 8229056 |
... | ... |
@@ -1 +0,0 @@ |
1 |
-MD5 d40842cf79ca65007de5ad54d3c50d18 otp_src_R9C-0.tar.gz 8229056 |
... | ... |
@@ -1,423 +0,0 @@ |
1 |
-diff -Nurp erts/acconfig.h erts/acconfig.h |
|
2 |
---- erts/acconfig.h 2005-06-21 09:37:40.000000000 -0700 |
|
3 |
-+++ erts/acconfig.h 2006-03-10 15:55:12.000000000 -0800 |
|
4 |
-@@ -188,6 +188,9 @@ |
|
5 |
- /* Define if you have the <linux/kpoll.h> header file. */ |
|
6 |
- #undef HAVE_LINUX_KPOLL_H |
|
7 |
- |
|
8 |
-+/* Define if you have the <linux/epoll.h> header file. */ |
|
9 |
-+#undef HAVE_LINUX_EPOLL_H |
|
10 |
-+ |
|
11 |
- /* Define if you have the <sys/event.h> header file. */ |
|
12 |
- #undef HAVE_SYS_EVENT_H |
|
13 |
- |
|
14 |
-@@ -224,7 +227,7 @@ |
|
15 |
- |
|
16 |
- #if !defined(USE_SELECT) |
|
17 |
- # if defined(ENABLE_KERNEL_POLL) |
|
18 |
--# if defined(HAVE_SYS_DEVPOLL_H) || defined(HAVE_LINUX_KPOLL_H) || defined(HAVE_SYS_EVENT_H) |
|
19 |
-+# if defined(HAVE_SYS_DEVPOLL_H) || defined(HAVE_LINUX_KPOLL_H) || defined(HAVE_SYS_EVENT_H) || defined(HAVE_LINUX_EPOLL_H) |
|
20 |
- # define USE_KERNEL_POLL |
|
21 |
- # endif |
|
22 |
- # endif |
|
23 |
-diff -Nurp erts/config.h.in erts/config.h.in |
|
24 |
---- erts/config.h.in 2006-03-07 15:02:41.000000000 -0800 |
|
25 |
-+++ erts/config.h.in 2006-03-10 15:55:12.000000000 -0800 |
|
26 |
-@@ -175,6 +175,8 @@ |
|
27 |
- /* Define if you have the <linux/kpoll.h> header file. */ |
|
28 |
- #undef HAVE_LINUX_KPOLL_H |
|
29 |
- |
|
30 |
-+/* Define if you have the <linux/epoll.h> header file. */ |
|
31 |
-+#undef HAVE_LINUX_EPOLL_H |
|
32 |
- |
|
33 |
- /* Define if you have the <sys/event.h> header file. */ |
|
34 |
- #undef HAVE_SYS_EVENT_H |
|
35 |
-@@ -399,7 +401,7 @@ |
|
36 |
- |
|
37 |
- #if !defined(USE_SELECT) |
|
38 |
- # if defined(ENABLE_KERNEL_POLL) |
|
39 |
--# if defined(HAVE_SYS_DEVPOLL_H) || defined(HAVE_LINUX_KPOLL_H) || defined(HAVE_SYS_EVENT_H) |
|
40 |
-+# if defined(HAVE_SYS_DEVPOLL_H) || defined(HAVE_LINUX_KPOLL_H) || defined(HAVE_SYS_EVENT_H) || defined(HAVE_LINUX_EPOLL_H) |
|
41 |
- # define USE_KERNEL_POLL |
|
42 |
- # endif |
|
43 |
- # endif |
|
44 |
-diff -Nurp erts/configure erts/configure |
|
45 |
---- erts/configure 2006-03-07 15:02:39.000000000 -0800 |
|
46 |
-+++ erts/configure 2006-03-10 15:55:12.000000000 -0800 |
|
47 |
-@@ -3825,6 +3825,151 @@ else |
|
48 |
- fi |
|
49 |
- |
|
50 |
- |
|
51 |
-+ |
|
52 |
-+if test "${ac_cv_header_sys_epoll_h+set}" = set; then |
|
53 |
-+ echo "$as_me:$LINENO: checking for sys/epoll.h" >&5 |
|
54 |
-+echo $ECHO_N "checking for sys/epoll.h... $ECHO_C" >&6 |
|
55 |
-+if test "${ac_cv_header_sys_epoll_h+set}" = set; then |
|
56 |
-+ echo $ECHO_N "(cached) $ECHO_C" >&6 |
|
57 |
-+fi |
|
58 |
-+echo "$as_me:$LINENO: result: $ac_cv_header_sys_epoll_h" >&5 |
|
59 |
-+echo "${ECHO_T}$ac_cv_header_sys_epoll_h" >&6 |
|
60 |
-+else |
|
61 |
-+ # Is the header compilable? |
|
62 |
-+echo "$as_me:$LINENO: checking sys/epoll.h usability" >&5 |
|
63 |
-+echo $ECHO_N "checking sys/epoll.h usability... $ECHO_C" >&6 |
|
64 |
-+cat >conftest.$ac_ext <<_ACEOF |
|
65 |
-+/* confdefs.h. */ |
|
66 |
-+_ACEOF |
|
67 |
-+cat confdefs.h >>conftest.$ac_ext |
|
68 |
-+cat >>conftest.$ac_ext <<_ACEOF |
|
69 |
-+/* end confdefs.h. */ |
|
70 |
-+$ac_includes_default |
|
71 |
-+#include <sys/epoll.h> |
|
72 |
-+_ACEOF |
|
73 |
-+rm -f conftest.$ac_objext |
|
74 |
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
|
75 |
-+ (eval $ac_compile) 2>conftest.er1 |
|
76 |
-+ ac_status=$? |
|
77 |
-+ grep -v '^ *+' conftest.er1 >conftest.err |
|
78 |
-+ rm -f conftest.er1 |
|
79 |
-+ cat conftest.err >&5 |
|
80 |
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
|
81 |
-+ (exit $ac_status); } && |
|
82 |
-+ { ac_try='test -z "$ac_c_werror_flag" |
|
83 |
-+ || test ! -s conftest.err' |
|
84 |
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
|
85 |
-+ (eval $ac_try) 2>&5 |
|
86 |
-+ ac_status=$? |
|
87 |
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
|
88 |
-+ (exit $ac_status); }; } && |
|
89 |
-+ { ac_try='test -s conftest.$ac_objext' |
|
90 |
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
|
91 |
-+ (eval $ac_try) 2>&5 |
|
92 |
-+ ac_status=$? |
|
93 |
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
|
94 |
-+ (exit $ac_status); }; }; then |
|
95 |
-+ ac_header_compiler=yes |
|
96 |
-+else |
|
97 |
-+ echo "$as_me: failed program was:" >&5 |
|
98 |
-+sed 's/^/| /' conftest.$ac_ext >&5 |
|
99 |
-+ |
|
100 |
-+ac_header_compiler=no |
|
101 |
-+fi |
|
102 |
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext |
|
103 |
-+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 |
|
104 |
-+echo "${ECHO_T}$ac_header_compiler" >&6 |
|
105 |
-+ |
|
106 |
-+# Is the header present? |
|
107 |
-+echo "$as_me:$LINENO: checking sys/epoll.h presence" >&5 |
|
108 |
-+echo $ECHO_N "checking sys/epoll.h presence... $ECHO_C" >&6 |
|
109 |
-+cat >conftest.$ac_ext <<_ACEOF |
|
110 |
-+/* confdefs.h. */ |
|
111 |
-+_ACEOF |
|
112 |
-+cat confdefs.h >>conftest.$ac_ext |
|
113 |
-+cat >>conftest.$ac_ext <<_ACEOF |
|
114 |
-+/* end confdefs.h. */ |
|
115 |
-+#include <sys/epoll.h> |
|
116 |
-+_ACEOF |
|
117 |
-+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 |
|
118 |
-+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 |
|
119 |
-+ ac_status=$? |
|
120 |
-+ grep -v '^ *+' conftest.er1 >conftest.err |
|
121 |
-+ rm -f conftest.er1 |
|
122 |
-+ cat conftest.err >&5 |
|
123 |
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
|
124 |
-+ (exit $ac_status); } >/dev/null; then |
|
125 |
-+ if test -s conftest.err; then |
|
126 |
-+ ac_cpp_err=$ac_c_preproc_warn_flag |
|
127 |
-+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag |
|
128 |
-+ else |
|
129 |
-+ ac_cpp_err= |
|
130 |
-+ fi |
|
131 |
-+else |
|
132 |
-+ ac_cpp_err=yes |
|
133 |
-+fi |
|
134 |
-+if test -z "$ac_cpp_err"; then |
|
135 |
-+ ac_header_preproc=yes |
|
136 |
-+else |
|
137 |
-+ echo "$as_me: failed program was:" >&5 |
|
138 |
-+sed 's/^/| /' conftest.$ac_ext >&5 |
|
139 |
-+ |
|
140 |
-+ ac_header_preproc=no |
|
141 |
-+fi |
|
142 |
-+rm -f conftest.err conftest.$ac_ext |
|
143 |
-+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 |
|
144 |
-+echo "${ECHO_T}$ac_header_preproc" >&6 |
|
145 |
-+ |
|
146 |
-+# So? What about this header? |
|
147 |
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in |
|
148 |
-+ yes:no: ) |
|
149 |
-+ { echo "$as_me:$LINENO: WARNING: sys/epoll.h: accepted by the compiler, rejected by the preprocessor!" >&5 |
|
150 |
-+echo "$as_me: WARNING: sys/epoll.h: accepted by the compiler, rejected by the preprocessor!" >&2;} |
|
151 |
-+ { echo "$as_me:$LINENO: WARNING: sys/epoll.h: proceeding with the compiler's result" >&5 |
|
152 |
-+echo "$as_me: WARNING: sys/epoll.h: proceeding with the compiler's result" >&2;} |
|
153 |
-+ ac_header_preproc=yes |
|
154 |
-+ ;; |
|
155 |
-+ no:yes:* ) |
|
156 |
-+ { echo "$as_me:$LINENO: WARNING: sys/epoll.h: present but cannot be compiled" >&5 |
|
157 |
-+echo "$as_me: WARNING: sys/epoll.h: present but cannot be compiled" >&2;} |
|
158 |
-+ { echo "$as_me:$LINENO: WARNING: sys/epoll.h: check for missing prerequisite headers?" >&5 |
|
159 |
-+echo "$as_me: WARNING: sys/epoll.h: check for missing prerequisite headers?" >&2;} |
|
160 |
-+ { echo "$as_me:$LINENO: WARNING: sys/epoll.h: see the Autoconf documentation" >&5 |
|
161 |
-+echo "$as_me: WARNING: sys/epoll.h: see the Autoconf documentation" >&2;} |
|
162 |
-+ { echo "$as_me:$LINENO: WARNING: sys/epoll.h: section \"Present But Cannot Be Compiled\"" >&5 |
|
163 |
-+echo "$as_me: WARNING: sys/epoll.h: section \"Present But Cannot Be Compiled\"" >&2;} |
|
164 |
-+ { echo "$as_me:$LINENO: WARNING: sys/epoll.h: proceeding with the preprocessor's result" >&5 |
|
165 |
-+echo "$as_me: WARNING: sys/epoll.h: proceeding with the preprocessor's result" >&2;} |
|
166 |
-+ { echo "$as_me:$LINENO: WARNING: sys/epoll.h: in the future, the compiler will take precedence" >&5 |
|
167 |
-+echo "$as_me: WARNING: sys/epoll.h: in the future, the compiler will take precedence" >&2;} |
|
168 |
-+ ( |
|
169 |
-+ cat <<\_ASBOX |
|
170 |
-+## ------------------------------------------ ## |
|
171 |
-+## Report this to the AC_PACKAGE_NAME lists. ## |
|
172 |
-+## ------------------------------------------ ## |
|
173 |
-+_ASBOX |
|
174 |
-+ ) | |
|
175 |
-+ sed "s/^/$as_me: WARNING: /" >&2 |
|
176 |
-+ ;; |
|
177 |
-+esac |
|
178 |
-+echo "$as_me:$LINENO: checking for sys/epoll.h" >&5 |
|
179 |
-+echo $ECHO_N "checking for sys/epoll.h... $ECHO_C" >&6 |
|
180 |
-+if test "${ac_cv_header_sys_epoll_h+set}" = set; then |
|
181 |
-+ echo $ECHO_N "(cached) $ECHO_C" >&6 |
|
182 |
-+else |
|
183 |
-+ ac_cv_header_sys_epoll_h=$ac_header_preproc |
|
184 |
-+fi |
|
185 |
-+echo "$as_me:$LINENO: result: $ac_cv_header_sys_epoll_h" >&5 |
|
186 |
-+echo "${ECHO_T}$ac_cv_header_sys_epoll_h" >&6 |
|
187 |
-+ |
|
188 |
-+fi |
|
189 |
-+if test $ac_cv_header_sys_epoll_h = yes; then |
|
190 |
-+ cat >>confdefs.h <<\_ACEOF |
|
191 |
-+#define HAVE_LINUX_EPOLL_H 1 |
|
192 |
-+_ACEOF |
|
193 |
-+ |
|
194 |
-+fi |
|
195 |
-+ |
|
196 |
- echo $ac_n "checking for SO_BSDCOMPAT declaration""... $ac_c" 1>&6 |
|
197 |
- echo "configure:3830: checking for SO_BSDCOMPAT declaration" >&5 |
|
198 |
- if eval "test \"`echo '$''{'ac_cv_decl_so_bsdcompat'+set}'`\" = set"; then |
|
199 |
-diff -Nurp erts/configure.in erts/configure.in |
|
200 |
---- erts/configure.in 2006-03-07 06:25:41.000000000 -0800 |
|
201 |
-+++ erts/configure.in 2006-03-10 15:55:12.000000000 -0800 |
|
202 |
-@@ -664,6 +664,7 @@ dnl Check if we have kernel poll support |
|
203 |
- AC_CHECK_HEADER(sys/devpoll.h, AC_DEFINE(HAVE_SYS_DEVPOLL_H)) |
|
204 |
- AC_CHECK_HEADER(linux/kpoll.h, AC_DEFINE(HAVE_LINUX_KPOLL_H)) |
|
205 |
- AC_CHECK_HEADER(sys/event.h, AC_DEFINE(HAVE_SYS_EVENT_H)) |
|
206 |
-+AC_CHECK_HEADER(sys/epoll.h, AC_DEFINE(HAVE_LINUX_EPOLL_H)) |
|
207 |
- |
|
208 |
- HAVE_VALGRIND=no |
|
209 |
- AC_CHECK_HEADER(valgrind/valgrind.h, HAVE_VALGRIND=yes) |
|
210 |
- AC_SUBST(HAVE_VALGRIND) |
|
211 |
-diff -Nurp erts/emulator/sys/unix/sys.c erts/emulator/sys/unix/sys.c |
|
212 |
---- erts/emulator/sys/unix/sys.c 2006-03-07 06:24:29.000000000 -0800 |
|
213 |
-+++ erts/emulator/sys/unix/sys.c 2006-03-10 15:55:12.000000000 -0800 |
|
214 |
-@@ -13,6 +13,12 @@ |
|
215 |
- * Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings |
|
216 |
- * AB. All Rights Reserved.'' |
|
217 |
- * |
|
218 |
-+ * 2005-08-31 |
|
219 |
-+ * This has been modified by Matthew Reilly of SIPphone Inc. to |
|
220 |
-+ * enable kernel poll (+K true) support via the epoll mechanism in Linux 2.6 |
|
221 |
-+ * Portions created by SIPphone Inc. are Copyright 2005, SIPphone Inc. |
|
222 |
-+ * These modifications are released under the Erlang Public License. |
|
223 |
-+ * |
|
224 |
- * $Id$ |
|
225 |
- */ |
|
226 |
- |
|
227 |
-@@ -50,6 +56,9 @@ |
|
228 |
- # define USE_DEVPOLL |
|
229 |
- # include <sys/devpoll.h> |
|
230 |
- # endif |
|
231 |
-+# ifdef HAVE_LINUX_EPOLL_H /* Too minimize code changes, we pretend we have HAVE_LINUX_KPOLL_H as well */ |
|
232 |
-+# define HAVE_LINUX_KPOLL_H 1 |
|
233 |
-+# endif |
|
234 |
- # ifdef HAVE_LINUX_KPOLL_H |
|
235 |
- # define USE_DEVPOLL |
|
236 |
- # include <asm/page.h> |
|
237 |
-@@ -58,7 +67,11 @@ |
|
238 |
- # ifndef POLLREMOVE |
|
239 |
- # define POLLREMOVE 0x1000 /* some day it will make it to bits/poll.h ;-) */ |
|
240 |
- # endif |
|
241 |
--# include <linux/kpoll.h> |
|
242 |
-+# ifdef HAVE_LINUX_EPOLL_H |
|
243 |
-+# include <sys/epoll.h> |
|
244 |
-+# else |
|
245 |
-+# include <linux/kpoll.h> |
|
246 |
-+# endif |
|
247 |
- # endif |
|
248 |
- # ifdef USE_DEVPOLL /* can only use one of them ... */ |
|
249 |
- # ifdef USE_KQUEUE |
|
250 |
-@@ -188,8 +201,17 @@ static int use_kernel_poll = 0; |
|
251 |
- |
|
252 |
- static int dev_poll_fd; /* fd for /dev/poll */ |
|
253 |
- #ifdef HAVE_LINUX_KPOLL_H |
|
254 |
-+ |
|
255 |
-+#ifdef HAVE_LINUX_EPOLL_H |
|
256 |
-+static struct epoll_event* dev_epoll_map; |
|
257 |
-+/* XXX Implement correct mapping from POLLIN/POLLOUT to/from EPOLLIN/EPOLLOUT */ |
|
258 |
-+/* Currenltly POLLIN/POLLOUT == EPOLLIN/EPOLLOUT. So these macros will work */ |
|
259 |
-+#define EPOLL_TO_POLL(bit_map) (bit_map) |
|
260 |
-+#define POLL_TO_EPOLL(bit_map) (bit_map & (EPOLLIN|EPOLLOUT)) |
|
261 |
-+#else |
|
262 |
- static char * dev_poll_map; /* mmap'ed area from kernel /dev/kpoll */ |
|
263 |
- static struct k_poll dev_poll; /* control block for /dev/kpoll */ |
|
264 |
-+#endif /* HAVE_LINUX_KPOLL_H */ |
|
265 |
- static int max_poll_idx; /* highest non /dev/kpoll fd */ |
|
266 |
- |
|
267 |
- static void kpoll_enable(); |
|
268 |
-@@ -199,7 +221,7 @@ static struct dvpoll dev_poll; /* |
|
269 |
- static struct pollfd* dev_poll_rfds = NULL; /* Allocated at startup */ |
|
270 |
- |
|
271 |
- static void devpoll_init(void); |
|
272 |
--static void devpoll_update_pix(int pix); |
|
273 |
-+static void devpoll_update_pix(int pix, int old_events); |
|
274 |
- #ifdef HAVE_SYS_DEVPOLL_H |
|
275 |
- static void devpoll_clear_pix(int pix); |
|
276 |
- #endif /* HAVE_SYS_DEVPOLL_H */ |
|
277 |
-@@ -1967,7 +1989,7 @@ static int driver_select_kp(ErlDrvPort i |
|
278 |
- |
|
279 |
- #ifdef USE_DEVPOLL |
|
280 |
- if (poll_fds[pix].events != old_events) |
|
281 |
-- devpoll_update_pix(pix); |
|
282 |
-+ devpoll_update_pix(pix, old_events); |
|
283 |
- #endif |
|
284 |
- #ifdef USE_KQUEUE |
|
285 |
- if (poll_fds[pix].events != old_events) |
|
286 |
-@@ -2023,7 +2045,7 @@ static int driver_select_kp(ErlDrvPort i |
|
287 |
- if ( old_events && (dev_poll_fd != -1) ) { |
|
288 |
- /* Tell /dev/[k]poll that we are not interested any more ... */ |
|
289 |
- poll_fds[pix].events = POLLREMOVE; |
|
290 |
-- devpoll_update_pix(pix); |
|
291 |
-+ devpoll_update_pix(pix, old_events); |
|
292 |
- /* devpoll_update_pix may change the pix */ |
|
293 |
- pix = fd_data[fd].pix; |
|
294 |
- poll_fds[pix].events = 0; |
|
295 |
-@@ -2080,7 +2102,7 @@ static int driver_select_kp(ErlDrvPort i |
|
296 |
- #ifdef HAVE_SYS_DEVPOLL_H |
|
297 |
- devpoll_clear_pix(pix); |
|
298 |
- #endif /* HAVE_SYS_DEVPOLL_H */ |
|
299 |
-- devpoll_update_pix(pix); |
|
300 |
-+ devpoll_update_pix(pix, old_events); |
|
301 |
- } |
|
302 |
- #endif |
|
303 |
- #ifdef USE_KQUEUE |
|
304 |
-@@ -2638,6 +2660,27 @@ static void check_io_kp(int do_wait) |
|
305 |
- nof_ready_fds = vr; |
|
306 |
- |
|
307 |
- #if HAVE_LINUX_KPOLL_H |
|
308 |
-+#ifdef HAVE_LINUX_EPOLL_H |
|
309 |
-+ if ( do_event_poll ) { |
|
310 |
-+ if ((r = epoll_wait(dev_poll_fd,dev_epoll_map,max_fd_plus_one,0)) > 0) { |
|
311 |
-+ for (i = 0; (i < r); i++) { |
|
312 |
-+ short revents = dev_epoll_map[i].events; |
|
313 |
-+ |
|
314 |
-+ if (revents != 0) { |
|
315 |
-+ int fd = dev_epoll_map[i].data.fd; |
|
316 |
-+ rp->pfd.fd = fd; |
|
317 |
-+ rp->pfd.events = poll_fds[fd_data[fd].pix].events; |
|
318 |
-+ rp->pfd.revents = EPOLL_TO_POLL(revents); |
|
319 |
-+ rp->iport = fd_data[fd].inport; |
|
320 |
-+ rp->oport = fd_data[fd].outport; |
|
321 |
-+ rp++; |
|
322 |
-+ nof_ready_fds ++; |
|
323 |
-+ } |
|
324 |
-+ } |
|
325 |
-+ } |
|
326 |
-+ } |
|
327 |
-+ |
|
328 |
-+#else |
|
329 |
- if ( do_event_poll ) { |
|
330 |
- /* Now do the fast poll */ |
|
331 |
- dev_poll.kp_timeout = 0; |
|
332 |
-@@ -2660,6 +2703,7 @@ static void check_io_kp(int do_wait) |
|
333 |
- nof_ready_fds += r; |
|
334 |
- } |
|
335 |
- } |
|
336 |
-+#endif /*HAVE_LINUX_EPOLL_H */ |
|
337 |
- #endif |
|
338 |
- |
|
339 |
- } else { |
|
340 |
-@@ -3531,6 +3575,20 @@ static void kpoll_enable() |
|
341 |
- poll_fds[pix].revents = 0; |
|
342 |
- } |
|
343 |
- |
|
344 |
-+#ifdef HAVE_LINUX_EPOLL_H |
|
345 |
-+static void epoll_init() |
|
346 |
-+{ |
|
347 |
-+ /* max_files is just a hint to the kernel */ |
|
348 |
-+ if ( (dev_poll_fd=epoll_create(max_files)) < 0 ) { |
|
349 |
-+ DEBUGF(("Will use poll()\n")); |
|
350 |
-+ dev_poll_fd = -1; /* We will not use ekpoll */ |
|
351 |
-+ } else { |
|
352 |
-+ DEBUGF(("Will use epoll\n")); |
|
353 |
-+ dev_epoll_map = (struct epoll_event *) erts_alloc(ERTS_ALC_T_POLL_FDS, (sizeof(struct epoll_event) * max_files)); |
|
354 |
-+ erts_smp_atomic_add(&sys_misc_mem_sz, max_files*sizeof(struct epoll_event)); |
|
355 |
-+ } |
|
356 |
-+} |
|
357 |
-+#else |
|
358 |
- static void kpoll_init() |
|
359 |
- { |
|
360 |
- if ( (dev_poll_fd=open("/dev/kpoll",O_RDWR)) < 0 ) { |
|
361 |
-@@ -3552,6 +3610,7 @@ static void kpoll_init() |
|
362 |
- dev_poll_rfds = NULL; |
|
363 |
- } |
|
364 |
- } |
|
365 |
-+#endif /* HAVE_LINUX_EPOLL_H */ |
|
366 |
- |
|
367 |
- #endif /* HAVE_LINUX_KPOLL_H */ |
|
368 |
- |
|
369 |
-@@ -3581,7 +3640,11 @@ static void devpoll_init(void) |
|
370 |
- } else { |
|
371 |
- /* Determine use of poll vs. /dev/poll at runtime */ |
|
372 |
- #ifdef HAVE_LINUX_KPOLL_H |
|
373 |
-+#ifdef HAVE_LINUX_EPOLL_H |
|
374 |
-+ epoll_init(); |
|
375 |
-+#else |
|
376 |
- kpoll_init(); |
|
377 |
-+#endif |
|
378 |
- #else |
|
379 |
- #ifdef HAVE_SYS_DEVPOLL_H |
|
380 |
- solaris_devpoll_init(); |
|
381 |
-@@ -3607,7 +3670,7 @@ static int devpoll_write(int fd, void *b |
|
382 |
- return count; |
|
383 |
- } |
|
384 |
- |
|
385 |
--static void devpoll_update_pix(int pix) |
|
386 |
-+static void devpoll_update_pix(int pix, int old_events) |
|
387 |
- { |
|
388 |
- int res; |
|
389 |
- |
|
390 |
-@@ -3622,10 +3685,33 @@ static void devpoll_update_pix(int pix) |
|
391 |
- |
|
392 |
- #endif |
|
393 |
- if ( dev_poll_fd != -1 ) { |
|
394 |
-+#ifdef HAVE_LINUX_EPOLL_H |
|
395 |
-+ int events = poll_fds[pix].events; |
|
396 |
-+ int fd = poll_fds[pix].fd; |
|
397 |
-+ if (old_events && events & POLLREMOVE) { |
|
398 |
-+ /* Delete file descriptor from epoll list */ |
|
399 |
-+ res = epoll_ctl(dev_poll_fd,EPOLL_CTL_DEL,fd,NULL); |
|
400 |
-+ /* XXX check return code */ |
|
401 |
-+ } else { |
|
402 |
-+ struct epoll_event epoll_ctl_event; |
|
403 |
-+ epoll_ctl_event.data.fd = fd; |
|
404 |
-+ epoll_ctl_event.events = POLL_TO_EPOLL(events); |
|
405 |
-+ if (old_events) { |
|
406 |
-+ /* Modify exiting fd */ |
|
407 |
-+ res = epoll_ctl(dev_poll_fd,EPOLL_CTL_MOD,fd,&epoll_ctl_event); |
|
408 |
-+ /* XXX check return code */ |
|
409 |
-+ } else { |
|
410 |
-+ /* Add fd to epoll list */ |
|
411 |
-+ res = epoll_ctl(dev_poll_fd,EPOLL_CTL_ADD,fd,&epoll_ctl_event); |
|
412 |
-+ /* XXX check return code */ |
|
413 |
-+ } |
|
414 |
-+ } |
|
415 |
-+#else |
|
416 |
- if ( (res=devpoll_write(dev_poll_fd,&poll_fds[pix],sizeof(struct pollfd))) != |
|
417 |
- (sizeof(struct pollfd)) ) { |
|
418 |
- erl_exit(1,"Can't write to /dev/poll\n"); |
|
419 |
- } |
|
420 |
-+#endif /* HAVE_LINUX_EPOLL_H */ |
|
421 |
- } |
|
422 |
- #if HAVE_LINUX_KPOLL_H |
|
423 |
- } else { |
... | ... |
@@ -1,423 +0,0 @@ |
1 |
-diff -Nurp erts/acconfig.h erts/acconfig.h |
|
2 |
---- erts/acconfig.h 2005-06-21 09:37:40.000000000 -0700 |
|
3 |
-+++ erts/acconfig.h 2006-03-10 15:55:12.000000000 -0800 |
|
4 |
-@@ -188,6 +188,9 @@ |
|
5 |
- /* Define if you have the <linux/kpoll.h> header file. */ |
|
6 |
- #undef HAVE_LINUX_KPOLL_H |
|
7 |
- |
|
8 |
-+/* Define if you have the <linux/epoll.h> header file. */ |
|
9 |
-+#undef HAVE_LINUX_EPOLL_H |
|
10 |
-+ |
|
11 |
- /* Define if you have the <sys/event.h> header file. */ |
|
12 |
- #undef HAVE_SYS_EVENT_H |
|
13 |
- |
|
14 |
-@@ -224,7 +227,7 @@ |
|
15 |
- |
|
16 |
- #if !defined(USE_SELECT) |
|
17 |
- # if defined(ENABLE_KERNEL_POLL) |
|
18 |
--# if defined(HAVE_SYS_DEVPOLL_H) || defined(HAVE_LINUX_KPOLL_H) || defined(HAVE_SYS_EVENT_H) |
|
19 |
-+# if defined(HAVE_SYS_DEVPOLL_H) || defined(HAVE_LINUX_KPOLL_H) || defined(HAVE_SYS_EVENT_H) || defined(HAVE_LINUX_EPOLL_H) |
|
20 |
- # define USE_KERNEL_POLL |
|
21 |
- # endif |
|
22 |
- # endif |
|
23 |
-diff -Nurp erts/config.h.in erts/config.h.in |
|
24 |
---- erts/config.h.in 2006-03-07 15:02:41.000000000 -0800 |
|
25 |
-+++ erts/config.h.in 2006-03-10 15:55:12.000000000 -0800 |
|
26 |
-@@ -175,6 +175,8 @@ |
|
27 |
- /* Define if you have the <linux/kpoll.h> header file. */ |
|
28 |
- #undef HAVE_LINUX_KPOLL_H |
|
29 |
- |
|
30 |
-+/* Define if you have the <linux/epoll.h> header file. */ |
|
31 |
-+#undef HAVE_LINUX_EPOLL_H |
|
32 |
- |
|
33 |
- /* Define if you have the <sys/event.h> header file. */ |
|
34 |
- #undef HAVE_SYS_EVENT_H |
|
35 |
-@@ -399,7 +401,7 @@ |
|
36 |
- |
|
37 |
- #if !defined(USE_SELECT) |
|
38 |
- # if defined(ENABLE_KERNEL_POLL) |
|
39 |
--# if defined(HAVE_SYS_DEVPOLL_H) || defined(HAVE_LINUX_KPOLL_H) || defined(HAVE_SYS_EVENT_H) |
|
40 |
-+# if defined(HAVE_SYS_DEVPOLL_H) || defined(HAVE_LINUX_KPOLL_H) || defined(HAVE_SYS_EVENT_H) || defined(HAVE_LINUX_EPOLL_H) |
|
41 |
- # define USE_KERNEL_POLL |
|
42 |
- # endif |
|
43 |
- # endif |
|
44 |
-diff -Nurp erts/configure erts/configure |
|
45 |
---- erts/configure 2006-03-07 15:02:39.000000000 -0800 |
|
46 |
-+++ erts/configure 2006-03-10 15:55:12.000000000 -0800 |
|
47 |
-@@ -3825,6 +3825,151 @@ else |
|
48 |
- fi |
|
49 |
- |
|
50 |
- |
|
51 |
-+ |
|
52 |
-+if test "${ac_cv_header_sys_epoll_h+set}" = set; then |
|
53 |
-+ echo "$as_me:$LINENO: checking for sys/epoll.h" >&5 |
|
54 |
-+echo $ECHO_N "checking for sys/epoll.h... $ECHO_C" >&6 |
|
55 |
-+if test "${ac_cv_header_sys_epoll_h+set}" = set; then |
|
56 |
-+ echo $ECHO_N "(cached) $ECHO_C" >&6 |
|
57 |
-+fi |
|
58 |
-+echo "$as_me:$LINENO: result: $ac_cv_header_sys_epoll_h" >&5 |
|
59 |
-+echo "${ECHO_T}$ac_cv_header_sys_epoll_h" >&6 |
|
60 |
-+else |
|
61 |
-+ # Is the header compilable? |
|
62 |
-+echo "$as_me:$LINENO: checking sys/epoll.h usability" >&5 |
|
63 |
-+echo $ECHO_N "checking sys/epoll.h usability... $ECHO_C" >&6 |
|
64 |
-+cat >conftest.$ac_ext <<_ACEOF |
|
65 |
-+/* confdefs.h. */ |
|
66 |
-+_ACEOF |
|
67 |
-+cat confdefs.h >>conftest.$ac_ext |
|
68 |
-+cat >>conftest.$ac_ext <<_ACEOF |
|
69 |
-+/* end confdefs.h. */ |
|
70 |
-+$ac_includes_default |
|
71 |
-+#include <sys/epoll.h> |
|
72 |
-+_ACEOF |
|
73 |
-+rm -f conftest.$ac_objext |
|
74 |
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
|
75 |
-+ (eval $ac_compile) 2>conftest.er1 |
|
76 |
-+ ac_status=$? |
|
77 |
-+ grep -v '^ *+' conftest.er1 >conftest.err |
|
78 |
-+ rm -f conftest.er1 |
|
79 |
-+ cat conftest.err >&5 |
|
80 |
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
|
81 |
-+ (exit $ac_status); } && |
|
82 |
-+ { ac_try='test -z "$ac_c_werror_flag" |
|
83 |
-+ || test ! -s conftest.err' |
|
84 |
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
|
85 |
-+ (eval $ac_try) 2>&5 |
|
86 |
-+ ac_status=$? |
|
87 |
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
|
88 |
-+ (exit $ac_status); }; } && |
|
89 |
-+ { ac_try='test -s conftest.$ac_objext' |
|
90 |
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
|
91 |
-+ (eval $ac_try) 2>&5 |
|
92 |
-+ ac_status=$? |
|
93 |
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
|
94 |
-+ (exit $ac_status); }; }; then |
|
95 |
-+ ac_header_compiler=yes |
|
96 |
-+else |
|
97 |
-+ echo "$as_me: failed program was:" >&5 |
|
98 |
-+sed 's/^/| /' conftest.$ac_ext >&5 |
|
99 |
-+ |
|
100 |
-+ac_header_compiler=no |
|
101 |
-+fi |
|
102 |
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext |
|
103 |
-+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 |
|
104 |
-+echo "${ECHO_T}$ac_header_compiler" >&6 |
|
105 |
-+ |
|
106 |
-+# Is the header present? |
|
107 |
-+echo "$as_me:$LINENO: checking sys/epoll.h presence" >&5 |
|
108 |
-+echo $ECHO_N "checking sys/epoll.h presence... $ECHO_C" >&6 |
|
109 |
-+cat >conftest.$ac_ext <<_ACEOF |
|
110 |
-+/* confdefs.h. */ |
|
111 |
-+_ACEOF |
|
112 |
-+cat confdefs.h >>conftest.$ac_ext |
|
113 |
-+cat >>conftest.$ac_ext <<_ACEOF |
|
114 |
-+/* end confdefs.h. */ |
|
115 |
-+#include <sys/epoll.h> |
|
116 |
-+_ACEOF |
|
117 |
-+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 |
|
118 |
-+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 |
|
119 |
-+ ac_status=$? |
|
120 |
-+ grep -v '^ *+' conftest.er1 >conftest.err |
|
121 |
-+ rm -f conftest.er1 |
|
122 |
-+ cat conftest.err >&5 |
|
123 |
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
|
124 |
-+ (exit $ac_status); } >/dev/null; then |
|
125 |
-+ if test -s conftest.err; then |
|
126 |
-+ ac_cpp_err=$ac_c_preproc_warn_flag |
|
127 |
-+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag |
|
128 |
-+ else |
|
129 |
-+ ac_cpp_err= |
|
130 |
-+ fi |
|
131 |
-+else |
|
132 |
-+ ac_cpp_err=yes |
|
133 |
-+fi |
|
134 |
-+if test -z "$ac_cpp_err"; then |
|
135 |
-+ ac_header_preproc=yes |
|
136 |
-+else |
|
137 |
-+ echo "$as_me: failed program was:" >&5 |
|
138 |
-+sed 's/^/| /' conftest.$ac_ext >&5 |
|
139 |
-+ |
|
140 |
-+ ac_header_preproc=no |
|
141 |
-+fi |
|
142 |
-+rm -f conftest.err conftest.$ac_ext |
|
143 |
-+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 |
|
144 |
-+echo "${ECHO_T}$ac_header_preproc" >&6 |
|
145 |
-+ |
|
146 |
-+# So? What about this header? |
|
147 |
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in |
|
148 |
-+ yes:no: ) |
|
149 |
-+ { echo "$as_me:$LINENO: WARNING: sys/epoll.h: accepted by the compiler, rejected by the preprocessor!" >&5 |
|
150 |
-+echo "$as_me: WARNING: sys/epoll.h: accepted by the compiler, rejected by the preprocessor!" >&2;} |
|
151 |
-+ { echo "$as_me:$LINENO: WARNING: sys/epoll.h: proceeding with the compiler's result" >&5 |
|
152 |
-+echo "$as_me: WARNING: sys/epoll.h: proceeding with the compiler's result" >&2;} |
|
153 |
-+ ac_header_preproc=yes |
|
154 |
-+ ;; |
|
155 |
-+ no:yes:* ) |
|
156 |
-+ { echo "$as_me:$LINENO: WARNING: sys/epoll.h: present but cannot be compiled" >&5 |
|
157 |
-+echo "$as_me: WARNING: sys/epoll.h: present but cannot be compiled" >&2;} |
|
158 |
-+ { echo "$as_me:$LINENO: WARNING: sys/epoll.h: check for missing prerequisite headers?" >&5 |
|
159 |
-+echo "$as_me: WARNING: sys/epoll.h: check for missing prerequisite headers?" >&2;} |
|
160 |
-+ { echo "$as_me:$LINENO: WARNING: sys/epoll.h: see the Autoconf documentation" >&5 |
|
161 |
-+echo "$as_me: WARNING: sys/epoll.h: see the Autoconf documentation" >&2;} |
|
162 |
-+ { echo "$as_me:$LINENO: WARNING: sys/epoll.h: section \"Present But Cannot Be Compiled\"" >&5 |
|
163 |
-+echo "$as_me: WARNING: sys/epoll.h: section \"Present But Cannot Be Compiled\"" >&2;} |
|
164 |
-+ { echo "$as_me:$LINENO: WARNING: sys/epoll.h: proceeding with the preprocessor's result" >&5 |
|
165 |
-+echo "$as_me: WARNING: sys/epoll.h: proceeding with the preprocessor's result" >&2;} |
|
166 |
-+ { echo "$as_me:$LINENO: WARNING: sys/epoll.h: in the future, the compiler will take precedence" >&5 |
|
167 |
-+echo "$as_me: WARNING: sys/epoll.h: in the future, the compiler will take precedence" >&2;} |
|
168 |
-+ ( |
|
169 |
-+ cat <<\_ASBOX |
|
170 |
-+## ------------------------------------------ ## |
|
171 |
-+## Report this to the AC_PACKAGE_NAME lists. ## |
|
172 |
-+## ------------------------------------------ ## |
|
173 |
-+_ASBOX |
|
174 |
-+ ) | |
|
175 |
-+ sed "s/^/$as_me: WARNING: /" >&2 |
|
176 |
-+ ;; |
|
177 |
-+esac |
|
178 |
-+echo "$as_me:$LINENO: checking for sys/epoll.h" >&5 |
|
179 |
-+echo $ECHO_N "checking for sys/epoll.h... $ECHO_C" >&6 |
|
180 |
-+if test "${ac_cv_header_sys_epoll_h+set}" = set; then |
|
181 |
-+ echo $ECHO_N "(cached) $ECHO_C" >&6 |
|
182 |
-+else |
|
183 |
-+ ac_cv_header_sys_epoll_h=$ac_header_preproc |
|
184 |
-+fi |
|
185 |
-+echo "$as_me:$LINENO: result: $ac_cv_header_sys_epoll_h" >&5 |
|
186 |
-+echo "${ECHO_T}$ac_cv_header_sys_epoll_h" >&6 |
|
187 |
-+ |
|
188 |
-+fi |
|
189 |
-+if test $ac_cv_header_sys_epoll_h = yes; then |
|
190 |
-+ cat >>confdefs.h <<\_ACEOF |
|
191 |
-+#define HAVE_LINUX_EPOLL_H 1 |
|
192 |
-+_ACEOF |
|
193 |
-+ |
|
194 |
-+fi |
|
195 |
-+ |
|
196 |
- echo $ac_n "checking for SO_BSDCOMPAT declaration""... $ac_c" 1>&6 |
|
197 |
- echo "configure:3830: checking for SO_BSDCOMPAT declaration" >&5 |
|
198 |
- if eval "test \"`echo '$''{'ac_cv_decl_so_bsdcompat'+set}'`\" = set"; then |
|
199 |
-diff -Nurp erts/configure.in erts/configure.in |
|
200 |
---- erts/configure.in 2006-03-07 06:25:41.000000000 -0800 |
|
201 |
-+++ erts/configure.in 2006-03-10 15:55:12.000000000 -0800 |
|
202 |
-@@ -664,6 +664,7 @@ dnl Check if we have kernel poll support |
|
203 |
- AC_CHECK_HEADER(sys/devpoll.h, AC_DEFINE(HAVE_SYS_DEVPOLL_H)) |
|
204 |
- AC_CHECK_HEADER(linux/kpoll.h, AC_DEFINE(HAVE_LINUX_KPOLL_H)) |
|
205 |
- AC_CHECK_HEADER(sys/event.h, AC_DEFINE(HAVE_SYS_EVENT_H)) |
|
206 |
-+AC_CHECK_HEADER(sys/epoll.h, AC_DEFINE(HAVE_LINUX_EPOLL_H)) |
|
207 |
- |
|
208 |
- HAVE_VALGRIND=no |
|
209 |
- AC_CHECK_HEADER(valgrind/valgrind.h, HAVE_VALGRIND=yes) |
|
210 |
- AC_SUBST(HAVE_VALGRIND) |
|
211 |
-diff -Nurp erts/emulator/sys/unix/sys.c erts/emulator/sys/unix/sys.c |
|
212 |
---- erts/emulator/sys/unix/sys.c 2006-03-07 06:24:29.000000000 -0800 |
|
213 |
-+++ erts/emulator/sys/unix/sys.c 2006-03-10 15:55:12.000000000 -0800 |
|
214 |
-@@ -13,6 +13,12 @@ |
|
215 |
- * Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings |
|
216 |
- * AB. All Rights Reserved.'' |
|
217 |
- * |
|
218 |
-+ * 2005-08-31 |
|
219 |
-+ * This has been modified by Matthew Reilly of SIPphone Inc. to |
|
220 |
-+ * enable kernel poll (+K true) support via the epoll mechanism in Linux 2.6 |
|
221 |
-+ * Portions created by SIPphone Inc. are Copyright 2005, SIPphone Inc. |
|
222 |
-+ * These modifications are released under the Erlang Public License. |
|
223 |
-+ * |
|
224 |
- * $Id$ |
|
225 |
- */ |
|
226 |
- |
|
227 |
-@@ -50,6 +56,9 @@ |
|
228 |
- # define USE_DEVPOLL |
|
229 |
- # include <sys/devpoll.h> |
|
230 |
- # endif |
|
231 |
-+# ifdef HAVE_LINUX_EPOLL_H /* Too minimize code changes, we pretend we have HAVE_LINUX_KPOLL_H as well */ |
|
232 |
-+# define HAVE_LINUX_KPOLL_H 1 |
|
233 |
-+# endif |
|
234 |
- # ifdef HAVE_LINUX_KPOLL_H |
|
235 |
- # define USE_DEVPOLL |
|
236 |
- # include <asm/page.h> |
|
237 |
-@@ -58,7 +67,11 @@ |
|
238 |
- # ifndef POLLREMOVE |
|
239 |
- # define POLLREMOVE 0x1000 /* some day it will make it to bits/poll.h ;-) */ |
|
240 |
- # endif |
|
241 |
--# include <linux/kpoll.h> |
|
242 |
-+# ifdef HAVE_LINUX_EPOLL_H |
|
243 |
-+# include <sys/epoll.h> |
|
244 |
-+# else |
|
245 |
-+# include <linux/kpoll.h> |
|
246 |
-+# endif |
|
247 |
- # endif |
|
248 |
- # ifdef USE_DEVPOLL /* can only use one of them ... */ |
|
249 |
- # ifdef USE_KQUEUE |
|
250 |
-@@ -188,8 +201,17 @@ static int use_kernel_poll = 0; |
|
251 |
- |
|
252 |
- static int dev_poll_fd; /* fd for /dev/poll */ |
|
253 |
- #ifdef HAVE_LINUX_KPOLL_H |
|
254 |
-+ |
|
255 |
-+#ifdef HAVE_LINUX_EPOLL_H |
|
256 |
-+static struct epoll_event* dev_epoll_map; |
|
257 |
-+/* XXX Implement correct mapping from POLLIN/POLLOUT to/from EPOLLIN/EPOLLOUT */ |
|
258 |
-+/* Currenltly POLLIN/POLLOUT == EPOLLIN/EPOLLOUT. So these macros will work */ |
|
259 |
-+#define EPOLL_TO_POLL(bit_map) (bit_map) |
|
260 |
-+#define POLL_TO_EPOLL(bit_map) (bit_map & (EPOLLIN|EPOLLOUT)) |
|
261 |
-+#else |
|
262 |
- static char * dev_poll_map; /* mmap'ed area from kernel /dev/kpoll */ |
|
263 |
- static struct k_poll dev_poll; /* control block for /dev/kpoll */ |
|
264 |
-+#endif /* HAVE_LINUX_KPOLL_H */ |
|
265 |
- static int max_poll_idx; /* highest non /dev/kpoll fd */ |
|
266 |
- |
|
267 |
- static void kpoll_enable(); |
|
268 |
-@@ -199,7 +221,7 @@ static struct dvpoll dev_poll; /* |
|
269 |
- static struct pollfd* dev_poll_rfds = NULL; /* Allocated at startup */ |
|
270 |
- |
|
271 |
- static void devpoll_init(void); |
|
272 |
--static void devpoll_update_pix(int pix); |
|
273 |
-+static void devpoll_update_pix(int pix, int old_events); |
|
274 |
- #ifdef HAVE_SYS_DEVPOLL_H |
|
275 |
- static void devpoll_clear_pix(int pix); |
|
276 |
- #endif /* HAVE_SYS_DEVPOLL_H */ |
|
277 |
-@@ -1967,7 +1989,7 @@ static int driver_select_kp(ErlDrvPort i |
|
278 |
- |
|
279 |
- #ifdef USE_DEVPOLL |
|
280 |
- if (poll_fds[pix].events != old_events) |
|
281 |
-- devpoll_update_pix(pix); |
|
282 |
-+ devpoll_update_pix(pix, old_events); |
|
283 |
- #endif |
|
284 |
- #ifdef USE_KQUEUE |
|
285 |
- if (poll_fds[pix].events != old_events) |
|
286 |
-@@ -2023,7 +2045,7 @@ static int driver_select_kp(ErlDrvPort i |
|
287 |
- if ( old_events && (dev_poll_fd != -1) ) { |
|
288 |
- /* Tell /dev/[k]poll that we are not interested any more ... */ |
|
289 |
- poll_fds[pix].events = POLLREMOVE; |
|
290 |
-- devpoll_update_pix(pix); |
|
291 |
-+ devpoll_update_pix(pix, old_events); |
|
292 |
- /* devpoll_update_pix may change the pix */ |
|
293 |
- pix = fd_data[fd].pix; |
|
294 |
- poll_fds[pix].events = 0; |
|
295 |
-@@ -2080,7 +2102,7 @@ static int driver_select_kp(ErlDrvPort i |
|
296 |
- #ifdef HAVE_SYS_DEVPOLL_H |
|
297 |
- devpoll_clear_pix(pix); |
|
298 |
- #endif /* HAVE_SYS_DEVPOLL_H */ |
|
299 |
-- devpoll_update_pix(pix); |
|
300 |
-+ devpoll_update_pix(pix, old_events); |
|
301 |
- } |
|
302 |
- #endif |
|
303 |
- #ifdef USE_KQUEUE |
|
304 |
-@@ -2638,6 +2660,27 @@ static void check_io_kp(int do_wait) |
|
305 |
- nof_ready_fds = vr; |
|
306 |
- |
|
307 |
- #if HAVE_LINUX_KPOLL_H |
|
308 |
-+#ifdef HAVE_LINUX_EPOLL_H |
|
309 |
-+ if ( do_event_poll ) { |
|
310 |
-+ if ((r = epoll_wait(dev_poll_fd,dev_epoll_map,max_fd_plus_one,0)) > 0) { |
|
311 |
-+ for (i = 0; (i < r); i++) { |
|
312 |
-+ short revents = dev_epoll_map[i].events; |
|
313 |
-+ |
|
314 |
-+ if (revents != 0) { |
|
315 |
-+ int fd = dev_epoll_map[i].data.fd; |
|
316 |
-+ rp->pfd.fd = fd; |
|
317 |
-+ rp->pfd.events = poll_fds[fd_data[fd].pix].events; |
|
318 |
-+ rp->pfd.revents = EPOLL_TO_POLL(revents); |
|
319 |
-+ rp->iport = fd_data[fd].inport; |
|
320 |
-+ rp->oport = fd_data[fd].outport; |
|
321 |
-+ rp++; |
|
322 |
-+ nof_ready_fds ++; |
|
323 |
-+ } |
|
324 |
-+ } |
|
325 |
-+ } |
|
326 |
-+ } |
|
327 |
-+ |
|
328 |
-+#else |
|
329 |
- if ( do_event_poll ) { |
|
330 |
- /* Now do the fast poll */ |
|
331 |
- dev_poll.kp_timeout = 0; |
|
332 |
-@@ -2660,6 +2703,7 @@ static void check_io_kp(int do_wait) |
|
333 |
- nof_ready_fds += r; |
|
334 |
- } |
|
335 |
- } |
|
336 |
-+#endif /*HAVE_LINUX_EPOLL_H */ |
|
337 |
- #endif |
|
338 |
- |
|
339 |
- } else { |
|
340 |
-@@ -3531,6 +3575,20 @@ static void kpoll_enable() |
|
341 |
- poll_fds[pix].revents = 0; |
|
342 |
- } |
|
343 |
- |
|
344 |
-+#ifdef HAVE_LINUX_EPOLL_H |
|
345 |
-+static void epoll_init() |
|
346 |
-+{ |
|
347 |
-+ /* max_files is just a hint to the kernel */ |
|
348 |
-+ if ( (dev_poll_fd=epoll_create(max_files)) < 0 ) { |
|
349 |
-+ DEBUGF(("Will use poll()\n")); |
|
350 |
-+ dev_poll_fd = -1; /* We will not use ekpoll */ |
|
351 |
-+ } else { |
|
352 |
-+ DEBUGF(("Will use epoll\n")); |
|
353 |
-+ dev_epoll_map = (struct epoll_event *) erts_alloc(ERTS_ALC_T_POLL_FDS, (sizeof(struct epoll_event) * max_files)); |
|
354 |
-+ erts_smp_atomic_add(&sys_misc_mem_sz, max_files*sizeof(struct epoll_event)); |
|
355 |
-+ } |
|
356 |
-+} |
|
357 |
-+#else |
|
358 |
- static void kpoll_init() |
|
359 |
- { |
|
360 |
- if ( (dev_poll_fd=open("/dev/kpoll",O_RDWR)) < 0 ) { |
|
361 |
-@@ -3552,6 +3610,7 @@ static void kpoll_init() |
|
362 |
- dev_poll_rfds = NULL; |
|
363 |
- } |
|
364 |
- } |
|
365 |
-+#endif /* HAVE_LINUX_EPOLL_H */ |
|
366 |
- |
|
367 |
- #endif /* HAVE_LINUX_KPOLL_H */ |
|
368 |
- |
|
369 |
-@@ -3581,7 +3640,11 @@ static void devpoll_init(void) |
|
370 |
- } else { |
|
371 |
- /* Determine use of poll vs. /dev/poll at runtime */ |
|
372 |
- #ifdef HAVE_LINUX_KPOLL_H |
|
373 |
-+#ifdef HAVE_LINUX_EPOLL_H |
|
374 |
-+ epoll_init(); |
|
375 |
-+#else |
|
376 |
- kpoll_init(); |
|
377 |
-+#endif |
|
378 |
- #else |
|
379 |
- #ifdef HAVE_SYS_DEVPOLL_H |
|
380 |
- solaris_devpoll_init(); |
|
381 |
-@@ -3607,7 +3670,7 @@ static int devpoll_write(int fd, void *b |
|
382 |
- return count; |
|
383 |
- } |
|
384 |
- |
|
385 |
--static void devpoll_update_pix(int pix) |
|
386 |
-+static void devpoll_update_pix(int pix, int old_events) |
|
387 |
- { |
|
388 |
- int res; |
|
389 |
- |
|
390 |
-@@ -3622,10 +3685,33 @@ static void devpoll_update_pix(int pix) |
|
391 |
- |
|
392 |
- #endif |
|
393 |
- if ( dev_poll_fd != -1 ) { |
|
394 |
-+#ifdef HAVE_LINUX_EPOLL_H |
|
395 |
-+ int events = poll_fds[pix].events; |
|
396 |
-+ int fd = poll_fds[pix].fd; |
|
397 |
-+ if (old_events && events & POLLREMOVE) { |
|
398 |
-+ /* Delete file descriptor from epoll list */ |
|
399 |
-+ res = epoll_ctl(dev_poll_fd,EPOLL_CTL_DEL,fd,NULL); |
|
400 |
-+ /* XXX check return code */ |
|
401 |
-+ } else { |
|
402 |
-+ struct epoll_event epoll_ctl_event; |
|
403 |
-+ epoll_ctl_event.data.fd = fd; |
|
404 |
-+ epoll_ctl_event.events = POLL_TO_EPOLL(events); |
|
405 |
-+ if (old_events) { |
|
406 |
-+ /* Modify exiting fd */ |
|
407 |
-+ res = epoll_ctl(dev_poll_fd,EPOLL_CTL_MOD,fd,&epoll_ctl_event); |
|
408 |
-+ /* XXX check return code */ |
|
409 |
-+ } else { |
|
410 |
-+ /* Add fd to epoll list */ |
|
411 |
-+ res = epoll_ctl(dev_poll_fd,EPOLL_CTL_ADD,fd,&epoll_ctl_event); |
|
412 |
-+ /* XXX check return code */ |
|
413 |
-+ } |
|
414 |
-+ } |
|
415 |
-+#else |
|
416 |
- if ( (res=devpoll_write(dev_poll_fd,&poll_fds[pix],sizeof(struct pollfd))) != |
|
417 |
- (sizeof(struct pollfd)) ) { |
|
418 |
- erl_exit(1,"Can't write to /dev/poll\n"); |
|
419 |
- } |
|
420 |
-+#endif /* HAVE_LINUX_EPOLL_H */ |
|
421 |
- } |
|
422 |
- #if HAVE_LINUX_KPOLL_H |
|
423 |
- } else { |
... | ... |
@@ -1,130 +0,0 @@ |
1 |
-diff -ru otp_src_R9B-1-orig/lib/cosNotification/src/Makefile otp_src_R9B-1/lib/cosNotification/src/Makefile |
|
2 |
---- otp_src_R9B-1-orig/lib/cosNotification/src/Makefile 2002-10-02 15:01:31.000000000 -0700 |
|
3 |
-+++ otp_src_R9B-1/lib/cosNotification/src/Makefile 2003-07-03 17:44:41.000000000 -0700 |
|
4 |
-@@ -363,7 +363,7 @@ |
|
5 |
- $(INSTALL_DIR) $(RELSYSDIR)/ebin |
|
6 |
- $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) $(RELSYSDIR)/ebin |
|
7 |
- $(INSTALL_DIR) $(RELSYSDIR)/src |
|
8 |
-- $(INSTALL_DATA) $(GEN_FILES) $(IDL_FILES) $(YECC_FILES) $(GEN_YECC_ERL_FILES) $(GEN_YECC_HRL_FILES) $(RELSYSDIR)/src |
|
9 |
-+ $(INSTALL_DATA) $(GEN_FILES) $(IDL_FILES) $(YECC_FILES) $(GEN_YECC_HRL_FILES) $(RELSYSDIR)/src |
|
10 |
- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(GEN_ERL_FILES) $(IDL_FILES) $(YECC_FILES) $(RELSYSDIR)/src |
|
11 |
- $(INSTALL_DIR) $(RELSYSDIR)/include |
|
12 |
- $(INSTALL_DATA) $(GEN_HRL_FILES) $(RELSYSDIR)/include |
|
13 |
-diff -ru otp_src_R9B-1-orig/lib/gs/src/Makefile otp_src_R9B-1/lib/gs/src/Makefile |
|
14 |
---- otp_src_R9B-1-orig/lib/gs/src/Makefile 2001-10-12 07:18:38.000000000 -0700 |
|
15 |
-+++ otp_src_R9B-1/lib/gs/src/Makefile 2003-07-03 17:44:41.000000000 -0700 |
|
16 |
-@@ -114,7 +114,7 @@ |
|
17 |
- $(INSTALL_DATA) $(APP_SRC) $(ERL_FILES) $(HRL_FILES) $(GEN_HRL_FILES) \ |
|
18 |
- $(GSTK_GENERIC) $(RELSYSDIR)/src |
|
19 |
- $(INSTALL_DIR) $(RELSYSDIR)/ebin |
|
20 |
-- $(INSTALL_DATA) $(TARGET_FILES) $(KEEP_AS_IS) $(RELSYSDIR)/ebin |
|
21 |
-+ $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin |
|
22 |
- |
|
23 |
- |
|
24 |
- release_docs_spec: |
|
25 |
-diff -ru otp_src_R9B-1-orig/lib/kernel/src/inet_config.erl otp_src_R9B-1/lib/kernel/src/inet_config.erl |
|
26 |
---- otp_src_R9B-1-orig/lib/kernel/src/inet_config.erl 2002-10-09 07:39:22.000000000 -0700 |
|
27 |
-+++ otp_src_R9B-1/lib/kernel/src/inet_config.erl 2003-07-03 17:43:37.000000000 -0700 |
|
28 |
-@@ -82,8 +82,13 @@ |
|
29 |
- 'bsd/os' -> |
|
30 |
- load_resolv(filename:join(Etc,"irs.conf"), host_conf_bsdos); |
|
31 |
- linux -> |
|
32 |
-- load_resolv(filename:join(Etc,"host.conf"),host_conf_linux), |
|
33 |
-- |
|
34 |
-+ case load_resolv(filename:join(Etc,"host.conf"),host_conf_linux) of |
|
35 |
-+ ok -> |
|
36 |
-+ ok; |
|
37 |
-+ _Other -> |
|
38 |
-+ load_resolv(filename:join(Etc,"nsswitch.conf"), nsswitch_conf) |
|
39 |
-+ end, |
|
40 |
-+ |
|
41 |
- % It may be the case that the domain name was not set |
|
42 |
- % because the hostname was short. But we can now look it |
|
43 |
- % up and get the long name and the domain name from it. |
|
44 |
-@@ -296,10 +301,12 @@ |
|
45 |
- case apply(inet_parse, Func, [File,{chars,Bin}]) of |
|
46 |
- {ok, Ls} -> inet_db:add_rc_list(Ls); |
|
47 |
- {error, Reason} -> |
|
48 |
-- error("parse error in file ~s: ~p", [File, Reason]) |
|
49 |
-+ error("parse error in file ~s: ~p", [File, Reason]), |
|
50 |
-+ {error, Reason} |
|
51 |
- end; |
|
52 |
- Error -> |
|
53 |
-- warning("file not found ~s~n", [File]) |
|
54 |
-+ warning("file not found ~s~n", [File]), |
|
55 |
-+ Error |
|
56 |
- end. |
|
57 |
- |
|
58 |
- %% |
|
59 |
-diff -ru otp_src_R9B-1-orig/lib/megaco/src/text/Makefile otp_src_R9B-1/lib/megaco/src/text/Makefile |
|
60 |
---- otp_src_R9B-1-orig/lib/megaco/src/text/Makefile 2002-11-28 05:50:00.000000000 -0800 |
|
61 |
-+++ otp_src_R9B-1/lib/megaco/src/text/Makefile 2003-07-03 17:44:41.000000000 -0700 |
|
62 |
-@@ -48,10 +48,15 @@ |
|
63 |
- $(INTERNAL_YRL_FILES:%.yrl=%.erl) |
|
64 |
- |
|
65 |
- BEAM_TARGET_FILES = \ |
|
66 |
-- $(INTERNAL_YRL_FILES:%.yrl=$(EBIN)/%.$(EMULATOR)) \ |
|
67 |
- $(MODULES:%=$(EBIN)/%.$(EMULATOR)) |
|
68 |
- |
|
69 |
--TARGET_FILES = $(ERL_TARGET_FILES) $(BEAM_TARGET_FILES) |
|
70 |
-+YRL_BEAM_TARGET_FILES = \ |
|
71 |
-+ $(INTERNAL_YRL_FILES:%.yrl=$(EBIN)/%.$(EMULATOR)) |
|
72 |
-+ |
|
73 |
-+ |
|
74 |
-+ |
|
75 |
-+TARGET_FILES = $(ERL_TARGET_FILES) $(BEAM_TARGET_FILES) $(YRL_BEAM_TARGETS) |
|
76 |
-+ |
|
77 |
- |
|
78 |
- |
|
79 |
- # ---------------------------------------------------- |
|
80 |
-@@ -65,6 +70,10 @@ |
|
81 |
- # ERL_COMPILE_FLAGS += +native |
|
82 |
- # endif |
|
83 |
- |
|
84 |
-+# ifeq ($(USE_HIPE),true) |
|
85 |
-+# ERL_COMPILE_FLAGS += +native |
|
86 |
-+# endif |
|
87 |
-+ |
|
88 |
- ifeq ($(WARN_UNUSED_WARS),true) |
|
89 |
- ERL_COMPILE_FLAGS += +warn_unused_vars |
|
90 |
- endif |
|
91 |
-@@ -94,6 +103,8 @@ |
|
92 |
- @echo "" |
|
93 |
- @echo "INTERNAL_HRL_FILES = $(INTERNAL_HRL_FILES)" |
|
94 |
- @echo "" |
|
95 |
-+ @echo "BEAM_TARGET_FILES = $(BEAM_TARGET_FILES) " |
|
96 |
-+ @echo "" |
|
97 |
- |
|
98 |
- |
|
99 |
- # ---------------------------------------------------- |
|
100 |
-������ � otp_src_R9B-1/lib/megaco/src/text: Makefile.orig |
|
101 |
-diff -ru otp_src_R9B-1-orig/lib/orber/priv/Makefile otp_src_R9B-1/lib/orber/priv/Makefile |
|
102 |
---- otp_src_R9B-1-orig/lib/orber/priv/Makefile 2002-10-02 15:17:29.000000000 -0700 |
|
103 |
-+++ otp_src_R9B-1/lib/orber/priv/Makefile 2003-07-03 17:44:41.000000000 -0700 |
|
104 |
-@@ -37,7 +37,6 @@ |
|
105 |
- blank.html \ |
|
106 |
- info_frames.html \ |
|
107 |
- main_frame.html \ |
|
108 |
-- orber_help.txt \ |
|
109 |
- start_info.html |
|
110 |
- |
|
111 |
- # |
|
112 |
-diff -ru otp_src_R9B-1-orig/lib/snmp/mibs/Makefile otp_src_R9B-1/lib/snmp/mibs/Makefile |
|
113 |
---- otp_src_R9B-1-orig/lib/snmp/mibs/Makefile 2002-10-02 14:48:43.000000000 -0700 |
|
114 |
-+++ otp_src_R9B-1/lib/snmp/mibs/Makefile 2003-07-03 17:44:41.000000000 -0700 |
|
115 |
-@@ -59,13 +59,9 @@ |
|
116 |
- FUNCS_FILES = \ |
|
117 |
- STANDARD-MIB.funcs \ |
|
118 |
- SNMPv2-MIB.funcs \ |
|
119 |
-- SNMP-COMMUNITY-MIB.mib \ |
|
120 |
-- SNMP-FRAMEWORK-MIB.mib \ |
|
121 |
-- SNMP-MPD-MIB.mib \ |
|
122 |
- SNMP-NOTIFICATION-MIB.funcs \ |
|
123 |
-- SNMP-TARGET-MIB.funcs \ |
|
124 |
-- SNMP-USER-BASED-SM-MIB.mib \ |
|
125 |
-- SNMP-VIEW-BASED-ACM-MIB.mib |
|
126 |
-+ SNMP-TARGET-MIB.funcs |
|
127 |
-+ |
|
128 |
- |
|
129 |
- V1_MIB_FILES= v1/OTP-SNMPEA-MIB.mib.v1 |
|
130 |
- |
... | ... |
@@ -1,11 +0,0 @@ |
1 |
---- otp_src_R10B-10/erts/emulator/hipe/hipe_x86_signal.c.orig 2006-03-31 14:49:28.000000000 +0200 |
|
2 |
-+++ otp_src_R10B-10/erts/emulator/hipe/hipe_x86_signal.c 2006-03-31 14:49:42.000000000 +0200 |
|
3 |
-@@ -27,7 +27,7 @@ |
|
4 |
- #include <stdlib.h> |
|
5 |
- #include "hipe_signal.h" |
|
6 |
- |
|
7 |
--#if __GLIBC__ == 2 && __GLIBC_MINOR__ == 3 |
|
8 |
-+#if __GLIBC__ == 2 && __GLIBC_MINOR__ >= 3 |
|
9 |
- /* See comment below for glibc 2.2. */ |
|
10 |
- #ifndef __USE_GNU |
|
11 |
- #define __USE_GNU /* to un-hide RTLD_NEXT */ |
... | ... |
@@ -1,423 +0,0 @@ |
1 |
-diff -Nurp erts/acconfig.h erts/acconfig.h |
|
2 |
---- erts/acconfig.h 2005-06-21 09:37:40.000000000 -0700 |
|
3 |
-+++ erts/acconfig.h 2006-03-10 15:55:12.000000000 -0800 |
|
4 |
-@@ -188,6 +188,9 @@ |
|
5 |
- /* Define if you have the <linux/kpoll.h> header file. */ |
|
6 |
- #undef HAVE_LINUX_KPOLL_H |
|
7 |
- |
|
8 |
-+/* Define if you have the <linux/epoll.h> header file. */ |
|
9 |
-+#undef HAVE_LINUX_EPOLL_H |
|
10 |
-+ |
|
11 |
- /* Define if you have the <sys/event.h> header file. */ |
|
12 |
- #undef HAVE_SYS_EVENT_H |
|
13 |
- |
|
14 |
-@@ -224,7 +227,7 @@ |
|
15 |
- |
|
16 |
- #if !defined(USE_SELECT) |
|
17 |
- # if defined(ENABLE_KERNEL_POLL) |
|
18 |
--# if defined(HAVE_SYS_DEVPOLL_H) || defined(HAVE_LINUX_KPOLL_H) || defined(HAVE_SYS_EVENT_H) |
|
19 |
-+# if defined(HAVE_SYS_DEVPOLL_H) || defined(HAVE_LINUX_KPOLL_H) || defined(HAVE_SYS_EVENT_H) || defined(HAVE_LINUX_KPOLL_H) |
|
20 |
- # define USE_KERNEL_POLL |
|
21 |
- # endif |
|
22 |
- # endif |
|
23 |
-diff -Nurp erts/config.h.in erts/config.h.in |
|
24 |
---- erts/config.h.in 2006-03-07 15:02:41.000000000 -0800 |
|
25 |
-+++ erts/config.h.in 2006-03-10 15:55:12.000000000 -0800 |
|
26 |
-@@ -175,6 +175,8 @@ |
|
27 |
- /* Define if you have the <linux/kpoll.h> header file. */ |
|
28 |
- #undef HAVE_LINUX_KPOLL_H |
|
29 |
- |
|
30 |
-+/* Define if you have the <linux/epoll.h> header file. */ |
|
31 |
-+#undef HAVE_LINUX_EPOLL_H |
|
32 |
- |
|
33 |
- /* Define if you have the <sys/event.h> header file. */ |
|
34 |
- #undef HAVE_SYS_EVENT_H |
|
35 |
-@@ -399,7 +401,7 @@ |
|
36 |
- |
|
37 |
- #if !defined(USE_SELECT) |
|
38 |
- # if defined(ENABLE_KERNEL_POLL) |
|
39 |
--# if defined(HAVE_SYS_DEVPOLL_H) || defined(HAVE_LINUX_KPOLL_H) || defined(HAVE_SYS_EVENT_H) |
|
40 |
-+# if defined(HAVE_SYS_DEVPOLL_H) || defined(HAVE_LINUX_KPOLL_H) || defined(HAVE_SYS_EVENT_H) || defined(HAVE_LINUX_EPOLL_H) |
|
41 |
- # define USE_KERNEL_POLL |
|
42 |
- # endif |
|
43 |
- # endif |
|
44 |
-diff -Nurp erts/configure erts/configure |
|
45 |
---- erts/configure 2006-03-07 15:02:39.000000000 -0800 |
|
46 |
-+++ erts/configure 2006-03-10 15:55:12.000000000 -0800 |
|
47 |
-@@ -3825,6 +3825,151 @@ else |
|
48 |
- fi |
|
49 |
- |
|
50 |
- |
|
51 |
-+ |
|
52 |
-+if test "${ac_cv_header_sys_epoll_h+set}" = set; then |
|
53 |
-+ echo "$as_me:$LINENO: checking for sys/epoll.h" >&5 |
|
54 |
-+echo $ECHO_N "checking for sys/epoll.h... $ECHO_C" >&6 |
|
55 |
-+if test "${ac_cv_header_sys_epoll_h+set}" = set; then |
|
56 |
-+ echo $ECHO_N "(cached) $ECHO_C" >&6 |
|
57 |
-+fi |
|
58 |
-+echo "$as_me:$LINENO: result: $ac_cv_header_sys_epoll_h" >&5 |
|
59 |
-+echo "${ECHO_T}$ac_cv_header_sys_epoll_h" >&6 |
|
60 |
-+else |
|
61 |
-+ # Is the header compilable? |
|
62 |
-+echo "$as_me:$LINENO: checking sys/epoll.h usability" >&5 |
|
63 |
-+echo $ECHO_N "checking sys/epoll.h usability... $ECHO_C" >&6 |
|
64 |
-+cat >conftest.$ac_ext <<_ACEOF |
|
65 |
-+/* confdefs.h. */ |
|
66 |
-+_ACEOF |
|
67 |
-+cat confdefs.h >>conftest.$ac_ext |
|
68 |
-+cat >>conftest.$ac_ext <<_ACEOF |
|
69 |
-+/* end confdefs.h. */ |
|
70 |
-+$ac_includes_default |
|
71 |
-+#include <sys/epoll.h> |
|
72 |
-+_ACEOF |
|
73 |
-+rm -f conftest.$ac_objext |
|
74 |
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
|
75 |
-+ (eval $ac_compile) 2>conftest.er1 |
|
76 |
-+ ac_status=$? |
|
77 |
-+ grep -v '^ *+' conftest.er1 >conftest.err |
|
78 |
-+ rm -f conftest.er1 |
|
79 |
-+ cat conftest.err >&5 |
|
80 |
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
|
81 |
-+ (exit $ac_status); } && |
|
82 |
-+ { ac_try='test -z "$ac_c_werror_flag" |
|
83 |
-+ || test ! -s conftest.err' |
|
84 |
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
|
85 |
-+ (eval $ac_try) 2>&5 |
|
86 |
-+ ac_status=$? |
|
87 |
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
|
88 |
-+ (exit $ac_status); }; } && |
|
89 |
-+ { ac_try='test -s conftest.$ac_objext' |
|
90 |
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
|
91 |
-+ (eval $ac_try) 2>&5 |
|
92 |
-+ ac_status=$? |
|
93 |
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
|
94 |
-+ (exit $ac_status); }; }; then |
|
95 |
-+ ac_header_compiler=yes |
|
96 |
-+else |
|
97 |
-+ echo "$as_me: failed program was:" >&5 |
|
98 |
-+sed 's/^/| /' conftest.$ac_ext >&5 |
|
99 |
-+ |
|
100 |
-+ac_header_compiler=no |
|
101 |
-+fi |
|
102 |
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext |
|
103 |
-+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 |
|
104 |
-+echo "${ECHO_T}$ac_header_compiler" >&6 |
|
105 |
-+ |
|
106 |
-+# Is the header present? |
|
107 |
-+echo "$as_me:$LINENO: checking sys/epoll.h presence" >&5 |
|
108 |
-+echo $ECHO_N "checking sys/epoll.h presence... $ECHO_C" >&6 |
|
109 |
-+cat >conftest.$ac_ext <<_ACEOF |
|
110 |
-+/* confdefs.h. */ |
|
111 |
-+_ACEOF |
|
112 |
-+cat confdefs.h >>conftest.$ac_ext |
|
113 |
-+cat >>conftest.$ac_ext <<_ACEOF |
|
114 |
-+/* end confdefs.h. */ |
|
115 |
-+#include <sys/epoll.h> |
|
116 |
-+_ACEOF |
|
117 |
-+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 |
|
118 |
-+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 |
|
119 |
-+ ac_status=$? |
|
120 |
-+ grep -v '^ *+' conftest.er1 >conftest.err |
|
121 |
-+ rm -f conftest.er1 |
|
122 |
-+ cat conftest.err >&5 |
|
123 |
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
|
124 |
-+ (exit $ac_status); } >/dev/null; then |
|
125 |
-+ if test -s conftest.err; then |
|
126 |
-+ ac_cpp_err=$ac_c_preproc_warn_flag |
|
127 |
-+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag |
|
128 |
-+ else |
|
129 |
-+ ac_cpp_err= |
|
130 |
-+ fi |
|
131 |
-+else |
|
132 |
-+ ac_cpp_err=yes |
|
133 |
-+fi |
|
134 |
-+if test -z "$ac_cpp_err"; then |
|
135 |
-+ ac_header_preproc=yes |
|
136 |
-+else |
|
137 |
-+ echo "$as_me: failed program was:" >&5 |
|
138 |
-+sed 's/^/| /' conftest.$ac_ext >&5 |
|
139 |
-+ |
|
140 |
-+ ac_header_preproc=no |
|
141 |
-+fi |
|
142 |
-+rm -f conftest.err conftest.$ac_ext |
|
143 |
-+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 |
|
144 |
-+echo "${ECHO_T}$ac_header_preproc" >&6 |
|
145 |
-+ |
|
146 |
-+# So? What about this header? |
|
147 |
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in |
|
148 |
-+ yes:no: ) |
|
149 |
-+ { echo "$as_me:$LINENO: WARNING: sys/epoll.h: accepted by the compiler, rejected by the preprocessor!" >&5 |
|
150 |
-+echo "$as_me: WARNING: sys/epoll.h: accepted by the compiler, rejected by the preprocessor!" >&2;} |
|
151 |
-+ { echo "$as_me:$LINENO: WARNING: sys/epoll.h: proceeding with the compiler's result" >&5 |
|
152 |
-+echo "$as_me: WARNING: sys/epoll.h: proceeding with the compiler's result" >&2;} |
|
153 |
-+ ac_header_preproc=yes |
|
154 |
-+ ;; |
|
155 |
-+ no:yes:* ) |
|
156 |
-+ { echo "$as_me:$LINENO: WARNING: sys/epoll.h: present but cannot be compiled" >&5 |
|
157 |
-+echo "$as_me: WARNING: sys/epoll.h: present but cannot be compiled" >&2;} |
|
158 |
-+ { echo "$as_me:$LINENO: WARNING: sys/epoll.h: check for missing prerequisite headers?" >&5 |
|
159 |
-+echo "$as_me: WARNING: sys/epoll.h: check for missing prerequisite headers?" >&2;} |
|
160 |
-+ { echo "$as_me:$LINENO: WARNING: sys/epoll.h: see the Autoconf documentation" >&5 |
|
161 |
-+echo "$as_me: WARNING: sys/epoll.h: see the Autoconf documentation" >&2;} |
|
162 |
-+ { echo "$as_me:$LINENO: WARNING: sys/epoll.h: section \"Present But Cannot Be Compiled\"" >&5 |
|
163 |
-+echo "$as_me: WARNING: sys/epoll.h: section \"Present But Cannot Be Compiled\"" >&2;} |
|
164 |
-+ { echo "$as_me:$LINENO: WARNING: sys/epoll.h: proceeding with the preprocessor's result" >&5 |
|
165 |
-+echo "$as_me: WARNING: sys/epoll.h: proceeding with the preprocessor's result" >&2;} |
|
166 |
-+ { echo "$as_me:$LINENO: WARNING: sys/epoll.h: in the future, the compiler will take precedence" >&5 |
|
167 |
-+echo "$as_me: WARNING: sys/epoll.h: in the future, the compiler will take precedence" >&2;} |
|
168 |
-+ ( |
|
169 |
-+ cat <<\_ASBOX |
|
170 |
-+## ------------------------------------------ ## |
|
171 |
-+## Report this to the AC_PACKAGE_NAME lists. ## |
|
172 |
-+## ------------------------------------------ ## |
|
173 |
-+_ASBOX |
|
174 |
-+ ) | |
|
175 |
-+ sed "s/^/$as_me: WARNING: /" >&2 |
|
176 |
-+ ;; |
|
177 |
-+esac |
|
178 |
-+echo "$as_me:$LINENO: checking for sys/epoll.h" >&5 |
|
179 |
-+echo $ECHO_N "checking for sys/epoll.h... $ECHO_C" >&6 |
|
180 |
-+if test "${ac_cv_header_sys_epoll_h+set}" = set; then |
|
181 |
-+ echo $ECHO_N "(cached) $ECHO_C" >&6 |
|
182 |
-+else |
|
183 |
-+ ac_cv_header_sys_epoll_h=$ac_header_preproc |
|
184 |
-+fi |
|
185 |
-+echo "$as_me:$LINENO: result: $ac_cv_header_sys_epoll_h" >&5 |
|
186 |
-+echo "${ECHO_T}$ac_cv_header_sys_epoll_h" >&6 |
|
187 |
-+ |
|
188 |
-+fi |
|
189 |
-+if test $ac_cv_header_sys_epoll_h = yes; then |
|
190 |
-+ cat >>confdefs.h <<\_ACEOF |
|
191 |
-+#define HAVE_LINUX_EPOLL_H 1 |
|
192 |
-+_ACEOF |
|
193 |
-+ |
|
194 |
-+fi |
|
195 |
-+ |
|
196 |
- echo $ac_n "checking for SO_BSDCOMPAT declaration""... $ac_c" 1>&6 |
|
197 |
- echo "configure:3830: checking for SO_BSDCOMPAT declaration" >&5 |
|
198 |
- if eval "test \"`echo '$''{'ac_cv_decl_so_bsdcompat'+set}'`\" = set"; then |
|
199 |
-diff -Nurp erts/configure.in erts/configure.in |
|
200 |
---- erts/configure.in 2006-03-07 06:25:41.000000000 -0800 |
|
201 |
-+++ erts/configure.in 2006-03-10 15:55:12.000000000 -0800 |
|
202 |
-@@ -664,6 +664,7 @@ dnl Check if we have kernel poll support |
|
203 |
- AC_CHECK_HEADER(sys/devpoll.h, AC_DEFINE(HAVE_SYS_DEVPOLL_H)) |
|
204 |
- AC_CHECK_HEADER(linux/kpoll.h, AC_DEFINE(HAVE_LINUX_KPOLL_H)) |
|
205 |
- AC_CHECK_HEADER(sys/event.h, AC_DEFINE(HAVE_SYS_EVENT_H)) |
|
206 |
-+AC_CHECK_HEADER(sys/epoll.h, AC_DEFINE(HAVE_LINUX_EPOLL_H)) |
|
207 |
- |
|
208 |
- HAVE_VALGRIND=no |
|
209 |
- AC_CHECK_HEADER(valgrind/valgrind.h, HAVE_VALGRIND=yes) |
|
210 |
- AC_SUBST(HAVE_VALGRIND) |
|
211 |
-diff -Nurp erts/emulator/sys/unix/sys.c erts/emulator/sys/unix/sys.c |
|
212 |
---- erts/emulator/sys/unix/sys.c 2006-03-07 06:24:29.000000000 -0800 |
|
213 |
-+++ erts/emulator/sys/unix/sys.c 2006-03-10 15:55:12.000000000 -0800 |
|
214 |
-@@ -13,6 +13,12 @@ |
|
215 |
- * Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings |
|
216 |
- * AB. All Rights Reserved.'' |
|
217 |
- * |
|
218 |
-+ * 2005-08-31 |
|
219 |
-+ * This has been modified by Matthew Reilly of SIPphone Inc. to |
|
220 |
-+ * enable kernel poll (+K true) support via the epoll mechanism in Linux 2.6 |
|
221 |
-+ * Portions created by SIPphone Inc. are Copyright 2005, SIPphone Inc. |
|
222 |
-+ * These modifications are released under the Erlang Public License. |
|
223 |
-+ * |
|
224 |
- * $Id$ |
|
225 |
- */ |
|
226 |
- |
|
227 |
-@@ -50,6 +56,9 @@ |
|
228 |
- # define USE_DEVPOLL |
|
229 |
- # include <sys/devpoll.h> |
|
230 |
- # endif |
|
231 |
-+# ifdef HAVE_LINUX_EPOLL_H /* Too minimize code changes, we pretend we have HAVE_LINUX_KPOLL_H as well */ |
|
232 |
-+# define HAVE_LINUX_KPOLL_H 1 |
|
233 |
-+# endif |
|
234 |
- # ifdef HAVE_LINUX_KPOLL_H |
|
235 |
- # define USE_DEVPOLL |
|
236 |
- # include <asm/page.h> |
|
237 |
-@@ -58,7 +67,11 @@ |
|
238 |
- # ifndef POLLREMOVE |
|
239 |
- # define POLLREMOVE 0x1000 /* some day it will make it to bits/poll.h ;-) */ |
|
240 |
- # endif |
|
241 |
--# include <linux/kpoll.h> |
|
242 |
-+# ifdef HAVE_LINUX_EPOLL_H |
|
243 |
-+# include <sys/epoll.h> |
|
244 |
-+# else |
|
245 |
-+# include <linux/kpoll.h> |
|
246 |
-+# endif |
|
247 |
- # endif |
|
248 |
- # ifdef USE_DEVPOLL /* can only use one of them ... */ |
|
249 |
- # ifdef USE_KQUEUE |
|
250 |
-@@ -188,8 +201,17 @@ static int use_kernel_poll = 0; |
|
251 |
- |
|
252 |
- static int dev_poll_fd; /* fd for /dev/poll */ |
|
253 |
- #ifdef HAVE_LINUX_KPOLL_H |
|
254 |
-+ |
|
255 |
-+#ifdef HAVE_LINUX_EPOLL_H |
|
256 |
-+static struct epoll_event* dev_epoll_map; |
|
257 |
-+/* XXX Implement correct mapping from POLLIN/POLLOUT to/from EPOLLIN/EPOLLOUT */ |
|
258 |
-+/* Currenltly POLLIN/POLLOUT == EPOLLIN/EPOLLOUT. So these macros will work */ |
|
259 |
-+#define EPOLL_TO_POLL(bit_map) (bit_map) |
|
260 |
-+#define POLL_TO_EPOLL(bit_map) (bit_map & (EPOLLIN|EPOLLOUT)) |
|
261 |
-+#else |
|
262 |
- static char * dev_poll_map; /* mmap'ed area from kernel /dev/kpoll */ |
|
263 |
- static struct k_poll dev_poll; /* control block for /dev/kpoll */ |
|
264 |
-+#endif /* HAVE_LINUX_KPOLL_H */ |
|
265 |
- static int max_poll_idx; /* highest non /dev/kpoll fd */ |
|
266 |
- |
|
267 |
- static void kpoll_enable(); |
|
268 |
-@@ -199,7 +221,7 @@ static struct dvpoll dev_poll; /* |
|
269 |
- static struct pollfd* dev_poll_rfds = NULL; /* Allocated at startup */ |
|
270 |
- |
|
271 |
- static void devpoll_init(void); |
|
272 |
--static void devpoll_update_pix(int pix); |
|
273 |
-+static void devpoll_update_pix(int pix, int old_events); |
|
274 |
- #ifdef HAVE_SYS_DEVPOLL_H |
|
275 |
- static void devpoll_clear_pix(int pix); |
|
276 |
- #endif /* HAVE_SYS_DEVPOLL_H */ |
|
277 |
-@@ -1967,7 +1989,7 @@ static int driver_select_kp(ErlDrvPort i |
|
278 |
- |
|
279 |
- #ifdef USE_DEVPOLL |
|
280 |
- if (poll_fds[pix].events != old_events) |
|
281 |
-- devpoll_update_pix(pix); |
|
282 |
-+ devpoll_update_pix(pix, old_events); |
|
283 |
- #endif |
|
284 |
- #ifdef USE_KQUEUE |
|
285 |
- if (poll_fds[pix].events != old_events) |
|
286 |
-@@ -2023,7 +2045,7 @@ static int driver_select_kp(ErlDrvPort i |
|
287 |
- if ( old_events && (dev_poll_fd != -1) ) { |
|
288 |
- /* Tell /dev/[k]poll that we are not interested any more ... */ |
|
289 |
- poll_fds[pix].events = POLLREMOVE; |
|
290 |
-- devpoll_update_pix(pix); |
|
291 |
-+ devpoll_update_pix(pix, old_events); |
|
292 |
- /* devpoll_update_pix may change the pix */ |
|
293 |
- pix = fd_data[fd].pix; |
|
294 |
- poll_fds[pix].events = 0; |
|
295 |
-@@ -2080,7 +2102,7 @@ static int driver_select_kp(ErlDrvPort i |
|
296 |
- #ifdef HAVE_SYS_DEVPOLL_H |
|
297 |
- devpoll_clear_pix(pix); |
|
298 |
- #endif /* HAVE_SYS_DEVPOLL_H */ |
|
299 |
-- devpoll_update_pix(pix); |
|
300 |
-+ devpoll_update_pix(pix, old_events); |
|
301 |
- } |
|
302 |
- #endif |
|
303 |
- #ifdef USE_KQUEUE |
|
304 |
-@@ -2638,6 +2660,27 @@ static void check_io_kp(int do_wait) |
|
305 |
- nof_ready_fds = vr; |
|
306 |
- |
|
307 |
- #if HAVE_LINUX_KPOLL_H |
|
308 |
-+#ifdef HAVE_LINUX_EPOLL_H |
|
309 |
-+ if ( do_event_poll ) { |
|
310 |
-+ if ((r = epoll_wait(dev_poll_fd,dev_epoll_map,max_fd_plus_one,0)) > 0) { |
|
311 |
-+ for (i = 0; (i < r); i++) { |
|
312 |
-+ short revents = dev_epoll_map[i].events; |
|
313 |
-+ |
|
314 |
-+ if (revents != 0) { |
|
315 |
-+ int fd = dev_epoll_map[i].data.fd; |
|
316 |
-+ rp->pfd.fd = fd; |
|
317 |
-+ rp->pfd.events = poll_fds[fd_data[fd].pix].events; |
|
318 |
-+ rp->pfd.revents = EPOLL_TO_POLL(revents); |
|
319 |
-+ rp->iport = fd_data[fd].inport; |
|
320 |
-+ rp->oport = fd_data[fd].outport; |
|
321 |
-+ rp++; |
|
322 |
-+ nof_ready_fds ++; |
|
323 |
-+ } |
|
324 |
-+ } |
|
325 |
-+ } |
|
326 |
-+ } |
|
327 |
-+ |
|
328 |
-+#else |
|
329 |
- if ( do_event_poll ) { |
|
330 |
- /* Now do the fast poll */ |
|
331 |
- dev_poll.kp_timeout = 0; |
|
332 |
-@@ -2660,6 +2703,7 @@ static void check_io_kp(int do_wait) |
|
333 |
- nof_ready_fds += r; |
|
334 |
- } |
|
335 |
- } |
|
336 |
-+#endif /*HAVE_LINUX_EPOLL_H */ |
|
337 |
- #endif |
|
338 |
- |
|
339 |
- } else { |
|
340 |
-@@ -3531,6 +3575,20 @@ static void kpoll_enable() |
|
341 |
- poll_fds[pix].revents = 0; |
|
342 |
- } |
|
343 |
- |
|
344 |
-+#ifdef HAVE_LINUX_EPOLL_H |
|
345 |
-+static void epoll_init() |
|
346 |
-+{ |
|
347 |
-+ /* max_files is just a hint to the kernel */ |
|
348 |
-+ if ( (dev_poll_fd=epoll_create(max_files)) < 0 ) { |
|
349 |
-+ DEBUGF(("Will use poll()\n")); |
|
350 |
-+ dev_poll_fd = -1; /* We will not use ekpoll */ |
|
351 |
-+ } else { |
|
352 |
-+ DEBUGF(("Will use epoll\n")); |
|
353 |
-+ dev_epoll_map = (struct epoll_event *) erts_alloc(ERTS_ALC_T_POLL_FDS, (sizeof(struct epoll_event) * max_files)); |
|
354 |
-+ erts_sys_misc_mem_sz += sizeof(struct epoll_event) * max_files; |
|
355 |
-+ } |
|
356 |
-+} |
|
357 |
-+#else |
|
358 |
- static void kpoll_init() |
|
359 |
- { |
|
360 |
- if ( (dev_poll_fd=open("/dev/kpoll",O_RDWR)) < 0 ) { |
|
361 |
-@@ -3552,6 +3610,7 @@ static void kpoll_init() |
|
362 |
- dev_poll_rfds = NULL; |
|
363 |
- } |
|
364 |
- } |
|
365 |
-+#endif /* HAVE_LINUX_EPOLL_H */ |
|
366 |
- |
|
367 |
- #endif /* HAVE_LINUX_KPOLL_H */ |
|
368 |
- |
|
369 |
-@@ -3581,7 +3640,11 @@ static void devpoll_init(void) |
|
370 |
- } else { |
|
371 |
- /* Determine use of poll vs. /dev/poll at runtime */ |
|
372 |
- #ifdef HAVE_LINUX_KPOLL_H |
|
373 |
-+#ifdef HAVE_LINUX_EPOLL_H |
|
374 |
-+ epoll_init(); |
|
375 |
-+#else |
|
376 |
- kpoll_init(); |
|
377 |
-+#endif |
|
378 |
- #else |
|
379 |
- #ifdef HAVE_SYS_DEVPOLL_H |
|
380 |
- solaris_devpoll_init(); |
|
381 |
-@@ -3607,7 +3670,7 @@ static int devpoll_write(int fd, void *b |
|
382 |
- return count; |
|
383 |
- } |
|
384 |
- |
|
385 |
--static void devpoll_update_pix(int pix) |
|
386 |
-+static void devpoll_update_pix(int pix, int old_events) |
|
387 |
- { |
|
388 |
- int res; |
|
389 |
- |
|
390 |
-@@ -3622,10 +3685,33 @@ static void devpoll_update_pix(int pix) |
|
391 |
- |
|
392 |
- #endif |
|
393 |
- if ( dev_poll_fd != -1 ) { |
|
394 |
-+#ifdef HAVE_LINUX_EPOLL_H |
|
395 |
-+ int events = poll_fds[pix].events; |
|
396 |
-+ int fd = poll_fds[pix].fd; |
|
397 |
-+ if (old_events && events & POLLREMOVE) { |
|
398 |
-+ /* Delete file descriptor from epoll list */ |
|
399 |
-+ res = epoll_ctl(dev_poll_fd,EPOLL_CTL_DEL,fd,NULL); |
|
400 |
-+ /* XXX check return code */ |
|
401 |
-+ } else { |
|
402 |
-+ struct epoll_event epoll_ctl_event; |
|
403 |
-+ epoll_ctl_event.data.fd = fd; |
|
404 |
-+ epoll_ctl_event.events = POLL_TO_EPOLL(events); |
|
405 |
-+ if (old_events) { |
|
406 |
-+ /* Modify exiting fd */ |
|
407 |
-+ res = epoll_ctl(dev_poll_fd,EPOLL_CTL_MOD,fd,&epoll_ctl_event); |
|
408 |
-+ /* XXX check return code */ |
|
409 |
-+ } else { |
|
410 |
-+ /* Add fd to epoll list */ |
|
411 |
-+ res = epoll_ctl(dev_poll_fd,EPOLL_CTL_ADD,fd,&epoll_ctl_event); |
|
412 |
-+ /* XXX check return code */ |
|
413 |
-+ } |
|
414 |
-+ } |
|
415 |
-+#else |
|
416 |
- if ( (res=devpoll_write(dev_poll_fd,&poll_fds[pix],sizeof(struct pollfd))) != |
|
417 |
- (sizeof(struct pollfd)) ) { |
|
418 |
- erl_exit(1,"Can't write to /dev/poll\n"); |
|
419 |
- } |
|
420 |
-+#endif /* HAVE_LINUX_EPOLL_H */ |
|
421 |
- } |
|
422 |
- #if HAVE_LINUX_KPOLL_H |
|
423 |
- } else { |
... | ... |
@@ -1,83 +0,0 @@ |
1 |
---- ./lib/stdlib/src/supervisor.erl 2005-12-24 22:50:23.000000000 +0200 |
|
2 |
-+++ ./lib/stdlib/src/supervisor.erl 2005-12-24 23:03:33.000000000 +0200 |
|
3 |
-@@ -32,10 +32,12 @@ |
|
4 |
- -export([init/1, handle_call/3, handle_info/2, terminate/2, code_change/3]). |
|
5 |
- -export([handle_cast/2]). |
|
6 |
- |
|
7 |
-+-define(DICT, dict). |
|
8 |
-+ |
|
9 |
- -record(state, {name, |
|
10 |
- strategy, |
|
11 |
- children = [], |
|
12 |
-- dynamics = [], |
|
13 |
-+ dynamics = ?DICT:new(), |
|
14 |
- intensity, |
|
15 |
- period, |
|
16 |
- restarts = [], |
|
17 |
-@@ -218,11 +220,11 @@ |
|
18 |
- case do_start_child_i(M, F, Args) of |
|
19 |
- {ok, Pid} -> |
|
20 |
- NState = State#state{dynamics = |
|
21 |
-- [{Pid, Args}|State#state.dynamics]}, |
|
22 |
-+ ?DICT:store(Pid, Args, State#state.dynamics)}, |
|
23 |
- {reply, {ok, Pid}, NState}; |
|
24 |
- {ok, Pid, Extra} -> |
|
25 |
- NState = State#state{dynamics = |
|
26 |
-- [{Pid, Args}|State#state.dynamics]}, |
|
27 |
-+ ?DICT:store(Pid, Args, State#state.dynamics)}, |
|
28 |
- {reply, {ok, Pid, Extra}, NState}; |
|
29 |
- What -> |
|
30 |
- {reply, What, State} |
|
31 |
-@@ -284,7 +286,7 @@ |
|
32 |
- handle_call(which_children, _From, State) when ?is_simple(State) -> |
|
33 |
- [#child{child_type = CT, modules = Mods}] = State#state.children, |
|
34 |
- Reply = lists:map(fun({Pid, _}) -> {undefined, Pid, CT, Mods} end, |
|
35 |
-- State#state.dynamics), |
|
36 |
-+ ?DICT:to_list(State#state.dynamics)), |
|
37 |
- {reply, Reply, State}; |
|
38 |
- |
|
39 |
- handle_call(which_children, _From, State) -> |
|
40 |
-@@ -439,14 +441,14 @@ |
|
41 |
- %%% --------------------------------------------------- |
|
42 |
- |
|
43 |
- restart_child(Pid, Reason, State) when ?is_simple(State) -> |
|
44 |
-- case lists:keysearch(Pid, 1, State#state.dynamics) of |
|
45 |
-- {value, {_Pid, Args}} -> |
|
46 |
-+ case ?DICT:find(Pid, State#state.dynamics) of |
|
47 |
-+ {ok, Args} -> |
|
48 |
- [Child] = State#state.children, |
|
49 |
- RestartType = Child#child.restart_type, |
|
50 |
- {M, F, _} = Child#child.mfa, |
|
51 |
- NChild = Child#child{pid = Pid, mfa = {M, F, Args}}, |
|
52 |
- do_restart(RestartType, Reason, NChild, State); |
|
53 |
-- _ -> |
|
54 |
-+ error -> |
|
55 |
- {ok, State} |
|
56 |
- end; |
|
57 |
- restart_child(Pid, Reason, State) -> |
|
58 |
-@@ -488,13 +490,13 @@ |
|
59 |
- |
|
60 |
- restart(simple_one_for_one, Child, State) -> |
|
61 |
- #child{mfa = {M, F, A}} = Child, |
|
62 |
-- Dynamics = lists:keydelete(Child#child.pid,1,State#state.dynamics), |
|
63 |
-+ Dynamics = ?DICT:erase(Child#child.pid, State#state.dynamics), |
|
64 |
- case do_start_child_i(M, F, A) of |
|
65 |
- {ok, Pid} -> |
|
66 |
-- NState = State#state{dynamics = [{Pid, A} | Dynamics]}, |
|
67 |
-+ NState = State#state{dynamics = ?DICT:store(Pid, A, Dynamics)}, |
|
68 |
- {ok, NState}; |
|
69 |
- {ok, Pid, _Extra} -> |
|
70 |
-- NState = State#state{dynamics = [{Pid, A} | Dynamics]}, |
|
71 |
-+ NState = State#state{dynamics = ?DICT:store(Pid, A, Dynamics)}, |
|
72 |
- {ok, NState}; |
|
73 |
- {error, Error} -> |
|
74 |
- report_error(start_error, Error, Child, State#state.name), |
|
75 |
-@@ -638,7 +640,7 @@ |
|
76 |
- %% Child/State manipulating functions. |
|
77 |
- %%----------------------------------------------------------------- |
|
78 |
- state_del_child(#child{pid = Pid}, State) when ?is_simple(State) -> |
|
79 |
-- NDynamics = lists:keydelete(Pid, 1, State#state.dynamics), |
|
80 |
-+ NDynamics = ?DICT:erase(Pid, State#state.dynamics), |
|
81 |
- State#state{dynamics = NDynamics}; |
|
82 |
- state_del_child(Child, State) -> |
|
83 |
- NChildren = del_child(Child#child.name, State#state.children), |
... | ... |
@@ -1,12 +0,0 @@ |
1 |
-<?xml version="1.0" encoding="UTF-8"?> |
|
2 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
|
3 |
-<pkgmetadata> |
|
4 |
-<herd>lang-misc</herd> |
|
5 |
-<herd>emacs</herd> |
|
6 |
-<longdescription> |
|
7 |
-Erlang is a programming language designed at the Ericsson |
|
8 |
-Computer Science Laboratory. Open-source Erlang is being |
|
9 |
-released to help encourage the spread of Erlang outside |
|
10 |
-Ericsson. |
|
11 |
-</longdescription> |
|
12 |
-</pkgmetadata> |
|
13 | 0 |