SPECS: iproute2.spec - added LDFLAGS patch - make options reorgani...

[sparky]

Author: sparky                       Date: Fri Aug  4 01:36:48 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- added LDFLAGS patch
- make options reorganized a little

---- Files affected:
SPECS:
   iproute2.spec (1.154 -> 1.155) 

---- Diffs:

================================================================
Index: SPECS/iproute2.spec
diff -u SPECS/iproute2.spec:1.154 SPECS/iproute2.spec:1.155
--- SPECS/iproute2.spec:1.154	Sat Apr 22 23:41:30 2006
+++ SPECS/iproute2.spec	Fri Aug  4 03:36:43 2006
@@ -28,6 +28,7 @@
 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
@@ -100,14 +101,22 @@
 %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}
 
@@ -152,6 +161,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.155  2006/08/04 01:36:43  sparky
+- added LDFLAGS patch
+- make options reorganized a little
+
 Revision 1.154  2006/04/22 21:41:30  arekm
 - up to 2.6.16
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/iproute2.spec?r1=1.154&r2=1.155&f=u