aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2007-01-25 17:49:15 -0800
committerH. Peter Anvin <hpa@zytor.com>2007-01-25 17:49:15 -0800
commit444ed7bd95a3dcd130a9f9ca06e1a85f3203ccc2 (patch)
tree3c5f89ff20c917dc2959dad8a254c65e967b0d17
parent9d84e09edc5e0a8205e0f45849400acf35b18222 (diff)
downloadsyslinux-elf-444ed7bd95a3dcd130a9f9ca06e1a85f3203ccc2.tar.gz
syslinux-elf-444ed7bd95a3dcd130a9f9ca06e1a85f3203ccc2.tar.xz
syslinux-elf-444ed7bd95a3dcd130a9f9ca06e1a85f3203ccc2.zip
Even more places which need -m32...syslinux-3.35-pre4
-rw-r--r--syslinux.spec.in11
1 files changed, 7 insertions, 4 deletions
diff --git a/syslinux.spec.in b/syslinux.spec.in
index f15ed412..d635d4f9 100644
--- a/syslinux.spec.in
+++ b/syslinux.spec.in
@@ -63,9 +63,9 @@ booting in the /tftpboot directory.
%setup -q -n syslinux-%{VERSION}
%build
-make clean
+make CC='gcc %{mflag}' clean
make CC='gcc %{mflag}' installer
-make -C sample tidy
+make CC='gcc %{mflag}' -C sample tidy
%install
rm -rf %{buildroot}
@@ -74,10 +74,10 @@ mkdir -p %{buildroot}%{_sbindir}
mkdir -p %{buildroot}%{_datadir}/syslinux
mkdir -p %{buildroot}%{_includedir}
mkdir -p %{buildroot}/boot %{buildroot}/tftpboot/pxelinux.cfg
-make install-all \
+make CC='gcc %{mflag}' install-all \
INSTALLROOT=%{buildroot} BINDIR=%{_bindir} SBINDIR=%{_sbindir} \
LIBDIR=%{_datadir} INCDIR=%{_includedir}
-make -C sample tidy
+make CC='gcc %{mflag}' -C sample tidy
cp mkdiskimage sys2ansi.pl keytab-lilo.pl %{buildroot}%{_datadir}/syslinux
cp %{buildroot}%{_datadir}/syslinux/*.c32 %{buildroot}/boot
cp %{buildroot}%{_datadir}/syslinux/memdisk %{buildroot}/boot
@@ -123,6 +123,9 @@ if [ -f /boot/extlinux.conf ]; then extlinux --update /boot; fi
%postun
%changelog
+* Thu Jan 25 2007 H. Peter Anvin <hpa@zytor.com>
+- Hacks to make the 32-bit version build correctly on 64-bit machines.
+
* Mon Sep 19 2006 H. Peter Anvin <hpa@zytor.com>
- Add a syslinux-tftpboot module.
- Factor extlinux into its own package.