[packages/grub2] Dropped the target_cpu macro (not needed here)

jajcus jajcus at pld-linux.org
Sun Oct 28 10:54:22 CET 2012


commit fc490c3e35c830c54e022d039f976b739946d5f4
Author: Jacek Konieczny <jajcus at jajcus.net>
Date:   Sun Oct 28 09:54:37 2012 +0100

    Dropped the target_cpu macro (not needed here)

 grub2.spec | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)
---
diff --git a/grub2.spec b/grub2.spec
index c95bce7..5d7f6b2 100644
--- a/grub2.spec
+++ b/grub2.spec
@@ -34,13 +34,6 @@
 %undefine	with_efiemu
 %endif
 
-%ifarch %{ix86}
-%define		target_cpu i386
-%endif
-%ifarch %{x8664}
-%define		target_cpu x86_64
-%endif
-
 # the 'most natural' platform should go last
 %define		platforms %{?with_efi:efi} %{?with_pc:pc}
 
@@ -273,8 +266,8 @@ echo timestamp > stamp-h.in
 export CFLAGS="%{rpmcflags} -Os %{?debug:-g}"
 
 for platform in %{platforms} ; do
-	install -d build-%{target_cpu}-${platform}
-	cd build-%{target_cpu}-${platform}
+	install -d build-${platform}
+	cd build-${platform}
 
 	if [ "$platform" != "efi" ] ; then
 		platform_opts="--%{!?with_efiemu:dis}%{?with_efiemu:en}able-efiemu"
@@ -304,7 +297,7 @@ done
 rm -rf $RPM_BUILD_ROOT
 
 for platform in %{platforms} ; do
-	cd build-%{target_cpu}-${platform}
+	cd build-${platform}
 	%{__make} install \
 		pkgdatadir=%{_libexecdir} \
 		pkglibdir=%{_libexecdir} \
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/grub2.git/commitdiff/55de8afc7d5e2756d9ecc9fd5f8432b4080991b0



More information about the pld-cvs-commit mailing list