| 1 |
cardoe 08/09/09 14:35:09 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: iproute2-2.6.26-r2.ebuild |
| 5 |
Log: |
| 6 |
multilib and ldflags respecting changes from Olivier Huber <oli.huber@×××××.com> bug #236861 |
| 7 |
(Portage version: 2.2_rc8/cvs/Linux 2.6.25-gentoo-r8 x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.112 sys-apps/iproute2/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/iproute2/ChangeLog?rev=1.112&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/iproute2/ChangeLog?rev=1.112&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/iproute2/ChangeLog?r1=1.111&r2=1.112 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/iproute2/ChangeLog,v |
| 19 |
retrieving revision 1.111 |
| 20 |
retrieving revision 1.112 |
| 21 |
diff -u -r1.111 -r1.112 |
| 22 |
--- ChangeLog 20 Aug 2008 06:31:55 -0000 1.111 |
| 23 |
+++ ChangeLog 9 Sep 2008 14:35:09 -0000 1.112 |
| 24 |
@@ -1,6 +1,13 @@ |
| 25 |
# ChangeLog for sys-apps/iproute2 |
| 26 |
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/ChangeLog,v 1.111 2008/08/20 06:31:55 vapier Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/ChangeLog,v 1.112 2008/09/09 14:35:09 cardoe Exp $ |
| 29 |
+ |
| 30 |
+*iproute2-2.6.26-r2 (09 Sep 2008) |
| 31 |
+ |
| 32 |
+ 09 Sep 2008; Doug Goldstein <cardoe@g.o> |
| 33 |
+ +files/iproute2-2.6.26-ldflags.patch, +iproute2-2.6.26-r2.ebuild: |
| 34 |
+ multilib and ldflags respecting changes from Olivier Huber |
| 35 |
+ <oli.huber@×××××.com> bug #236861 |
| 36 |
|
| 37 |
*iproute2-2.6.26-r1 (20 Aug 2008) |
| 38 |
|
| 39 |
|
| 40 |
|
| 41 |
|
| 42 |
1.1 sys-apps/iproute2/iproute2-2.6.26-r2.ebuild |
| 43 |
|
| 44 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/iproute2/iproute2-2.6.26-r2.ebuild?rev=1.1&view=markup |
| 45 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/iproute2/iproute2-2.6.26-r2.ebuild?rev=1.1&content-type=text/plain |
| 46 |
|
| 47 |
Index: iproute2-2.6.26-r2.ebuild |
| 48 |
=================================================================== |
| 49 |
# Copyright 1999-2008 Gentoo Foundation |
| 50 |
# Distributed under the terms of the GNU General Public License v2 |
| 51 |
# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-2.6.26-r2.ebuild,v 1.1 2008/09/09 14:35:09 cardoe Exp $ |
| 52 |
|
| 53 |
inherit eutils toolchain-funcs |
| 54 |
|
| 55 |
if [[ ${PV} == *.*.*.* ]] ; then |
| 56 |
MY_PV=${PV%.*} |
| 57 |
else |
| 58 |
MY_PV=${PV} |
| 59 |
fi |
| 60 |
MY_P="${PN}-${MY_PV}" |
| 61 |
DESCRIPTION="kernel routing and traffic control utilities" |
| 62 |
HOMEPAGE="http://linux-net.osdl.org/index.php/Iproute2" |
| 63 |
SRC_URI="http://developer.osdl.org/dev/iproute2/download/${MY_P}.tar.bz2" |
| 64 |
|
| 65 |
LICENSE="GPL-2" |
| 66 |
SLOT="0" |
| 67 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" |
| 68 |
IUSE="atm berkdb minimal" |
| 69 |
|
| 70 |
RDEPEND="!minimal? ( berkdb? ( sys-libs/db ) ) |
| 71 |
atm? ( net-dialup/linux-atm )" |
| 72 |
DEPEND="${RDEPEND} |
| 73 |
elibc_glibc? ( >=sys-libs/glibc-2.7 ) |
| 74 |
>=virtual/os-headers-2.6.25" |
| 75 |
|
| 76 |
S=${WORKDIR}/${MY_P} |
| 77 |
|
| 78 |
src_unpack() { |
| 79 |
unpack ${A} |
| 80 |
cd "${S}" |
| 81 |
sed -i "s:-O2:${CFLAGS} ${CPPFLAGS}:" Makefile || die "sed Makefile failed" |
| 82 |
|
| 83 |
# build against system headers |
| 84 |
rm -r include/linux include/netinet #include/ip{,6}tables{,_common}.h include/libiptc |
| 85 |
|
| 86 |
# fix LDFLAGS usage bug #236861 |
| 87 |
epatch "${FILESDIR}"/${PN}-2.6.26-ldflags.patch |
| 88 |
|
| 89 |
local check base=${PORTAGE_CONFIGROOT}/etc/portage/patches |
| 90 |
for check in {${CATEGORY}/${PF},${CATEGORY}/${P},${CATEGORY}/${PN}}; do |
| 91 |
EPATCH_SOURCE=${base}/${CTARGET}/${check} |
| 92 |
[[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${CHOST}/${check} |
| 93 |
[[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${check} |
| 94 |
if [[ -d ${EPATCH_SOURCE} ]] ; then |
| 95 |
EPATCH_SUFFIX="patch" |
| 96 |
EPATCH_FORCE="yes" \ |
| 97 |
EPATCH_MULTI_MSG="Applying user patches from ${EPATCH_SOURCE} ..." \ |
| 98 |
epatch |
| 99 |
break |
| 100 |
fi |
| 101 |
done |
| 102 |
|
| 103 |
# don't build arpd if USE=-berkdb #81660 |
| 104 |
use berkdb || sed -i '/^TARGETS=/s: arpd : :' misc/Makefile |
| 105 |
# Multilib fixes |
| 106 |
sed -i 's:/usr/local:/usr:' tc/m_ipt.c include/iptables.h |
| 107 |
sed -i "s:/usr/lib:/usr/$(get_libdir):g" \ |
| 108 |
netem/Makefile tc/{Makefile,tc.c,q_netem.c,m_ipt.c} include/iptables.h || die |
| 109 |
sed -i "s:/lib/tc:$(get_libdir)/tc:g" tc/Makefile || die |
| 110 |
# Use correct iptables dir, #144265. |
| 111 |
sed -i "s:/usr/local/lib/iptables:/$(get_libdir)/iptables:g" \ |
| 112 |
include/iptables.h |
| 113 |
} |
| 114 |
|
| 115 |
src_compile() { |
| 116 |
echo -n 'TC_CONFIG_ATM:=' > Config |
| 117 |
use atm \ |
| 118 |
&& echo 'y' >> Config \ |
| 119 |
|| echo 'n' >> Config |
| 120 |
|
| 121 |
use minimal && sed -i -e '/^SUBDIRS=/s:=.*:=lib tc:' Makefile |
| 122 |
emake \ |
| 123 |
CC="$(tc-getCC)" \ |
| 124 |
AR="$(tc-getAR)" \ |
| 125 |
|| die "make" |
| 126 |
} |
| 127 |
|
| 128 |
src_install() { |
| 129 |
if use minimal ; then |
| 130 |
into / |
| 131 |
dosbin tc/tc || die "minimal" |
| 132 |
return 0 |
| 133 |
fi |
| 134 |
|
| 135 |
emake \ |
| 136 |
DESTDIR="${D}" \ |
| 137 |
SBINDIR=/sbin \ |
| 138 |
DOCDIR=/usr/share/doc/${PF} \ |
| 139 |
MANDIR=/usr/share/man \ |
| 140 |
install \ |
| 141 |
|| die "make install failed" |
| 142 |
if use berkdb ; then |
| 143 |
dodir /var/lib/arpd |
| 144 |
# bug 47482, arpd doesn't need to be in /sbin |
| 145 |
dodir /usr/sbin |
| 146 |
mv "${D}"/sbin/arpd "${D}"/usr/sbin/ |
| 147 |
fi |
| 148 |
} |
Archives