packages: hostapd/hostapd.spec - rpmcflags and rpmldflags - fixed nt_passwo...

[sparky]

Author: sparky                       Date: Tue Nov 24 12:45:16 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rpmcflags and rpmldflags
- fixed nt_password_hash build

---- Files affected:
packages/hostapd:
   hostapd.spec (1.27 -> 1.28) 

---- Diffs:

================================================================
Index: packages/hostapd/hostapd.spec
diff -u packages/hostapd/hostapd.spec:1.27 packages/hostapd/hostapd.spec:1.28
--- packages/hostapd/hostapd.spec:1.27	Tue Nov 24 09:50:30 2009
+++ packages/hostapd/hostapd.spec	Tue Nov 24 13:45:11 2009
@@ -19,6 +19,7 @@
 BuildRequires:	madwifi-ng-devel
 BuildRequires:	openssl-devel
 BuildRequires:	rpmbuild(macros) >= 1.268
+BuildRequires:	sed >= 4.0
 Requires(post,preun):	/sbin/chkconfig
 Requires:	rc-scripts
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -60,21 +61,16 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%{__sed} '/CFLAGS =/{s/-g//; s/-O2/$(OPTCFLAGS)/}' -i hostapd/Makefile
+%{__sed} '/NOBJS =/s at ../src/crypto/rc4.o at ../src/utils/wpabuf.o ../src/utils/wpa_debug.o@' -i hostapd/Makefile
 
 %build
 %{__make} -C hostapd \
+	all nt_password_hash hlr_auc_gw \
+	V=1 \
 	CC="%{__cc}" \
-	OPT="%{rpmcflags}"
-
-%{__make} -C hostapd \
-	nt_password_hash \
-	CC="%{__cc}" \
-	OPT="%{rpmcflags}"
-
-%{__make} -C hostapd \
-	hlr_auc_gw \
-	CC="%{__cc}" 
-	OPT="%{rpmcflags}"
+	OPTCFLAGS="%{rpmcflags}" \
+	LDFLAGS="%{rpmcflags} %{rpmldflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -120,6 +116,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.28  2009/11/24 12:45:11  sparky
+- rpmcflags and rpmldflags
+- fixed nt_password_hash build
+
 Revision 1.27  2009/11/24 08:50:30  glen
 - up to 0.7.0
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/hostapd/hostapd.spec?r1=1.27&r2=1.28&f=u