| 1 |
vapier 09/06/22 13:39:06 |
| 2 |
|
| 3 |
Modified: ntp-4.2.4_p7.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Disable md5/elf with autoconf cache vars now rather than sed #274266 by Fabio Erculiani. |
| 6 |
(Portage version: 2.2_rc33/cvs/Linux x86_64, RepoMan options: --force) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.8 net-misc/ntp/ntp-4.2.4_p7.ebuild |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/ntp/ntp-4.2.4_p7.ebuild?rev=1.8&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/ntp/ntp-4.2.4_p7.ebuild?rev=1.8&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/ntp/ntp-4.2.4_p7.ebuild?r1=1.7&r2=1.8 |
| 14 |
|
| 15 |
Index: ntp-4.2.4_p7.ebuild |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/ntp/ntp-4.2.4_p7.ebuild,v |
| 18 |
retrieving revision 1.7 |
| 19 |
retrieving revision 1.8 |
| 20 |
diff -u -r1.7 -r1.8 |
| 21 |
--- ntp-4.2.4_p7.ebuild 20 Jun 2009 12:04:22 -0000 1.7 |
| 22 |
+++ ntp-4.2.4_p7.ebuild 22 Jun 2009 13:39:06 -0000 1.8 |
| 23 |
@@ -1,6 +1,6 @@ |
| 24 |
# Copyright 1999-2009 Gentoo Foundation |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ntp-4.2.4_p7.ebuild,v 1.7 2009/06/20 12:04:22 vapier Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ntp-4.2.4_p7.ebuild,v 1.8 2009/06/22 13:39:06 vapier Exp $ |
| 28 |
|
| 29 |
inherit eutils toolchain-funcs flag-o-matic |
| 30 |
|
| 31 |
@@ -28,16 +28,6 @@ |
| 32 |
|
| 33 |
S=${WORKDIR}/${MY_P} |
| 34 |
|
| 35 |
-hax_bitkeeper() { |
| 36 |
- # the makefiles have support for bk ... |
| 37 |
- # basically we have to do this or bk will try to write |
| 38 |
- # to files in /opt/bitkeeper causing sandbox violations ;( |
| 39 |
- mkdir -p "${T}"/fakebin |
| 40 |
- echo "#!/bin/sh"$'\n'"exit 1" > "${T}"/fakebin/bk |
| 41 |
- chmod a+x "${T}"/fakebin/bk |
| 42 |
- export PATH="${T}/fakebin:${PATH}" |
| 43 |
-} |
| 44 |
- |
| 45 |
pkg_setup() { |
| 46 |
enewgroup ntp 123 |
| 47 |
enewuser ntp 123 -1 /dev/null ntp |
| 48 |
@@ -57,16 +47,12 @@ |
| 49 |
epatch "${FILESDIR}"/${PN}-4.2.4_p5-adjtimex.patch #254030 |
| 50 |
epatch "${FILESDIR}"/${PN}-4.2.4_p7-nano.patch #270483 |
| 51 |
append-cppflags -D_GNU_SOURCE #264109 |
| 52 |
- |
| 53 |
- sed -i \ |
| 54 |
- -e 's:md5\.h:touch_not_my_md5:g' \ |
| 55 |
- -e 's:-lelf:-la_doe_a_deer_a_female_deer:g' \ |
| 56 |
- -e 's:-lmd5:-li_dont_want_no_stinkin_md5:g' \ |
| 57 |
- configure || die "sed failed" |
| 58 |
} |
| 59 |
|
| 60 |
src_compile() { |
| 61 |
- hax_bitkeeper |
| 62 |
+ # avoid libmd5/libelf |
| 63 |
+ export ac_cv_search_MD5Init=no ac_cv_header_md_5=no |
| 64 |
+ export ac_cv_lib_elf_nlist=no |
| 65 |
# blah, no real configure options #176333 |
| 66 |
export ac_cv_header_dns_sd_h=$(use zeroconf && echo yes || echo no) |
| 67 |
export ac_cv_lib_dns_sd_DNSServiceRegister=${ac_cv_header_dns_sd_h} |
| 68 |
@@ -81,7 +67,6 @@ |
| 69 |
} |
| 70 |
|
| 71 |
src_install() { |
| 72 |
- hax_bitkeeper |
| 73 |
emake install DESTDIR="${D}" || die "install failed" |
| 74 |
# move ntpd/ntpdate to sbin #66671 |
| 75 |
dodir /usr/sbin |
| 76 |
|
| 77 |
|
| 78 |
|
| 79 |
1.149 net-misc/ntp/ChangeLog |
| 80 |
|
| 81 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/ntp/ChangeLog?rev=1.149&view=markup |
| 82 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/ntp/ChangeLog?rev=1.149&content-type=text/plain |
| 83 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/ntp/ChangeLog?r1=1.148&r2=1.149 |
| 84 |
|
| 85 |
Index: ChangeLog |
| 86 |
=================================================================== |
| 87 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/ntp/ChangeLog,v |
| 88 |
retrieving revision 1.148 |
| 89 |
retrieving revision 1.149 |
| 90 |
diff -u -r1.148 -r1.149 |
| 91 |
--- ChangeLog 20 Jun 2009 23:12:04 -0000 1.148 |
| 92 |
+++ ChangeLog 22 Jun 2009 13:39:06 -0000 1.149 |
| 93 |
@@ -1,6 +1,10 @@ |
| 94 |
# ChangeLog for net-misc/ntp |
| 95 |
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
| 96 |
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ChangeLog,v 1.148 2009/06/20 23:12:04 robbat2 Exp $ |
| 97 |
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ChangeLog,v 1.149 2009/06/22 13:39:06 vapier Exp $ |
| 98 |
+ |
| 99 |
+ 22 Jun 2009; Mike Frysinger <vapier@g.o> ntp-4.2.4_p7.ebuild: |
| 100 |
+ Disable md5/elf with autoconf cache vars now rather than sed #274266 by |
| 101 |
+ Fabio Erculiani. |
| 102 |
|
| 103 |
20 Jun 2009; Robin H. Johnson <robbat2@g.o> +ntp-4.2.4_p6.ebuild: |
| 104 |
Re-add _p6 until bug 274863 is resolved, but add the MOD_NANO patch so it |
Archives