SPECS: grub2.spec - BUILD_CC -> CC, redefining only neaded on x866...

sparky sparky at pld-linux.org
Fri Oct 28 20:46:54 CEST 2005


Author: sparky                       Date: Fri Oct 28 18:46:54 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- BUILD_CC -> CC, redefining only neaded on x8664
- -Incurses on CFLAGS is not neaded anymore
- TODO: crosscompiling sparc -> sparc64 ? 64 bit ncurses may be neaded

---- Files affected:
SPECS:
   grub2.spec (1.22 -> 1.23) 

---- Diffs:

================================================================
Index: SPECS/grub2.spec
diff -u SPECS/grub2.spec:1.22 SPECS/grub2.spec:1.23
--- SPECS/grub2.spec:1.22	Fri Oct 28 19:56:35 2005
+++ SPECS/grub2.spec	Fri Oct 28 20:46:49 2005
@@ -42,9 +42,6 @@
 %define		_sbindir	/sbin
 %define		_bindir		%{_sbindir}
 %define		_libdir		/boot
-%ifarch %{x8664}
-%define		amd64	1
-%endif
 
 %description
 GRUB is a GPLed bootloader intended to unify bootloading across x86
@@ -111,10 +108,10 @@
 #for rmk in conf/*.rmk; do
 #  ruby genmk.rb < $rmk > `echo $rmk | sed 's/\.rmk$/.mk/'`
 #done
-CFLAGS="-Os -I%{_includedir}/ncurses %{?debug:-g}" ; export CFLAGS
+CFLAGS="-Os %{?debug:-g}" ; export CFLAGS
 %configure \
-	BUILD_CC="%{__cc} %{?amd64:-m32}" \
 %ifarch %{x8664}
+	CC="%{__cc} -m32" \
 	LD="%{__ld} -melf_i386" \
 %endif
 	BUILD_CFLAGS="$CFLAGS"
@@ -169,6 +166,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.23  2005/10/28 18:46:49  sparky
+- BUILD_CC -> CC, redefining only neaded on x8664
+- -Incurses on CFLAGS is not neaded anymore
+- TODO: crosscompiling sparc -> sparc64 ? 64 bit ncurses may be neaded
+
 Revision 1.22  2005/10/28 17:56:35  sparky
 - mv /sbin/grub{,2}-install, conflicts with grub legacy
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/grub2.spec?r1=1.22&r2=1.23&f=u




More information about the pld-cvs-commit mailing list