1 |
flameeyes 11/08/29 21:08:27 |
2 |
|
3 |
Modified: ChangeLog dhcp-4.2.2-r1.ebuild |
4 |
Log: |
5 |
Make sure the bind sub-build doesn't find libcap or it can rely on it for the build process (disrupting cross-compilation). Also make the vim syntax package a runtime dependency only, not a build-time one. |
6 |
|
7 |
(Portage version: 2.2.0_alpha51/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.185 net-misc/dhcp/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/dhcp/ChangeLog?rev=1.185&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/dhcp/ChangeLog?rev=1.185&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/dhcp/ChangeLog?r1=1.184&r2=1.185 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v |
19 |
retrieving revision 1.184 |
20 |
retrieving revision 1.185 |
21 |
diff -u -r1.184 -r1.185 |
22 |
--- ChangeLog 27 Aug 2011 15:41:50 -0000 1.184 |
23 |
+++ ChangeLog 29 Aug 2011 21:08:27 -0000 1.185 |
24 |
@@ -1,6 +1,11 @@ |
25 |
# ChangeLog for net-misc/dhcp |
26 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v 1.184 2011/08/27 15:41:50 vapier Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v 1.185 2011/08/29 21:08:27 flameeyes Exp $ |
29 |
+ |
30 |
+ 29 Aug 2011; Diego E. Pettenò <flameeyes@g.o> dhcp-4.2.2-r1.ebuild: |
31 |
+ Make sure the bind sub-build doesn't find libcap or it can rely on it for the |
32 |
+ build process (disrupting cross-compilation). Also make the vim syntax |
33 |
+ package a runtime dependency only, not a build-time one. |
34 |
|
35 |
*dhcp-4.2.2-r1 (27 Aug 2011) |
36 |
|
37 |
|
38 |
|
39 |
|
40 |
1.2 net-misc/dhcp/dhcp-4.2.2-r1.ebuild |
41 |
|
42 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/dhcp/dhcp-4.2.2-r1.ebuild?rev=1.2&view=markup |
43 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/dhcp/dhcp-4.2.2-r1.ebuild?rev=1.2&content-type=text/plain |
44 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/dhcp/dhcp-4.2.2-r1.ebuild?r1=1.1&r2=1.2 |
45 |
|
46 |
Index: dhcp-4.2.2-r1.ebuild |
47 |
=================================================================== |
48 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-4.2.2-r1.ebuild,v |
49 |
retrieving revision 1.1 |
50 |
retrieving revision 1.2 |
51 |
diff -u -r1.1 -r1.2 |
52 |
--- dhcp-4.2.2-r1.ebuild 27 Aug 2011 15:41:50 -0000 1.1 |
53 |
+++ dhcp-4.2.2-r1.ebuild 29 Aug 2011 21:08:27 -0000 1.2 |
54 |
@@ -1,6 +1,6 @@ |
55 |
# Copyright 1999-2011 Gentoo Foundation |
56 |
# Distributed under the terms of the GNU General Public License v2 |
57 |
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-4.2.2-r1.ebuild,v 1.1 2011/08/27 15:41:50 vapier Exp $ |
58 |
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-4.2.2-r1.ebuild,v 1.2 2011/08/29 21:08:27 flameeyes Exp $ |
59 |
|
60 |
EAPI="2" |
61 |
|
62 |
@@ -22,12 +22,12 @@ |
63 |
|
64 |
DEPEND="selinux? ( sec-policy/selinux-dhcp ) |
65 |
kernel_linux? ( sys-apps/net-tools ) |
66 |
- vim-syntax? ( app-vim/dhcpd-syntax ) |
67 |
ldap? ( |
68 |
net-nds/openldap |
69 |
ssl? ( dev-libs/openssl ) |
70 |
)" |
71 |
-RDEPEND="${DEPEND}" |
72 |
+RDEPEND="${DEPEND} |
73 |
+ vim-syntax? ( app-vim/dhcpd-syntax )" |
74 |
|
75 |
S="${WORKDIR}/${MY_P}" |
76 |
|
77 |
@@ -121,6 +121,11 @@ |
78 |
tc-export AR BUILD_CC |
79 |
export ac_cv_path_AR=${AR} |
80 |
|
81 |
+ # this is tested for by the bind build system, and can cause trouble |
82 |
+ # when cross-building; since dhcp itself doesn't make use of libcap, |
83 |
+ # simply disable it. |
84 |
+ export ac_cv_lib_cap_cap_set_proc=no |
85 |
+ |
86 |
# Use FHS sane paths ... some of these have configure options, |
87 |
# but not all, so just do it all here. |
88 |
local e="/etc/dhcp" r="/var/run/dhcp" l="/var/lib/dhcp" |