From: klakier <klakier@pld-linux.org>
Date: Sun, 15 Apr 2001 13:08:57 +0000 (+0000)
Subject: - now it links against uClibc!
X-Git-Tag: iproute2-2_2_4_ss001007-3~2
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fiproute2.git;a=commitdiff_plain;h=6ebd56ce13d508f54c4ccb306ea046196ef6b845

- now it links against uClibc!
- combined several patches into one uClibc.patch

Changed files:
    iproute2.spec -> 1.35
---

diff --git a/iproute2.spec b/iproute2.spec
index de8256b..74d2917 100644
--- a/iproute2.spec
+++ b/iproute2.spec
@@ -12,8 +12,7 @@ Group(pl):	Sieciowe/Administracyjne
 Source0:	ftp://ftp.inr.ac.ru/ip-routing/%{name}-%{mainver}-now-%{snapshot}.tar.gz
 Patch0:		%{name}-make.patch
 Patch1:		%{name}-ll_types.patch
-Patch2:		%{name}-rt_names_h.patch
-Patch3:		%{name}-utils_c.patch
+%{?BOOT:Patch2:		%{name}-uClibc.patch}
 BuildRequires:	tetex-dvips
 BuildRequires:	tetex-latex
 BuildRequires:	psutils
@@ -49,20 +48,25 @@ Group:		Networking/Admin
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 %build
 
 %if %{?BOOT:1}%{!?BOOT:0}
-#%{__make} \
-#	OPT="-Os" GLIBCFIX="" \
-#	KERNEL_INCLUDE="/usr/lib/bootdisk%{_includedir}" \
-#	LDFLAGS="-nostdlib -s" 	ADDLIB="inet_ntop.o inet_pton.o" \
-#	LDLIBS="%{_libdir}/bootdisk%{_libdir}/crt0.o %{_libdir}/bootdisk%{_libdir}/libc.a -lgcc"
+%{__make} \
+	OPT="-Os" GLIBCFIX="" \
+	KERNEL_INCLUDE="/usr/lib/bootdisk%{_includedir}" \
+	LDFLAGS="-nostdlib -static -s" \
+	LDLIBS="%{_libdir}/bootdisk%{_libdir}/crt0.o %{_libdir}/bootdisk%{_libdir}/libc.a -lgcc" \
+	ADDLIB="inet_ntop.o inet_pton.o dnet_ntop.o dnet_pton.o ipx_ntop.o ipx_pton.o" \
+	SUBDIRS="lib ip"
+
+	LDLIBS="/usr/lib/libresolv.a %{_libdir}/bootdisk%{_libdir}/crt0.o %{_libdir}/bootdisk%{_libdir}/libc.a -lgcc" \
 
 # there are some problems compiling with uClibc, falling back to simple glibc-static
 %{__make} SUBDIRS="lib ip" OPT="-Os" LDFLAGS="-static -s" 
 mv -f ip/ip ip-BOOT
+mv -f ip/rtacct rtacct-BOOT
+mv -f ip/rtmon rtmon-BOOT
 %{__make} clean
 %endif
 
@@ -75,6 +79,7 @@ mv -f ip/ip ip-BOOT
 rm -rf $RPM_BUILD_ROOT
 %if %{?BOOT:1}%{!?BOOT:0}
 install -d $RPM_BUILD_ROOT%{_libdir}/bootdisk/sbin
+# we need only 'ip' on bootdisk (don't we??)
 install -s ip-BOOT $RPM_BUILD_ROOT%{_libdir}/bootdisk/sbin/ip
 %endif