1 |
aballier 08/06/16 19:54:28 |
2 |
|
3 |
Modified: mldonkey-2.9.5.ebuild ChangeLog |
4 |
Log: |
5 |
dont try to use PIE with ocaml executables, this will not work as ocaml does not create PIC objects. Bug #219282 |
6 |
(Portage version: 2.1.5.5) |
7 |
|
8 |
Revision Changes Path |
9 |
1.2 net-p2p/mldonkey/mldonkey-2.9.5.ebuild |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/mldonkey/mldonkey-2.9.5.ebuild?rev=1.2&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/mldonkey/mldonkey-2.9.5.ebuild?rev=1.2&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/mldonkey/mldonkey-2.9.5.ebuild?r1=1.1&r2=1.2 |
14 |
|
15 |
Index: mldonkey-2.9.5.ebuild |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-2.9.5.ebuild,v |
18 |
retrieving revision 1.1 |
19 |
retrieving revision 1.2 |
20 |
diff -u -r1.1 -r1.2 |
21 |
--- mldonkey-2.9.5.ebuild 5 May 2008 10:16:15 -0000 1.1 |
22 |
+++ mldonkey-2.9.5.ebuild 16 Jun 2008 19:54:27 -0000 1.2 |
23 |
@@ -1,10 +1,10 @@ |
24 |
# Copyright 1999-2008 Gentoo Foundation |
25 |
# Distributed under the terms of the GNU General Public License v2 |
26 |
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-2.9.5.ebuild,v 1.1 2008/05/05 10:16:15 armin76 Exp $ |
27 |
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-2.9.5.ebuild,v 1.2 2008/06/16 19:54:27 aballier Exp $ |
28 |
|
29 |
WANT_AUTOCONF=2.5 |
30 |
|
31 |
-inherit flag-o-matic eutils autotools |
32 |
+inherit flag-o-matic eutils autotools toolchain-funcs |
33 |
|
34 |
EAPI="1" |
35 |
|
36 |
@@ -60,6 +60,14 @@ |
37 |
eerror "You need to install dev-lang/ocaml with ocamlopt useflag on." |
38 |
die "Please install ocaml with ocamlopt useflag" |
39 |
fi |
40 |
+ # dev-lang/ocaml creates its own objects but calls gcc for linking, which will |
41 |
+ # results in relocations if gcc wants to create a PIE executable |
42 |
+ if gcc-specs-pie ; then |
43 |
+ append-ldflags -nopie |
44 |
+ ewarn "Ocaml generates its own native asm, you're using a PIE compiler" |
45 |
+ ewarn "We have appended -nopie to ocaml build options" |
46 |
+ ewarn "because linking an executable with pie while the objects are not pic will not work" |
47 |
+ fi |
48 |
} |
49 |
|
50 |
src_unpack() { |
51 |
|
52 |
|
53 |
|
54 |
1.212 net-p2p/mldonkey/ChangeLog |
55 |
|
56 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/mldonkey/ChangeLog?rev=1.212&view=markup |
57 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/mldonkey/ChangeLog?rev=1.212&content-type=text/plain |
58 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/mldonkey/ChangeLog?r1=1.211&r2=1.212 |
59 |
|
60 |
Index: ChangeLog |
61 |
=================================================================== |
62 |
RCS file: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/ChangeLog,v |
63 |
retrieving revision 1.211 |
64 |
retrieving revision 1.212 |
65 |
diff -u -r1.211 -r1.212 |
66 |
--- ChangeLog 5 May 2008 11:31:08 -0000 1.211 |
67 |
+++ ChangeLog 16 Jun 2008 19:54:27 -0000 1.212 |
68 |
@@ -1,6 +1,10 @@ |
69 |
# ChangeLog for net-p2p/mldonkey |
70 |
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 |
71 |
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/ChangeLog,v 1.211 2008/05/05 11:31:08 rbu Exp $ |
72 |
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/ChangeLog,v 1.212 2008/06/16 19:54:27 aballier Exp $ |
73 |
+ |
74 |
+ 16 Jun 2008; Alexis Ballier <aballier@g.o> mldonkey-2.9.5.ebuild: |
75 |
+ dont try to use PIE with ocaml executables, this will not work as ocaml |
76 |
+ does not create PIC objects. Bug #219282 |
77 |
|
78 |
05 May 2008; Robert Buchholz <rbu@g.o> mldonkey-2.9.4.ebuild: |
79 |
amd64 stable (bug #219146) |
80 |
|
81 |
|
82 |
|
83 |
-- |
84 |
gentoo-commits@l.g.o mailing list |