- added LDFLAGS patch

- make options reorganized a little

Changed files:
    iproute2.spec -> 1.155

diff --git a/iproute2.spec b/iproute2.spec
index 69f2731c668fbb7d87bc8e840481bab7c1343012..da769cdb5605c554873469e54f4f05f9c14b9450 100644 (file)
--- a/iproute2.spec
+++ b/iproute2.spec
@@ -27,6 +27,7 @@ Patch1:               %{name}-arp.patch
 Patch2:                %{name}-lex.patch
 Patch3:                %{name}-iptables.patch
 Patch4:                %{name}-iptables64.patch
+Patch5:                %{name}-LDFLAGS.patch
 # extensions
 Patch10:       %{name}-2.2.4-wrr.patch
 Patch11:       esfq-%{name}.patch
@@ -99,14 +100,22 @@ rm -rf include-glibc include/linux
 %else
 %patch3 -p1
 %endif
+%patch5 -p1
 %patch10 -p1
 %patch11 -p1
 
 %build
 %{__make} \
-       %{?with_uClibc:CC="%{_target_cpu}-uclibc-gcc"}%{!?with_uClibc:CC="%{__cc}"} \
+%if %{with uClibc}
+       CC="%{_target_cpu}-uclibc-gcc" \
+       LD="%{_target_cpu}-uclibc-gcc" \
+%else
+       CC="%{__cc}" \
+       LD="%{__cc}" \
+%endif
        OPT="%{rpmcflags}" \
-       %{!?with_tc:SUBDIRS="lib ip misc" LDFLAGS="%{rpmldflags}"}
+       LDFLAGS="%{rpmldflags}" \
+       %{!?with_tc:SUBDIRS="lib ip misc"}
 
 %{?with_doc:%{__make} -C doc}