1 |
djc 12/03/01 10:03:53 |
2 |
|
3 |
Modified: metadata.xml ChangeLog |
4 |
Added: erlang-15.2.ebuild |
5 |
Log: |
6 |
Version bump erlang to 15.2 (bug 399155) and include compat-ethread USE flag (bug 392669). |
7 |
|
8 |
(Portage version: 2.1.10.49/cvs/Linux x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.11 dev-lang/erlang/metadata.xml |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/erlang/metadata.xml?rev=1.11&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/erlang/metadata.xml?rev=1.11&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/erlang/metadata.xml?r1=1.10&r2=1.11 |
16 |
|
17 |
Index: metadata.xml |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/erlang/metadata.xml,v |
20 |
retrieving revision 1.10 |
21 |
retrieving revision 1.11 |
22 |
diff -u -r1.10 -r1.11 |
23 |
--- metadata.xml 4 May 2011 08:11:31 -0000 1.10 |
24 |
+++ metadata.xml 1 Mar 2012 10:03:53 -0000 1.11 |
25 |
@@ -11,6 +11,7 @@ |
26 |
<flag name="halfword">Enable halfword emulator</flag> |
27 |
<flag name="kpoll">Enable kernel polling support</flag> |
28 |
<flag name="sctp">Support for Stream Control Transmission Protocol</flag> |
29 |
+ <flag name="compat-ethread">Enable compatibility with pre-pentium 4 CPUs in the ethread library.</flag> |
30 |
</use> |
31 |
<longdescription> |
32 |
Erlang is a programming language designed at the Ericsson |
33 |
|
34 |
|
35 |
|
36 |
1.214 dev-lang/erlang/ChangeLog |
37 |
|
38 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/erlang/ChangeLog?rev=1.214&view=markup |
39 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/erlang/ChangeLog?rev=1.214&content-type=text/plain |
40 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/erlang/ChangeLog?r1=1.213&r2=1.214 |
41 |
|
42 |
Index: ChangeLog |
43 |
=================================================================== |
44 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/erlang/ChangeLog,v |
45 |
retrieving revision 1.213 |
46 |
retrieving revision 1.214 |
47 |
diff -u -r1.213 -r1.214 |
48 |
--- ChangeLog 7 Dec 2011 17:44:39 -0000 1.213 |
49 |
+++ ChangeLog 1 Mar 2012 10:03:53 -0000 1.214 |
50 |
@@ -1,6 +1,13 @@ |
51 |
# ChangeLog for dev-lang/erlang |
52 |
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
53 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/ChangeLog,v 1.213 2011/12/07 17:44:39 ulm Exp $ |
54 |
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
55 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/ChangeLog,v 1.214 2012/03/01 10:03:53 djc Exp $ |
56 |
+ |
57 |
+*erlang-15.2 (01 Mar 2012) |
58 |
+ |
59 |
+ 01 Mar 2012; Dirkjan Ochtman <djc@g.o> +erlang-15.2.ebuild, |
60 |
+ metadata.xml: |
61 |
+ Version bump to 15.2 (bug 399155) and include compat-ethread USE flag (bug |
62 |
+ 392669). |
63 |
|
64 |
07 Dec 2011; Ulrich Mueller <ulm@g.o> erlang-13.2.4.ebuild, |
65 |
erlang-14.2.2-r1.ebuild, erlang-14.2.3.ebuild, erlang-14.2.4.ebuild: |
66 |
|
67 |
|
68 |
|
69 |
1.1 dev-lang/erlang/erlang-15.2.ebuild |
70 |
|
71 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/erlang/erlang-15.2.ebuild?rev=1.1&view=markup |
72 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/erlang/erlang-15.2.ebuild?rev=1.1&content-type=text/plain |
73 |
|
74 |
Index: erlang-15.2.ebuild |
75 |
=================================================================== |
76 |
# Copyright 1999-2012 Gentoo Foundation |
77 |
# Distributed under the terms of the GNU General Public License v2 |
78 |
# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-15.2.ebuild,v 1.1 2012/03/01 10:03:53 djc Exp $ |
79 |
|
80 |
EAPI=3 |
81 |
WX_GTK_VER="2.8" |
82 |
|
83 |
inherit elisp-common eutils java-pkg-opt-2 multilib versionator wxwidgets |
84 |
|
85 |
# NOTE: If you need symlinks for binaries please tell maintainers or |
86 |
# open up a bug to let it be created. |
87 |
|
88 |
# erlang uses a really weird versioning scheme which caused quite a few problems |
89 |
# already. Thus we do a slight modification converting all letters to digits to |
90 |
# make it more sane (see e.g. #26420) |
91 |
|
92 |
# the next line selects the right source. |
93 |
ERL_VER=($(get_version_components)) |
94 |
MY_PV="R$(get_major_version)B${ERL_VER[2]}" |
95 |
|
96 |
# ATTN!! Take care when processing the C, etc version! |
97 |
MY_P=otp_src_${MY_PV} |
98 |
|
99 |
DESCRIPTION="Erlang programming language, runtime environment, and large collection of libraries" |
100 |
HOMEPAGE="http://www.erlang.org/" |
101 |
SRC_URI="http://www.erlang.org/download/${MY_P}.tar.gz |
102 |
http://erlang.org/download/otp_doc_man_${MY_PV}.tar.gz |
103 |
doc? ( http://erlang.org/download/otp_doc_html_${MY_PV}.tar.gz )" |
104 |
|
105 |
LICENSE="ErlPL-1.1" |
106 |
SLOT="0" |
107 |
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris" |
108 |
IUSE="compat-ethread doc emacs halfword hipe java kpoll odbc smp sctp ssl tk wxwidgets" |
109 |
|
110 |
RDEPEND=">=dev-lang/perl-5.6.1 |
111 |
ssl? ( >=dev-libs/openssl-0.9.7d ) |
112 |
emacs? ( virtual/emacs ) |
113 |
java? ( >=virtual/jdk-1.2 ) |
114 |
odbc? ( dev-db/unixODBC )" |
115 |
DEPEND="${RDEPEND} |
116 |
wxwidgets? ( x11-libs/wxGTK:2.8[opengl] ) |
117 |
sctp? ( net-misc/lksctp-tools ) |
118 |
tk? ( dev-lang/tk )" |
119 |
|
120 |
S="${WORKDIR}/${MY_P}" |
121 |
|
122 |
SITEFILE=50${PN}-gentoo.el |
123 |
|
124 |
pkg_setup() { |
125 |
use wxwidgets && wxwidgets_pkg_setup |
126 |
if use halfword ; then |
127 |
use amd64 || die "halfword support is limited to amd64" |
128 |
fi |
129 |
} |
130 |
|
131 |
src_prepare() { |
132 |
use odbc || sed -i 's: odbc : :' lib/Makefile |
133 |
|
134 |
# bug 263129, don't ignore LDFLAGS, reported upstream |
135 |
sed -e 's:LDFLAGS = \$(DED_LDFLAGS):LDFLAGS += \$(DED_LDFLAGS):' -i "${S}"/lib/megaco/src/flex/Makefile.in || die |
136 |
|
137 |
if ! use wxwidgets; then |
138 |
sed -i 's: wx : :' lib/Makefile |
139 |
rm -rf lib/wx |
140 |
fi |
141 |
|
142 |
# Nasty workaround, reported upstream |
143 |
cp "${S}"/lib/configure.in.src "${S}"/lib/configure.in || die |
144 |
|
145 |
# prevent configure from injecting -m32 by default on Darwin, bug #334155 |
146 |
# Nasty hack |
147 |
sed -i -e 's/Darwin-i386/Darwin-NO/' configure.in || die |
148 |
sed -i -e '/\<\(LD\|C\)FLAGS="-m32/s/-m32//' erts/configure.in || die |
149 |
|
150 |
# bug 383697 |
151 |
sed -i '1i#define OF(x) x' erts/emulator/drivers/common/gzio.c || die |
152 |
} |
153 |
|
154 |
src_configure() { |
155 |
use java || export JAVAC=false |
156 |
|
157 |
econf \ |
158 |
--enable-threads \ |
159 |
--enable-shared-zlib \ \ |
160 |
$(use_enable sctp) \ |
161 |
$(use_enable halfword halfword-emulator) \ |
162 |
$(use_enable hipe) \ |
163 |
$(use_with ssl ssl "${EPREFIX}"/usr) \ |
164 |
$(use_enable ssl dynamic-ssl-lib) \ |
165 |
$(use_enable kpoll kernel-poll) \ |
166 |
$(use_enable smp smp-support) \ |
167 |
$(use compat-ethread && echo "--enable-ethread-pre-pentium4-compatibility") \ |
168 |
|| die |
169 |
} |
170 |
|
171 |
src_compile() { |
172 |
use java || export JAVAC=false |
173 |
emake -j1 || die |
174 |
|
175 |
if use emacs ; then |
176 |
pushd lib/tools/emacs |
177 |
elisp-compile *.el || die |
178 |
popd |
179 |
fi |
180 |
} |
181 |
|
182 |
extract_version() { |
183 |
sed -n -e "/^$2 = \(.*\)$/s::\1:p" "${S}/$1/vsn.mk" |
184 |
} |
185 |
|
186 |
src_install() { |
187 |
local ERL_LIBDIR=/usr/$(get_libdir)/erlang |
188 |
local ERL_INTERFACE_VER=$(extract_version lib/erl_interface EI_VSN) |
189 |
local ERL_ERTS_VER=$(extract_version erts VSN) |
190 |
|
191 |
emake -j1 INSTALL_PREFIX="${D}" install || die |
192 |
dodoc AUTHORS README.md |
193 |
|
194 |
dosym "${ERL_LIBDIR}/bin/erl" /usr/bin/erl |
195 |
dosym "${ERL_LIBDIR}/bin/erlc" /usr/bin/erlc |
196 |
dosym "${ERL_LIBDIR}/bin/escript" /usr/bin/escript |
197 |
dosym \ |
198 |
"${ERL_LIBDIR}/lib/erl_interface-${ERL_INTERFACE_VER}/bin/erl_call" \ |
199 |
/usr/bin/erl_call |
200 |
dosym "${ERL_LIBDIR}/erts-${ERL_ERTS_VER}/bin/beam" /usr/bin/beam |
201 |
use smp && dosym "${ERL_LIBDIR}/erts-${ERL_ERTS_VER}/bin/beam.smp" /usr/bin/beam.smp |
202 |
|
203 |
## Remove ${D} from the following files |
204 |
sed -e "s:${D}::g" -i "${ED}${ERL_LIBDIR}/bin/erl" || die |
205 |
sed -e "s:${D}::g" -i "${ED}${ERL_LIBDIR}/bin/start" || die |
206 |
grep -rle "${D}" "${ED}/${ERL_LIBDIR}/erts-${ERL_ERTS_VER}" | xargs sed -i -e "s:${D}::g" |
207 |
|
208 |
## Clean up the no longer needed files |
209 |
rm "${ED}/${ERL_LIBDIR}/Install"||die |
210 |
|
211 |
for i in "${WORKDIR}"/man/man* ; do |
212 |
dodir "${ERL_LIBDIR}/${i##${WORKDIR}}" |
213 |
done |
214 |
for file in "${WORKDIR}"/man/man*/*.[1-9]; do |
215 |
# doman sucks so we can't use it |
216 |
cp ${file} "${ED}/${ERL_LIBDIR}"/man/man${file##*.}/ |
217 |
done |
218 |
# extend MANPATH, so the normal man command can find it |
219 |
# see bug 189639 |
220 |
dodir /etc/env.d/ |
221 |
echo "MANPATH=\"${EPREFIX}${ERL_LIBDIR}/man\"" > "${ED}/etc/env.d/90erlang" |
222 |
|
223 |
if use doc ; then |
224 |
dohtml -A README,erl,hrl,c,h,kwc,info -r \ |
225 |
"${WORKDIR}"/doc "${WORKDIR}"/lib "${WORKDIR}"/erts-* |
226 |
fi |
227 |
|
228 |
if use emacs ; then |
229 |
pushd "${S}" |
230 |
elisp-install erlang lib/tools/emacs/*.{el,elc} |
231 |
sed -e "s:/usr/share:${EPREFIX}/usr/share:g" \ |
232 |
"${FILESDIR}"/${SITEFILE} > "${T}"/${SITEFILE} |
233 |
elisp-site-file-install "${T}"/${SITEFILE} |
234 |
popd |
235 |
fi |
236 |
|
237 |
# prepare erl for SMP, fixes bug #188112 |
238 |
use smp && sed -i -e 's:\(exec.*erlexec\):\1 -smp:' \ |
239 |
"${ED}/${ERL_LIBDIR}/bin/erl" |
240 |
|
241 |
newinitd "${FILESDIR}"/epmd.init epmd || die |
242 |
} |
243 |
|
244 |
pkg_postinst() { |
245 |
use emacs && elisp-site-regen |
246 |
elog |
247 |
elog "If you need a symlink to one of Erlang's binaries," |
248 |
elog "please open a bug on http://bugs.gentoo.org/" |
249 |
elog |
250 |
elog "Gentoo's versioning scheme differs from the author's, so please refer to this version as ${MY_PV}" |
251 |
elog |
252 |
} |
253 |
|
254 |
pkg_postrm() { |
255 |
use emacs && elisp-site-regen |
256 |
} |