Gentoo Archives: gentoo-commits

From: "Christian Faulhammer (opfer)" <opfer@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-lang/erlang: ChangeLog erlang-12.2.2.ebuild
Date: Tue, 29 Apr 2008 00:06:14
Message-Id: E1JqdMC-0002rd-U6@stork.gentoo.org
1 opfer 08/04/29 00:06:04
2
3 Modified: ChangeLog erlang-12.2.2.ebuild
4 Log:
5 make building with --as-needed possible, patch provided by pva in bug 203157
6 (Portage version: 2.1.4.4)
7
8 Revision Changes Path
9 1.112 dev-lang/erlang/ChangeLog
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/erlang/ChangeLog?rev=1.112&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/erlang/ChangeLog?rev=1.112&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/erlang/ChangeLog?r1=1.111&r2=1.112
14
15 Index: ChangeLog
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/dev-lang/erlang/ChangeLog,v
18 retrieving revision 1.111
19 retrieving revision 1.112
20 diff -u -r1.111 -r1.112
21 --- ChangeLog 28 Apr 2008 23:03:28 -0000 1.111
22 +++ ChangeLog 29 Apr 2008 00:06:04 -0000 1.112
23 @@ -1,6 +1,10 @@
24 # ChangeLog for dev-lang/erlang
25 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
26 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/ChangeLog,v 1.111 2008/04/28 23:03:28 opfer Exp $
27 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/ChangeLog,v 1.112 2008/04/29 00:06:04 opfer Exp $
28 +
29 + 29 Apr 2008; Christian Faulhammer <opfer@g.o>
30 + +files/erlang-12.2.2-as-needed.patch, erlang-12.2.2.ebuild:
31 + make building with --as-needed possible, patch provided by pva in bug 203157
32
33 28 Apr 2008; Christian Faulhammer <opfer@g.o> erlang-12.2.2.ebuild:
34 use variable instead of fixed string so I won't continually forget to adjust
35
36
37
38 1.3 dev-lang/erlang/erlang-12.2.2.ebuild
39
40 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/erlang/erlang-12.2.2.ebuild?rev=1.3&view=markup
41 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/erlang/erlang-12.2.2.ebuild?rev=1.3&content-type=text/plain
42 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/erlang/erlang-12.2.2.ebuild?r1=1.2&r2=1.3
43
44 Index: erlang-12.2.2.ebuild
45 ===================================================================
46 RCS file: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-12.2.2.ebuild,v
47 retrieving revision 1.2
48 retrieving revision 1.3
49 diff -u -r1.2 -r1.3
50 --- erlang-12.2.2.ebuild 28 Apr 2008 23:03:28 -0000 1.2
51 +++ erlang-12.2.2.ebuild 29 Apr 2008 00:06:04 -0000 1.3
52 @@ -1,6 +1,6 @@
53 # Copyright 1999-2008 Gentoo Foundation
54 # Distributed under the terms of the GNU General Public License v2
55 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-12.2.2.ebuild,v 1.2 2008/04/28 23:03:28 opfer Exp $
56 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-12.2.2.ebuild,v 1.3 2008/04/29 00:06:04 opfer Exp $
57
58 inherit elisp-common eutils flag-o-matic multilib versionator
59
60 @@ -40,21 +40,15 @@
61
62 SITEFILE=50erlang-gentoo.el
63
64 -pkg_setup() {
65 - if use ssl; then
66 - if is-ldflag --as-needed || is-flag --as-needed; then
67 - eerror "Don't use --as-needed in your LDFLAGS or CFLAGS for SSL support, this will fail."
68 - die
69 - fi
70 - fi
71 -}
72 -
73 src_unpack() {
74 unpack ${A}
75 cd "${S}"
76
77 use odbc || sed -i 's: odbc : :' lib/Makefile
78
79 + # fix builds with --as-needed LDFLAGS, bug 203157
80 + epatch "${FILESDIR}"/${P}-as-needed.patch
81 +
82 # make sure we only link ssl dynamically
83 # will not be integrated by upstream for various reasons
84 sed -i '/SSL_DYNAMIC_ONLY=/s:no:yes:' erts/configure #184419
85
86
87
88 --
89 gentoo-commits@l.g.o mailing list