SPECS: gnu-efi.spec - fixed build on x86_64 - use ARCH= to overrid...

[qboosh]

Author: qboosh                       Date: Fri Nov 30 16:32:05 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fixed build on x86_64
- use ARCH= to override uname (to allow building i686 package on x86_64 host)

---- Files affected:
SPECS:
   gnu-efi.spec (1.9 -> 1.10) 

---- Diffs:

================================================================
Index: SPECS/gnu-efi.spec
diff -u SPECS/gnu-efi.spec:1.9 SPECS/gnu-efi.spec:1.10
--- SPECS/gnu-efi.spec:1.9	Fri Nov 30 00:03:08 2007
+++ SPECS/gnu-efi.spec	Fri Nov 30 17:32:00 2007
@@ -32,9 +32,16 @@
 %setup -q
 
 %build
-%{__make} \
+%ifarch %{x8664}
+WRAP="-DEFI_FUNCTION_WRAPPER"
+%else
+WRAP=
+%endif
+%{__make} -j1 \
+	ARCH="%{_target_base_arch}" \
 	CC="%{__cc}" \
-	CFLAGS="%{rpmcflags} -fpic -Wall -fshort-wchar"
+	CFLAGS="%{rpmcflags} -fpic -Wall -fshort-wchar $WRAP" \
+	OBJCOPY=objcopy
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -42,6 +49,10 @@
 %{__make} install \
 	INSTALLROOT=$RPM_BUILD_ROOT%{_prefix}
 
+%if "%{_lib}" != "lib"
+	mv -f $RPM_BUILD_ROOT%{_prefix}/{lib,%{_lib}}
+%endif
+
 install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 cp -a apps/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
@@ -51,7 +62,8 @@
 %files
 %defattr(644,root,root,755)
 %doc ChangeLog README.*
-%{_libdir}/lib*efi.a
+%{_libdir}/libefi.a
+%{_libdir}/libgnuefi.a
 %{_libdir}/crt0-efi-*.o
 %{_libdir}/elf_*_efi.lds
 %{_includedir}/efi
@@ -63,6 +75,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.10  2007-11-30 16:32:00  qboosh
+- fixed build on x86_64
+- use ARCH= to override uname (to allow building i686 package on x86_64 host)
+
 Revision 1.9  2007-11-29 23:03:08  qboosh
 - binutils epoch
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/gnu-efi.spec?r1=1.9&r2=1.10&f=u